Commit c2e7075c authored by Rob Herring's avatar Rob Herring
Browse files

scripts/dtc: Update to upstream version v1.4.7-57-gf267e674d145 



This adds the following commits from upstream:

f267e674d145 checks: Fix crash with multiple source annotations
3616b9a811b6 checks: Use source position information for check failures
2bdbd07a1223 checks: Make each message output atomic
a1eff70c02cf util: Add xa{v}sprintf_append functions
82a52ce4573b libfdt: Add a test for fdt_getprop_by_offset()
607b8586b383 PEP8 / Flake8 cleanups for setup.py
f9c0a425b648 Remove broken objdir / srcdir support
5182b5e6f28c pylibfdt: Use common PREFIX variable
d45bf1f5f2a6 Refine make tests_clean target
99284c4db9cb Refine pylibfdt_clean target
a4629cfaedfb Refine libfdt_clean target
08380fc43aa2 tests: Use modern octal literals for Python
8113c00b99d3 pylibfdt: Allow switch to Python 3 via environment variable PYTHON
11738cf01f15 libfdt: Don't use memcpy to handle unaligned reads on ARM
86a288a73670 checks: Restructure check_msg to decrease indentation
5667e7ef9a9a annotations: add the annotation functionality
8e20ccf52f90 annotations: add positions
ca930e20bb54 tests: Don't lose errors from make checkm
43366bb4eeee tests: Property count valgrind errors in wrapped tests
5062516fb8cb srcpos: Remove srcpos_empty
a3143fafbf83 Revert "annotations: add positions"
403cc79f06a1 checks: Update SPI bus check for 'spi-slave'
baa1d2cf7894 annotations: add positions
ff2ad38f6a5a Merge remote-tracking branch 'origin/pr/18'
aa7254d9cb17 libfdt: return correct value if #size-cells property is not present
49903aed7783 use ptrdiff_t modifier for printing pointer differences
da2b691ccf68 treesource: Fix dts output for phandles in middle of a sequence of ints
8f8b77a0d62d tests: Wrap check_align() calls with base_run_test()
522d81d572f2 Fix dts output with a REF_PATH marker
e45198c98359 Added test cases for target references
0fcffda15e9f Merge nodes with local target label references
1e4a0928f3b3 pylibfdt: Don't have setup.py depend on where it's invoked from
ca399b14956f pylibfdt: Eliminate run_setup make function
98972f1b3e33 pylibfdt: Improved version extraction
7ba2be6cda5f pylibfdt: Don't silence setup.py when V=1
7691f9d39301 pylibfdt: Make SETUP make variable
855b9963def9 pylibfdt: Simpler CFLAGS handling
47cafbeeb977 pylibfdt: Link extension module with libfdt rather than rebuilding
dd695d6afb19 pylibfdt: Correctly set build output directory
59327523d0d8 pylibfdt: We don't need include files from the base directory
e84742aa7b93 checks: fix simple-bus compatible matching
8c59a97ce096 Fix missing labels when emitting dts format
d448f9a5fd94 Revert dts output formatting changes of spaces around brackets

Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent e8b1dee2

scripts/dtc/checks.c

+57 −16
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
 */



#include "dtc.h"

#include "srcpos.h"



#ifdef TRACE_CHECKS

#define TRACE(c, ...) \
@@ -78,23 +79,56 @@ static inline void PRINTF(5, 6) check_msg(struct check *c, struct dt_info *dti, 
					   const char *fmt, ...)

