Commit 12d638f4 authored by Rob Herring (Arm)'s avatar Rob Herring (Arm)
Browse files

scripts/dtc: Update to upstream version v1.7.0-93-g1df7b047fe43 



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: default avatarRob Herring (Arm) <robh@kernel.org>
parent 9ca5a7d9

scripts/dtc/checks.c

+48 −37
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ typedef void (*check_fn)(struct check *c, struct dt_info *dti, struct node *node 
struct check {

	const char *name;

	check_fn fn;

	void *data;

	const void *data;

	bool warn, error;

	enum checkstatus status;

	bool inprogress;
@@ -114,6 +114,7 @@ static inline void PRINTF(5, 6) check_msg(struct check *c, struct dt_info *dti, 
	}



	fputs(str, stderr);

	free(str);

}



#define FAIL(c, dti, node, ...)						\
@@ -207,7 +208,7 @@ static void check_is_string(struct check *c, struct dt_info *dti, 
			    struct node *node)

{

	struct property *prop;

	char *propname = c->data;

	const char *propname = c->data;



	prop = get_property(node, propname);

	if (!prop)
@@ -226,7 +227,7 @@ static void check_is_string_list(struct check *c, struct dt_info *dti, 
{

	int rem, l;

	struct property *prop;

	char *propname = c->data;

	const char *propname = c->data;

	char *str;



	prop = get_property(node, propname);
@@ -254,7 +255,7 @@ static void check_is_cell(struct check *c, struct dt_info *dti, 
			  struct node *node)

{

	struct property *prop;

	char *propname = c->data;

	const char *propname = c->data;



	prop = get_property(node, propname);

	if (!prop)
@@ -1078,10 +1079,11 @@ static void check_i2c_bus_reg(struct check *c, struct dt_info *dti, struct node 
		/* Ignore I2C_OWN_SLAVE_ADDRESS */

		reg &= ~I2C_OWN_SLAVE_ADDRESS;



		if ((reg & I2C_TEN_BIT_ADDRESS) && ((reg & ~I2C_TEN_BIT_ADDRESS) > 0x3ff))

		if (reg & I2C_TEN_BIT_ADDRESS) {

			if ((reg & ~I2C_TEN_BIT_ADDRESS) > 0x3ff)

				FAIL_PROP(c, dti, node, prop, "I2C address must be less than 10-bits, got \"0x%x\"",

				  reg);

		else if (reg > 0x7f)

		} else if (reg > 0x7f)

			FAIL_PROP(c, dti, node, prop, "I2C address must be less than 7-bits, got \"0x%x\". Set I2C_TEN_BIT_ADDRESS for 10 bit addresses or fix the property",

				  reg);

	}
@@ -1108,7 +1110,7 @@ static void check_spi_bus_bridge(struct check *c, struct dt_info *dti, struct no 
		for_each_child(node, child) {

			struct property *prop;

			for_each_property(child, prop) {

				if (strprefixeq(prop->name, 4, "spi-")) {

				if (strstarts(prop->name, "spi-")) {

					node->bus = &spi_bus;

					break;

				}
@@ -1180,7 +1182,7 @@ static void check_unit_address_format(struct check *c, struct dt_info *dti, 
		/* skip over 0x for next test */

		unitname += 2;

	}

	if (unitname[0] == '0' && isxdigit(unitname[1]))

	if (unitname[0] == '0' && isxdigit((unsigned char)unitname[1]))

		FAIL(c, dti, node, "unit name should not have leading 0s");

}

WARNING(unit_address_format, check_unit_address_format, NULL,
@@ -1222,7 +1224,7 @@ static void check_avoid_unnecessary_addr_size(struct check *c, struct dt_info *d 
	if (!node->parent || node->addr_cells < 0 || node->size_cells < 0)

		return;



	if (get_property(node, "ranges") || !node->children)

	if (get_property(node, "ranges") || get_property(node, "dma-ranges") || !node->children)

		return;



	for_each_child(node, child) {
@@ -1232,7 +1234,7 @@ static void check_avoid_unnecessary_addr_size(struct check *c, struct dt_info *d 
	}



	if (!has_reg)

		FAIL(c, dti, node, "unnecessary #address-cells/#size-cells without \"ranges\" or child \"reg\" property");

		FAIL(c, dti, node, "unnecessary #address-cells/#size-cells without \"ranges\", \"dma-ranges\" or child \"reg\" property");

}

WARNING(avoid_unnecessary_addr_size, check_avoid_unnecessary_addr_size, NULL, &avoid_default_addr_size);
@@ -1465,7 +1467,7 @@ static void check_provider_cells_property(struct check *c, 
					  struct dt_info *dti,

				          struct node *node)

{

	struct provider *provider = c->data;

	const struct provider *provider = c->data;

	struct property *prop;



	prop = get_property(node, provider->prop_name);
@@ -1673,6 +1675,10 @@ static void check_interrupt_map(struct check *c, 
			parent_cellsize += propval_cell(cellprop);



		cell += 1 + parent_cellsize;

		if (cell > map_cells)

			FAIL_PROP(c, dti, node, irq_map_prop,

				"property size (%d) mismatch, expected %zu",

				irq_map_prop->val.len, cell * sizeof(cell_t));

	}

}

WARNING(interrupt_map, check_interrupt_map, NULL, &phandle_references, &addr_size_cells, &interrupt_provider);
@@ -1765,6 +1771,11 @@ static void check_graph_nodes(struct check *c, struct dt_info *dti, 
		      get_property(child, "remote-endpoint")))

			continue;



                /* The root node cannot be a port */

		if (!node->parent) {

			FAIL(c, dti, node, "root node contains endpoint node '%s', potentially misplaced remote-endpoint property", child->name);

			continue;

		}

		node->bus = &graph_port_bus;



		/* The parent of 'port' nodes can be either 'ports' or a device */
@@ -1778,31 +1789,6 @@ static void check_graph_nodes(struct check *c, struct dt_info *dti, 
}

WARNING(graph_nodes, check_graph_nodes, NULL);



static void check_graph_child_address(struct check *c, struct dt_info *dti,

				      struct node *node)

{

	int cnt = 0;

	struct node *child;



	if (node->bus != &graph_ports_bus && node->bus != &graph_port_bus)

		return;



	for_each_child(node, child) {

		struct property *prop = get_property(child, "reg");



		/* No error if we have any non-zero unit address */

		if (prop && propval_cell(prop) != 0)

			return;



		cnt++;

	}



	if (cnt == 1 && node->addr_cells != -1)

		FAIL(c, dti, node, "graph node has single child node '%s', #address-cells/#size-cells are not necessary",

		     node->children->name);

}

WARNING(graph_child_address, check_graph_child_address, NULL, &graph_nodes);



static void check_graph_reg(struct check *c, struct dt_info *dti,

			    struct node *node)

{
@@ -1893,6 +1879,31 @@ static void check_graph_endpoint(struct check *c, struct dt_info *dti, 
}

WARNING(graph_endpoint, check_graph_endpoint, NULL, &graph_nodes);



static void check_graph_child_address(struct check *c, struct dt_info *dti,

				      struct node *node)

{

	int cnt = 0;

	struct node *child;



	if (node->bus != &graph_ports_bus && node->bus != &graph_port_bus)

		return;



	for_each_child(node, child) {

		struct property *prop = get_property(child, "reg");



		/* No error if we have any non-zero unit address */

                if (prop && propval_cell(prop) != 0 )

			return;



		cnt++;

	}



	if (cnt == 1 && node->addr_cells != -1)

		FAIL(c, dti, node, "graph node has single child node '%s', #address-cells/#size-cells are not necessary",

		     node->children->name);

}

WARNING(graph_child_address, check_graph_child_address, NULL, &graph_nodes, &graph_port, &graph_endpoint);



static struct check *check_table[] = {

	&duplicate_node_names, &duplicate_property_names,

	&node_name_chars, &node_name_format, &property_name_chars,

scripts/dtc/dtc-parser.y

+5 −0
Original line number Diff line number Diff line
@@ -284,14 +284,17 @@ propdef: 
	  DT_PROPNODENAME '=' propdata ';'

		{

			$$ = build_property($1, $3, &@$);

			free($1);

		}

	| DT_PROPNODENAME ';'

		{

			$$ = build_property($1, empty_data, &@$);

			free($1);

		}

	| DT_DEL_PROP DT_PROPNODENAME ';'

		{

			$$ = build_property_delete($2);

			free($2);

		}

	| DT_LABEL propdef

		{
@@ -570,10 +573,12 @@ subnode: 
	  DT_PROPNODENAME nodedef

		{

			$$ = name_node($2, $1);

			free($1);

		}

	| DT_DEL_NODE DT_PROPNODENAME ';'

		{

			$$ = name_node(build_node_delete(&@$), $2);

			free($2);

		}

	| DT_OMIT_NO_REF subnode

		{

scripts/dtc/dtc.c

+8 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static void fill_fullpaths(struct node *tree, const char *prefix) 


/* Usage related data. */

static const char usage_synopsis[] = "dtc [options] <input file>";

static const char usage_short_opts[] = "qI:O:o:V:d:R:S:p:a:fb:i:H:sW:E:@AThv";

static const char usage_short_opts[] = "qI:O:o:V:d:R:S:p:a:fb:i:H:sW:E:@LAThv";

static struct option const usage_long_opts[] = {

	{"quiet",            no_argument, NULL, 'q'},

	{"in-format",         a_argument, NULL, 'I'},
@@ -67,6 +67,7 @@ static struct option const usage_long_opts[] = { 
	{"warning",           a_argument, NULL, 'W'},

	{"error",             a_argument, NULL, 'E'},

	{"symbols",	     no_argument, NULL, '@'},

	{"local-fixups",     no_argument, NULL, 'L'},

	{"auto-alias",       no_argument, NULL, 'A'},

	{"annotate",         no_argument, NULL, 'T'},

	{"help",             no_argument, NULL, 'h'},
@@ -104,6 +105,7 @@ static const char * const usage_opts_help[] = { 
	"\n\tEnable/disable warnings (prefix with \"no-\")",

	"\n\tEnable/disable errors (prefix with \"no-\")",

	"\n\tEnable generation of symbols",

	"\n\tPossibly generates a __local_fixups__ and a __fixups__ node at the root node",

	"\n\tEnable auto-alias of labels",

	"\n\tAnnotate output .dts with input source file and line (-T -T for more details)",

	"\n\tPrint this help and exit",
@@ -252,6 +254,11 @@ int main(int argc, char *argv[]) 
		case '@':

			generate_symbols = 1;

			break;



		case 'L':

			generate_fixups = 1;

			break;



		case 'A':

			auto_label_aliases = 1;

			break;

scripts/dtc/dtc.h

+6 −6
Original line number Diff line number Diff line
@@ -260,16 +260,16 @@ struct node { 
void add_label(struct label **labels, char *label);

void delete_labels(struct label **labels);



struct property *build_property(char *name, struct data val,

struct property *build_property(const char *name, struct data val,

				struct srcpos *srcpos);

struct property *build_property_delete(char *name);

struct property *build_property_delete(const char *name);

struct property *chain_property(struct property *first, struct property *list);

struct property *reverse_properties(struct property *first);



struct node *build_node(struct property *proplist, struct node *children,

			struct srcpos *srcpos);

struct node *build_node_delete(struct srcpos *srcpos);

struct node *name_node(struct node *node, char *name);

struct node *name_node(struct node *node, const char *name);

struct node *omit_node_if_unused(struct node *node);

struct node *reference_node(struct node *node);

struct node *chain_node(struct node *first, struct node *list);
@@ -336,9 +336,9 @@ struct dt_info *build_dt_info(unsigned int dtsflags, 
			      struct reserve_info *reservelist,

			      struct node *tree, uint32_t boot_cpuid_phys);

void sort_tree(struct dt_info *dti);

void generate_label_tree(struct dt_info *dti, char *name, bool allocph);

void generate_fixups_tree(struct dt_info *dti, char *name);

void generate_local_fixups_tree(struct dt_info *dti, char *name);

void generate_label_tree(struct dt_info *dti, const char *name, bool allocph);

void generate_fixups_tree(struct dt_info *dti, const char *name);

void generate_local_fixups_tree(struct dt_info *dti, const char *name);



/* Checks */

scripts/dtc/fdtoverlay.c

+2 −4
Original line number Diff line number Diff line
@@ -23,9 +23,7 @@ 
/* Usage related data. */

static const char usage_synopsis[] =

	"apply a number of overlays to a base blob\n"

	"	fdtoverlay <options> [<overlay.dtbo> [<overlay.dtbo>]]\n"

	"\n"

	USAGE_TYPE_MSG;

	"	fdtoverlay <options> [<overlay.dtbo> [<overlay.dtbo>]]";

static const char usage_short_opts[] = "i:o:v" USAGE_COMMON_SHORT_OPTS;

static struct option const usage_long_opts[] = {

	{"input",            required_argument, NULL, 'i'},
@@ -50,7 +48,7 @@ static void *apply_one(char *base, const char *overlay, size_t *buf_len, 
	int ret;



	/*

	 * We take a copies first, because a a failed apply can trash

	 * We take a copies first, because a failed apply can trash

	 * both the base blob and the overlay

	 */

	tmpo = xmalloc(fdt_totalsize(overlay));