mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
![Rob Herring](/assets/img/avatar_default.png)
Major changes are I2C and SPI bus checks, YAML output format (for future validation), some new libfdt functions, and more libfdt validation of dtbs. The YAML addition adds an optional dependency on libyaml. pkg-config is used to test for it and pkg-config became a kconfig dependency in 4.18. This adds the following commits from upstream: c86da84d30e4 Add support for YAML encoded output 361b5e7d8067 Make type_marker_length helper public bfbfab047e45 pylibfdt: Add a means to add and delete notes 9005f4108e7c pylibfdt: Allow delprop() to return errors b94c056b137e Make valgrind optional fd06c54d4711 tests: Better testing of dtc -I fs mode c3f50c9a86d9 tests: Allow dtbs_equal_unordered to ignore mem reserves 0ac9fdee37c7 dtc: trivial '-I fs -O dts' test 0fd1c8c783f3 pylibfdt: fdt_get_mem_rsv returns 2 uint64_t values 04853cad18f4 pylibfdt: Don't incorrectly / unnecessarily override uint64_t typemap 9619c8619c37 Kill bogus TYPE_BLOB marker type ac68ff92ae20 parser: add TYPE_STRING marker to path references 90a190eb04d9 checks: add SPI bus checks 53a1bd546905 checks: add I2C bus checks 88f18909db73 dtc: Bump version to v1.4.7 85bce8b2f06d tests: Correction to vg_prepare_blob() 57f7f9e7bc7c tests: Don't call memcmp() with NULL arguments c12b2b0c20eb libfdt: fdt_address_cells() and fdt_size_cells() 3fe0eeda0b7f livetree: Set phandle properties type to uint32 853649acceba pylibfdt: Support the sequential-write interface 9b0e4fe26093 tests: Improve fdt_resize() tests 1087504bb3e8 libfdt: Add necessary header padding in fdt_create() c72fa777e613 libfdt: Copy the struct region in fdt_resize() 32b9c6130762 Preserve datatype markers when emitting dts format 6dcb8ba408ec libfdt: Add helpers for accessing unaligned words 42607f21d43e tests: Fix incorrect check name 'prop_name_chars' 9d78c33bf8a1 tests: fix grep for checks error messages b770f3d1c13f pylibfdt: Support setting the name of a node 2f0d07e678e0 pylibfdt: Add functions to set and get properties as strings 354d3dc55939 pylibfdt: Update the bytearray size with pack() 3c374d46acce pylibfdt: Allow reading integer values from properties 49d32ce40bb4 pylibfdt: Use an unsigned type for fdt32_t 481246a0c13a pylibfdt: Avoid accessing the internal _fdt member in tests 9aafa33d99ed pylibfdt: Add functions to update properties 5a598671fdbf pylibfdt: Support device-tree creation/expansion 483e170625e1 pylibfdt: Add support for reading the memory reserve map 29bb05aa4200 pylibfdt: Add support for the rest of the header functions 582a7159a5d0 pylibfdt: Add support for fdt_next_node() f0f8c9169819 pylibfdt: Reorder functions to match libfdt.h 64a69d123935 pylibfdt: Return string instead of bytearray from getprop() 4d09a83420df fdtput: Add documentation e617cbe1bd67 fdtget: Add documentation 180a93924014 Use <inttypes.h> format specifiers in a bunch of places we should b9af3b396576 scripts/dtc: Fixed format mismatch in fprintf 4b8fcc3d015c libfdt: Add fdt_check_full() function c14223fb2292 tests: Use valgrind client requests for better checking 5b67d2b955a3 tests: Better handling of valgrind errors saving blobs e2556aaeb506 tests: Remove unused #define fb9c6abddaa8 Use size_t for blob lengths in utilfdt_read* 0112fda03bf6 libfdt: Add fdt_header_size() 6473a21d8bfe Consolidate utilfdt_read_len() variants d5db5382c5e5 libfdt: Safer access to memory reservations 719d582e98ec libfdt: Propagate name errors in fdt_getprop_by_offset() 70166d62a27f libfdt: Safer access to strings section eb890c0f77dc libfdt: Make fdt_check_header() more thorough 899d6fad93f3 libfdt: Improve sequential write state checking 04b5b4062ccd libfdt: Clean up header checking functions 44d3efedc816 Preserve datatype information when parsing dts f0be81bd8de0 Make Property a subclass of bytearray 24b1f3f064d4 pylibfdt: Add a method to access the device tree directly Signed-off-by: Rob Herring <robh@kernel.org>
254 lines
7.4 KiB
C
254 lines
7.4 KiB
C
#ifndef UTIL_H
|
|
#define UTIL_H
|
|
|
|
#include <stdarg.h>
|
|
#include <stdbool.h>
|
|
#include <getopt.h>
|
|
|
|
/*
|
|
* Copyright 2011 The Chromium Authors, All Rights Reserved.
|
|
* Copyright 2008 Jon Loeliger, Freescale Semiconductor, Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of the
|
|
* License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
|
* USA
|
|
*/
|
|
|
|
#ifdef __GNUC__
|
|
#define PRINTF(i, j) __attribute__((format (printf, i, j)))
|
|
#define NORETURN __attribute__((noreturn))
|
|
#else
|
|
#define PRINTF(i, j)
|
|
#define NORETURN
|
|
#endif
|
|
|
|
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
|
|
|
|
#define stringify(s) stringify_(s)
|
|
#define stringify_(s) #s
|
|
|
|
static inline void NORETURN PRINTF(1, 2) die(const char *str, ...)
|
|
{
|
|
va_list ap;
|
|
|
|
va_start(ap, str);
|
|
fprintf(stderr, "FATAL ERROR: ");
|
|
vfprintf(stderr, str, ap);
|
|
va_end(ap);
|
|
exit(1);
|
|
}
|
|
|
|
static inline void *xmalloc(size_t len)
|
|
{
|
|
void *new = malloc(len);
|
|
|
|
if (!new)
|
|
die("malloc() failed\n");
|
|
|
|
return new;
|
|
}
|
|
|
|
static inline void *xrealloc(void *p, size_t len)
|
|
{
|
|
void *new = realloc(p, len);
|
|
|
|
if (!new)
|
|
die("realloc() failed (len=%zd)\n", len);
|
|
|
|
return new;
|
|
}
|
|
|
|
extern char *xstrdup(const char *s);
|
|
|
|
extern int PRINTF(2, 3) xasprintf(char **strp, const char *fmt, ...);
|
|
extern char *join_path(const char *path, const char *name);
|
|
|
|
/**
|
|
* Check a property of a given length to see if it is all printable and
|
|
* has a valid terminator. The property can contain either a single string,
|
|
* or multiple strings each of non-zero length.
|
|
*
|
|
* @param data The string to check
|
|
* @param len The string length including terminator
|
|
* @return 1 if a valid printable string, 0 if not
|
|
*/
|
|
bool util_is_printable_string(const void *data, int len);
|
|
|
|
/*
|
|
* Parse an escaped character starting at index i in string s. The resulting
|
|
* character will be returned and the index i will be updated to point at the
|
|
* character directly after the end of the encoding, this may be the '\0'
|
|
* terminator of the string.
|
|
*/
|
|
char get_escape_char(const char *s, int *i);
|
|
|
|
/**
|
|
* Read a device tree file into a buffer. This will report any errors on
|
|
* stderr.
|
|
*
|
|
* @param filename The filename to read, or - for stdin
|
|
* @param len If non-NULL, the amount of data we managed to read
|
|
* @return Pointer to allocated buffer containing fdt, or NULL on error
|
|
*/
|
|
char *utilfdt_read(const char *filename, size_t *len);
|
|
|
|
/**
|
|
* Read a device tree file into a buffer. Does not report errors, but only
|
|
* returns them. The value returned can be passed to strerror() to obtain
|
|
* an error message for the user.
|
|
*
|
|
* @param filename The filename to read, or - for stdin
|
|
* @param buffp Returns pointer to buffer containing fdt
|
|
* @param len If non-NULL, the amount of data we managed to read
|
|
* @return 0 if ok, else an errno value representing the error
|
|
*/
|
|
int utilfdt_read_err(const char *filename, char **buffp, size_t *len);
|
|
|
|
/**
|
|
* Write a device tree buffer to a file. This will report any errors on
|
|
* stderr.
|
|
*
|
|
* @param filename The filename to write, or - for stdout
|
|
* @param blob Poiner to buffer containing fdt
|
|
* @return 0 if ok, -1 on error
|
|
*/
|
|
int utilfdt_write(const char *filename, const void *blob);
|
|
|
|
/**
|
|
* Write a device tree buffer to a file. Does not report errors, but only
|
|
* returns them. The value returned can be passed to strerror() to obtain
|
|
* an error message for the user.
|
|
*
|
|
* @param filename The filename to write, or - for stdout
|
|
* @param blob Poiner to buffer containing fdt
|
|
* @return 0 if ok, else an errno value representing the error
|
|
*/
|
|
int utilfdt_write_err(const char *filename, const void *blob);
|
|
|
|
/**
|
|
* Decode a data type string. The purpose of this string
|
|
*
|
|
* The string consists of an optional character followed by the type:
|
|
* Modifier characters:
|
|
* hh or b 1 byte
|
|
* h 2 byte
|
|
* l 4 byte, default
|
|
*
|
|
* Type character:
|
|
* s string
|
|
* i signed integer
|
|
* u unsigned integer
|
|
* x hex
|
|
*
|
|
* TODO: Implement ll modifier (8 bytes)
|
|
* TODO: Implement o type (octal)
|
|
*
|
|
* @param fmt Format string to process
|
|
* @param type Returns type found(s/d/u/x), or 0 if none
|
|
* @param size Returns size found(1,2,4,8) or 4 if none
|
|
* @return 0 if ok, -1 on error (no type given, or other invalid format)
|
|
*/
|
|
int utilfdt_decode_type(const char *fmt, int *type, int *size);
|
|
|
|
/*
|
|
* This is a usage message fragment for the -t option. It is the format
|
|
* supported by utilfdt_decode_type.
|
|
*/
|
|
|
|
#define USAGE_TYPE_MSG \
|
|
"<type>\ts=string, i=int, u=unsigned, x=hex\n" \
|
|
"\tOptional modifier prefix:\n" \
|
|
"\t\thh or b=byte, h=2 byte, l=4 byte (default)";
|
|
|
|
/**
|
|
* Print property data in a readable format to stdout
|
|
*
|
|
* Properties that look like strings will be printed as strings. Otherwise
|
|
* the data will be displayed either as cells (if len is a multiple of 4
|
|
* bytes) or bytes.
|
|
*
|
|
* If len is 0 then this function does nothing.
|
|
*
|
|
* @param data Pointers to property data
|
|
* @param len Length of property data
|
|
*/
|
|
void utilfdt_print_data(const char *data, int len);
|
|
|
|
/**
|
|
* Show source version and exit
|
|
*/
|
|
void NORETURN util_version(void);
|
|
|
|
/**
|
|
* Show usage and exit
|
|
*
|
|
* This helps standardize the output of various utils. You most likely want
|
|
* to use the usage() helper below rather than call this.
|
|
*
|
|
* @param errmsg If non-NULL, an error message to display
|
|
* @param synopsis The initial example usage text (and possible examples)
|
|
* @param short_opts The string of short options
|
|
* @param long_opts The structure of long options
|
|
* @param opts_help An array of help strings (should align with long_opts)
|
|
*/
|
|
void NORETURN util_usage(const char *errmsg, const char *synopsis,
|
|
const char *short_opts,
|
|
struct option const long_opts[],
|
|
const char * const opts_help[]);
|
|
|
|
/**
|
|
* Show usage and exit
|
|
*
|
|
* If you name all your usage variables with usage_xxx, then you can call this
|
|
* help macro rather than expanding all arguments yourself.
|
|
*
|
|
* @param errmsg If non-NULL, an error message to display
|
|
*/
|
|
#define usage(errmsg) \
|
|
util_usage(errmsg, usage_synopsis, usage_short_opts, \
|
|
usage_long_opts, usage_opts_help)
|
|
|
|
/**
|
|
* Call getopt_long() with standard options
|
|
*
|
|
* Since all util code runs getopt in the same way, provide a helper.
|
|
*/
|
|
#define util_getopt_long() getopt_long(argc, argv, usage_short_opts, \
|
|
usage_long_opts, NULL)
|
|
|
|
/* Helper for aligning long_opts array */
|
|
#define a_argument required_argument
|
|
|
|
/* Helper for usage_short_opts string constant */
|
|
#define USAGE_COMMON_SHORT_OPTS "hV"
|
|
|
|
/* Helper for usage_long_opts option array */
|
|
#define USAGE_COMMON_LONG_OPTS \
|
|
{"help", no_argument, NULL, 'h'}, \
|
|
{"version", no_argument, NULL, 'V'}, \
|
|
{NULL, no_argument, NULL, 0x0}
|
|
|
|
/* Helper for usage_opts_help array */
|
|
#define USAGE_COMMON_OPTS_HELP \
|
|
"Print this help and exit", \
|
|
"Print version and exit", \
|
|
NULL
|
|
|
|
/* Helper for getopt case statements */
|
|
#define case_USAGE_COMMON_FLAGS \
|
|
case 'h': usage(NULL); \
|
|
case 'V': util_version(); \
|
|
case '?': usage("unknown option");
|
|
|
|
#endif /* UTIL_H */
|