{

	va_list ap;

	va_start(ap, fmt);

	char *str = NULL;

	struct srcpos *pos = NULL;

	char *file_str;



	if (!(c->warn && (quiet < 1)) && !(c->error && (quiet < 2)))

		return;



	if (prop && prop->srcpos)

		pos = prop->srcpos;

	else if (node && node->srcpos)

		pos = node->srcpos;



	if (pos) {

		file_str = srcpos_string(pos);

		xasprintf(&str, "%s", file_str);

		free(file_str);

	} else if (streq(dti->outname, "-")) {

		xasprintf(&str, "<stdout>");

	} else {

		xasprintf(&str, "%s", dti->outname);

	}



	if ((c->warn && (quiet < 1))

	    || (c->error && (quiet < 2))) {

		fprintf(stderr, "%s: %s (%s): ",

			strcmp(dti->outname, "-") ? dti->outname : "<stdout>",

	xasprintf_append(&str, ": %s (%s): ",

			(c->error) ? "ERROR" : "Warning", c->name);



	if (node) {

			fprintf(stderr, "%s", node->fullpath);

		if (prop)

				fprintf(stderr, ":%s", prop->name);

			fputs(": ", stderr);

		}

		vfprintf(stderr, fmt, ap);

		fprintf(stderr, "\n");

			xasprintf_append(&str, "%s:%s: ", node->fullpath, prop->name);

		else

			xasprintf_append(&str, "%s: ", node->fullpath);

	}



	va_start(ap, fmt);

	xavsprintf_append(&str, fmt, ap);

	va_end(ap);



	xasprintf_append(&str, "\n");



	if (!prop && pos) {

		pos = node->srcpos;

		while (pos->next) {

			pos = pos->next;



			file_str = srcpos_string(pos);

			xasprintf_append(&str, "  also defined at %s\n", file_str);

			free(file_str);

		}

	}



	fputs(str, stderr);

}



#define FAIL(c, dti, node, ...)						\
@@ -910,7 +944,7 @@ static bool node_is_compatible(struct node *node, const char *compat) 


	for (str = prop->val.val, end = str + prop->val.len; str < end;

	     str += strnlen(str, end - str) + 1) {

		if (strprefixeq(str, end - str, compat))

		if (streq(str, compat))

			return true;

	}

	return false;
@@ -921,7 +955,8 @@ static void check_simple_bus_bridge(struct check *c, struct dt_info *dti, struct 
	if (node_is_compatible(node, "simple-bus"))

		node->bus = &simple_bus;

}

WARNING(simple_bus_bridge, check_simple_bus_bridge, NULL, &addr_size_cells);

WARNING(simple_bus_bridge, check_simple_bus_bridge, NULL,

	&addr_size_cells, &compatible_is_string_list);



static void check_simple_bus_reg(struct check *c, struct dt_info *dti, struct node *node)

{
@@ -1035,6 +1070,7 @@ static const struct bus_type spi_bus = { 


static void check_spi_bus_bridge(struct check *c, struct dt_info *dti, struct node *node)

{

	int spi_addr_cells = 1;



	if (strprefixeq(node->name, node->basenamelen, "spi")) {

		node->bus = &spi_bus;
@@ -1063,7 +1099,9 @@ static void check_spi_bus_bridge(struct check *c, struct dt_info *dti, struct no 
	if (node->bus != &spi_bus || !node->children)

		return;



	if (node_addr_cells(node) != 1)

	if (get_property(node, "spi-slave"))

		spi_addr_cells = 0;

	if (node_addr_cells(node) != spi_addr_cells)

		FAIL(c, dti, node, "incorrect #address-cells for SPI bus");

	if (node_size_cells(node) != 0)

		FAIL(c, dti, node, "incorrect #size-cells for SPI bus");
@@ -1082,6 +1120,9 @@ static void check_spi_bus_reg(struct check *c, struct dt_info *dti, struct node 
	if (!node->parent || (node->parent->bus != &spi_bus))

		return;



	if (get_property(node->parent, "spi-slave"))

		return;



	prop = get_property(node, "reg");

	if (prop)

		cells = (cell_t *)prop->val.val;

scripts/dtc/dtc-lexer.l

+2 −2
Original line number Diff line number Diff line
@@ -213,14 +213,14 @@ static void PRINTF(1, 2) lexical_error(const char *fmt, ...); 
<*>\&{LABEL}	{	/* label reference */

			DPRINT("Ref: %s\n", yytext+1);

			yylval.labelref = xstrdup(yytext+1);

			return DT_REF;

			return DT_LABEL_REF;

		}



<*>"&{/"{PATHCHAR}*\}	{	/* new-style path reference */

			yytext[yyleng-1] = '\0';

			DPRINT("Ref: %s\n", yytext+2);

			yylval.labelref = xstrdup(yytext+2);

			return DT_REF;

			return DT_PATH_REF;

		}



<BYTESTRING>[0-9a-fA-F]{2} {

scripts/dtc/dtc-parser.y

+39 −13
Original line number Diff line number Diff line
@@ -70,7 +70,8 @@ extern bool treesource_error; 
%token <byte> DT_BYTE

%token <data> DT_STRING

%token <labelref> DT_LABEL

%token <labelref> DT_REF

%token <labelref> DT_LABEL_REF

%token <labelref> DT_PATH_REF

%token DT_INCBIN



%type <data> propdata
@@ -83,6 +84,7 @@ extern bool treesource_error; 
%type <data> bytestring

%type <prop> propdef

%type <proplist> proplist

%type <labelref> dt_ref



%type <node> devicetree

%type <node> nodedef
@@ -158,6 +160,8 @@ memreserve: 
		}

	;



dt_ref: DT_LABEL_REF | DT_PATH_REF;



devicetree:

	  '/' nodedef

		{
@@ -167,7 +171,7 @@ devicetree: 
		{

			$$ = merge_nodes($1, $3);

		}

	| DT_REF nodedef

	| dt_ref nodedef

		{

			/*

			 * We rely on the rule being always:
@@ -176,9 +180,12 @@ devicetree: 
			 */

			if (!($<flags>-1 & DTSF_PLUGIN))

				ERROR(&@2, "Label or path %s not found", $1);

			$$ = add_orphan_node(name_node(build_node(NULL, NULL), ""), $2, $1);

			$$ = add_orphan_node(

					name_node(build_node(NULL, NULL, NULL),

						  ""),

					$2, $1);

		}

	| devicetree DT_LABEL DT_REF nodedef

	| devicetree DT_LABEL dt_ref nodedef

		{

			struct node *target = get_node_by_ref($1, $3);
@@ -189,7 +196,7 @@ devicetree: 
				ERROR(&@3, "Label or path %s not found", $3);

			$$ = $1;

		}

	| devicetree DT_REF nodedef

	| devicetree DT_PATH_REF nodedef

		{

			/*

			 * We rely on the rule being always:
@@ -208,7 +215,26 @@ devicetree: 
			}

			$$ = $1;

		}

	| devicetree DT_DEL_NODE DT_REF ';'

	| devicetree DT_LABEL_REF nodedef

		{

			struct node *target = get_node_by_ref($1, $2);



			if (target) {

				merge_nodes(target, $3);

			} else {

				/*

				 * We rely on the rule being always:

				 *   versioninfo plugindecl memreserves devicetree

				 * so $-1 is what we want (plugindecl)

				 */

				if ($<flags>-1 & DTSF_PLUGIN)

					add_orphan_node($1, $3, $2);

				else

					ERROR(&@2, "Label or path %s not found", $2);

			}

			$$ = $1;

		}

	| devicetree DT_DEL_NODE dt_ref ';'

		{

			struct node *target = get_node_by_ref($1, $3);
@@ -220,7 +246,7 @@ devicetree: 


			$$ = $1;

		}

	| devicetree DT_OMIT_NO_REF DT_REF ';'

	| devicetree DT_OMIT_NO_REF dt_ref ';'

		{

			struct node *target = get_node_by_ref($1, $3);
@@ -237,7 +263,7 @@ devicetree: 
nodedef:

	  '{' proplist subnodes '}' ';'

		{

			$$ = build_node($2, $3);

			$$ = build_node($2, $3, &@$);

		}

	;
@@ -255,11 +281,11 @@ proplist: 
propdef:

	  DT_PROPNODENAME '=' propdata ';'

		{

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

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

		}

	| DT_PROPNODENAME ';'

		{

			$$ = build_property($1, empty_data);

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

		}

	| DT_DEL_PROP DT_PROPNODENAME ';'

		{
@@ -285,7 +311,7 @@ propdata: 
		{

			$$ = data_merge($1, $3);

		}

	| propdataprefix DT_REF

	| propdataprefix dt_ref

		{

			$1 = data_add_marker($1, TYPE_STRING, $2);

			$$ = data_add_marker($1, REF_PATH, $2);
@@ -383,7 +409,7 @@ arrayprefix: 


			$$.data = data_append_integer($1.data, $2, $1.bits);

		}

	| arrayprefix DT_REF

	| arrayprefix dt_ref

		{

			uint64_t val = ~0ULL >> (64 - $1.bits);
@@ -540,7 +566,7 @@ subnode: 
		}

	| DT_DEL_NODE DT_PROPNODENAME ';'

		{

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

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

		}

	| DT_OMIT_NO_REF subnode

		{

scripts/dtc/dtc.c

+10 −1
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ int phandle_format = PHANDLE_EPAPR; /* Use linux,phandle or phandle properties * 
int generate_symbols;	/* enable symbols & fixup support */

int generate_fixups;		/* suppress generation of fixups on symbol support */

int auto_label_aliases;		/* auto generate labels -> aliases */

int annotate;		/* Level of annotation: 1 for input source location

			   >1 for full input source location. */



static int is_power_of_2(int x)

{
@@ -60,7 +62,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:@Ahv";

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

static struct option const usage_long_opts[] = {

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

	{"in-format",         a_argument, NULL, 'I'},
@@ -81,6 +83,7 @@ static struct option const usage_long_opts[] = { 
	{"error",             a_argument, NULL, 'E'},

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

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

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

	{"help",             no_argument, NULL, 'h'},

	{"version",          no_argument, NULL, 'v'},

	{NULL,               no_argument, NULL, 0x0},
@@ -117,6 +120,7 @@ static const char * const usage_opts_help[] = { 
	"\n\tEnable/disable errors (prefix with \"no-\")",

	"\n\tEnable generation of symbols",

	"\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",

	"\n\tPrint version and exit",

	NULL,
@@ -264,6 +268,9 @@ int main(int argc, char *argv[]) 
		case 'A':

			auto_label_aliases = 1;

			break;

		case 'T':

			annotate++;

			break;



		case 'h':

			usage(NULL);
@@ -302,6 +309,8 @@ int main(int argc, char *argv[]) 
				outform = "dts";

		}

	}

	if (annotate && (!streq(inform, "dts") || !streq(outform, "dts")))

		die("--annotate requires -I dts -O dts\n");

	if (streq(inform, "dts"))

		dti = dt_from_source(arg);

	else if (streq(inform, "fs"))

scripts/dtc/dtc.h

+8 −3
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ extern int phandle_format; /* Use linux,phandle or phandle properties */ 
extern int generate_symbols;	/* generate symbols for nodes with labels */

extern int generate_fixups;	/* generate fixups */

extern int auto_label_aliases;	/* auto generate labels -> aliases */

extern int annotate;		/* annotate .dts with input source location */



#define PHANDLE_LEGACY	0x1

#define PHANDLE_EPAPR	0x2
@@ -158,6 +159,7 @@ struct property { 
	struct property *next;



	struct label *labels;

	struct srcpos *srcpos;

};



struct node {
@@ -177,6 +179,7 @@ struct node { 


	struct label *labels;

	const struct bus_type *bus;

	struct srcpos *srcpos;



	bool omit_if_unused, is_referenced;

};
@@ -205,13 +208,15 @@ 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(char *name, struct data val,

				struct srcpos *srcpos);

struct property *build_property_delete(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 node *build_node_delete(void);

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 *omit_node_if_unused(struct node *node);

struct node *reference_node(struct node *node);

CRA Git | Maintained and supported by SUSTech CRA and CCSE