mirror of
				https://github.com/torvalds/linux.git
				synced 2025-10-31 16:48:26 +02:00 
			
		
		
		
	 12d638f48c
			
		
	
	
		12d638f48c
		
	
	
	
	
		
			
			This adds the following commits from upstream:
1df7b047fe43 pylibfdt/Makefile.pylibfdt: use project's flags to compile the extension
61e88fdcec52 libfdt: overlay: Fix phandle overwrite check for new subtrees
49d30894466e meson: fix installation with meson-python
d54aaf93673c pylibfdt: clean up python build directory
ab86f1e9fda8 pylibfdt: add VERSION.txt to Python sdist
7b8a30eceabe pylibfdt: fix Python version
ff4f17eb5865 pylibfdt/Makefile.pylibfdt: fix Python library being rebuild during install
9e313b14e684 pylibfdt/meson.build: fix Python library being rebuilt during install
d598fc3648ec tests/run_tests.sh: fix Meson library path being dropped
b98239da2f18 tests/meson.build: fix python and yaml tests not running
c17d76ab5e84 checks: Check the overall length of "interrupt-map"
ae26223a056e libfdt: overlay: Refactor overlay_fixup_phandle
4dd831affd01 libfdt: tests: Update test case for overlay_bad_fixup
e6d294200837 tests: Remove two_roots and named_root from LIBTREE_TESTS_L and add all dtb filenames generated by dumptrees to TESTS_TREES_L in Makefile.tests
855c934e26ae tests: fix tests broken under Meson
4fd3f4f0a95d github: enforce testing pylibfdt and yaml support
9ca7d62dbf0b meson: split run-tests by type
bb51223083a4 meson: fix dependencies of tests
e81900635c95 meson: fix pylibfdt missing dependency on libfdt
822123856980 pylibfdt: fix get_mem_rsv for newer Python versions
1fad065080e6 libfdt: overlay: ensure that existing phandles are not overwritten
b0aacd0a7735 github: add windows/msys CI build
ae97d9745862 github: Don't accidentally suppress test errors
057a7dbbb777 github: Display meson test logs on failure
92b5d4e91678 pylibfdt: Remove some apparently deprecated options from setup.py
417e3299dbd1 github: Update to newer checkout action
5e6cefa17e2d fix MinGW format attribute
24f60011fd43 libfdt: Simplify adjustment of values for local fixups
da39ee0e68b6 libfdt: rework shared/static libraries
a669223f7a60 Makefile: do not hardcode the `install` program path
3fbfdd08afd2 libfdt: fix duplicate meson target
dcef5f834ea3 tests: use correct pkg-config when cross compiling
0b8026ff254f meson: allow building from shallow clones
95c74d71f090 treesource: Restore string list output when no type markers
2283dd78eff5 libfdt: fdt_path_offset_namelen: Reject empty path
79b9e326a162 libfdt: fdt_get_alias_namelen: Validate aliases
52157f13ef3d pylibfdt: Support boolean properties
d77433727566 dtc: fix missing string in usage_opts_help
ad8bf9f9aa39 libfdt: Fix fdt_appendprop_addrrange documentation
6c5e189fb952 github: add workflow for Meson builds
a3dc9f006a78 libfdt: rename libfdt-X.Y.Z.so to libfdt.so.X.Y.Z
35019949c4c7 workflows: build: remove setuptools_scm hack
cd3e2304f4a9 pylibfdt: use fallback version in tarballs
0f5864567745 move release version into VERSION.txt
38165954c13b libfdt: add missing version symbols
5e98b5979354 editorconfig: use tab indentation for version.lds
d030a893be25 tests: generate dtbs in Meson build directory
8d8372b13706 tests: fix use of deprecated meson methods
761114effaf7 pylibtfdt: fix use of deprecated meson method
bf6377a98d97 meson: set minimum Meson version to 0.56.0
4c68e4b16b22 libfdt: fix library version to match project version
bdc5c8793a13 meson: allow disabling tests
f088e381f29e Makefile: allow to install libfdt without building executables
6df5328a902c Fix use of <ctype.h> functions
ccf1f62d59ad libfdt: Fix a typo in libfdt.h
71a8b8ef0adf libfdt: meson: Fix linking on macOS linker
589d8c7653c7 dtc: Add an option to generate __local_fixups__ and __fixups__
e8364666d5ac CI: Add build matrix with multiple Linux distributions
3b02a94b486f dtc: Correct invalid dts output with mixed phandles and integers
d4888958d64b tests: Add additional tests for device graph checks
ea3b9a1d2c5a checks: Fix crash in graph_child_address if 'reg' cell size != 1
b2b9671583e9 livetree: fix off-by-one in propval_cell_n() bounds check
ab481e483061 Add definition for a GitHub Actions CI job
c88038c9b8ca Drop obsolete/broken CI definitions
0ac8b30ba5a1 yaml: Depend on libyaml >= 0.2.3
f1657b2fb5be tests: Add test cases for bad endpoint node and remote-endpoint prop checks
44bb89cafd3d checks: Fix segmentation fault in check_graph_node
60bcf1cde1a8 improve documentation for fdt_path_offset()
a6f997bc77d4 add fdt_get_symbol() and fdt_get_symbol_namelen() functions
18f5ec12a10e use fdt_path_getprop_namelen() in fdt_get_alias_namelen()
df093279282c add fdt_path_getprop_namelen() helper
129bb4b78bc6 doc: dt-object-internal: Fix a typo
390f481521c3 fdtoverlay: Drop a a repeated article
9f8b382ed45e manual: Fix and improve documentation about -@
2cdf93a6d402 fdtoverlay: Fix usage string to not mention "<type>"
72fc810c3025 build-sys: add -Wwrite-strings
083ab26da83b tests: fix leaks spotted by ASAN
6f8b28f49609 livetree: fix leak spotted by ASAN
fd68bb8c5658 Make name_node() xstrdup its name argument
4718189c4ca8 Delay xstrdup() of node and property names coming from a flat tree
0b842c3c8199 Make build_property() xstrdup its name argument
9cceabea1ee0 checks: correct I2C 10-bit address check
0d56145938fe yamltree.c: fix -Werror=discarded-qualifiers & -Werror=cast-qual
61fa22b05f69 checks: make check.data const
7a1d72a788e0 checks.c: fix check_msg() leak
ee5799938697 checks.c: fix heap-buffer-overflow
44c9b73801c1 tests: fix -Wwrite-strings
5b60f5104fcc srcpos.c: fix -Wwrite-strings
32174a66efa4 meson: Fix cell overflow tests when running from meson
64a907f08b9b meson.build: bump version to 1.7.0
e3cde0613bfd Add -Wsuggest-attribute=format warning, correct warnings thus generated
41821821101a Use #ifdef NO_VALGRIND
71c19f20b3ef Do not redefine _GNU_SOURCE if already set
039a99414e77 Bump version to v1.7.0
9b62ec84bb2d Merge remote-tracking branch 'gitlab/main'
3f29d6d85c24 pylibfdt: add size_hint parameter for get_path
2022bb10879d checks: Update #{size,address}-cells check for 'dma-ranges'
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
		
	
			
		
			
				
	
	
		
			251 lines
		
	
	
	
		
			7.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			251 lines
		
	
	
	
		
			7.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* SPDX-License-Identifier: GPL-2.0-or-later */
 | |
| #ifndef UTIL_H
 | |
| #define UTIL_H
 | |
| 
 | |
| #include <stdlib.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.
 | |
|  */
 | |
| 
 | |
| #ifdef __GNUC__
 | |
| #ifdef __MINGW_PRINTF_FORMAT
 | |
| #define PRINTF(i, j)	__attribute__((format (__MINGW_PRINTF_FORMAT, i, j)))
 | |
| #elif __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
 | |
| #define PRINTF(i, j)	__attribute__((format (gnu_printf, i, j)))
 | |
| #else
 | |
| #define PRINTF(i, j)	__attribute__((format (printf, i, j)))
 | |
| #endif
 | |
| #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 char *xstrndup(const char *s, size_t len);
 | |
| 
 | |
| extern int PRINTF(2, 3) xasprintf(char **strp, const char *fmt, ...);
 | |
| extern int PRINTF(2, 3) xasprintf_append(char **strp, const char *fmt, ...);
 | |
| extern int PRINTF(2, 0) xavsprintf_append(char **strp, const char *fmt, va_list ap);
 | |
| 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		Pointer 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		Pointer 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
 | |
|  *		r	raw
 | |
|  *
 | |
|  * 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, r=raw\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 */
 |