scripts/dtc: Update to upstream version v1.4.6-9-gaadd0b65c987

This adds the following commits from upstream:

aadd0b65c987 checks: centralize printing of property names in failure messages
88960e398907 checks: centralize printing of node path in check_msg
f1879e1a50eb Add limited read-only support for older (V2 and V3) device tree to libfdt.
37dea76e9700 srcpos: drop special handling of tab
65893da4aee0 libfdt: overlay: Add missing license
962a45ca034d Avoid installing pylibfdt when dependencies are missing
cd6ea1b2bea6 Makefile: Split INSTALL out into INSTALL_{PROGRAM,LIB,DATA,SCRIPT}
51b3a16338df Makefile.tests: Add LIBDL make(1) variable for portability sake
333d533a8f4d Attempt to auto-detect stat(1) being used if not given proper invocation
e54388015af1 dtc: Bump version to v1.4.6
a1fe86f380cb fdtoverlay: Switch from using alloca to malloc
c8d5472de3ff tests: Improve compatibility with other platforms
c81d389a10cc checks: add chosen node checks
e671852042a7 checks: add aliases node checks
d0c44ebe3f42 checks: check for #{size,address}-cells without child nodes
18a3d84bb802 checks: add string list check for *-names properties
8fe94fd6f19f checks: add string list check
6c5730819604 checks: add a string check for 'label' property
a384191eba09 checks: fix sound-dai phandle with arg property check
b260c4f610c0 Fix ambiguous grammar for devicetree rule
fe667e382bac tests: Add some basic tests for the pci_bridge checks
7975f6422260 Fix widespread incorrect use of strneq(), replace with new strprefixeq()
fca296445eab Add strstarts() helper function
cc392f089007 tests: Check non-matching cases for fdt_node_check_compatible()
bba26a5291c8 livetree: avoid assertion of orphan phandles with overlays
c8f8194d76cc implement strnlen for systems that need it
c8b38f65fdec libfdt: Remove leading underscores from identifiers
3b62fdaebfe5 Remove leading underscores from identifiers
2d45d1c5c65e Replace FDT_VERSION() with stringify()
2e6fe5a107b5 Fix some errors in comments
b0ae9e4b0ceb tests: Correct warning in sw_tree1.c

Commit c8b38f65fdec upstream ("libfdt: Remove leading underscores from
identifiers") changed the multiple inclusion define protection, so the
kernel's libfdt_env.h needs the corresponding update.

Signed-off-by: Rob Herring <robh@kernel.org>

20 files changed, 619 insertions, 317 deletions

diff --git a/scripts/dtc/checks.c b/scripts/dtc/checks.c
index e66138449886..c07ba4da9e36 100644
--- a/scripts/dtc/checks.c
+++ b/scripts/dtc/checks.c
@@ -53,26 +53,28 @@ struct check {
         struct check **prereq;
 };
 
-#define CHECK_ENTRY(_nm, _fn, _d, _w, _e, ...)         \
-        static struct check *_nm##_prereqs[] = { __VA_ARGS__ }; \
-        static struct check _nm = { \
-                .name = #_nm, \
-                .fn = (_fn), \
-                .data = (_d), \
-                .warn = (_w), \
-                .error = (_e), \
+#define CHECK_ENTRY(nm_, fn_, d_, w_, e_, ...)         \
+        static struct check *nm_##_prereqs[] = { __VA_ARGS__ }; \
+        static struct check nm_ = { \
+                .name = #nm_, \
+                .fn = (fn_), \
+                .data = (d_), \
+                .warn = (w_), \
+                .error = (e_), \
                 .status = UNCHECKED, \
-                .num_prereqs = ARRAY_SIZE(_nm##_prereqs), \
-                .prereq = _nm##_prereqs, \
+                .num_prereqs = ARRAY_SIZE(nm_##_prereqs), \
+                .prereq = nm_##_prereqs, \
         };
-#define WARNING(_nm, _fn, _d, ...) \
-        CHECK_ENTRY(_nm, _fn, _d, true, false, __VA_ARGS__)
-#define ERROR(_nm, _fn, _d, ...) \
-        CHECK_ENTRY(_nm, _fn, _d, false, true, __VA_ARGS__)
-#define CHECK(_nm, _fn, _d, ...) \
-        CHECK_ENTRY(_nm, _fn, _d, false, false, __VA_ARGS__)
-
-static inline void  PRINTF(3, 4) check_msg(struct check *c, struct dt_info *dti,
+#define WARNING(nm_, fn_, d_, ...) \
+        CHECK_ENTRY(nm_, fn_, d_, true, false, __VA_ARGS__)
+#define ERROR(nm_, fn_, d_, ...) \
+        CHECK_ENTRY(nm_, fn_, d_, false, true, __VA_ARGS__)
+#define CHECK(nm_, fn_, d_, ...) \
+        CHECK_ENTRY(nm_, fn_, d_, false, false, __VA_ARGS__)
+
+static inline void  PRINTF(5, 6) check_msg(struct check *c, struct dt_info *dti,
+                                           struct node *node,
+                                           struct property *prop,
                                            const char *fmt, ...)
 {
         va_list ap;
@@ -83,19 +85,33 @@ static inline void  PRINTF(3, 4) check_msg(struct check *c, struct dt_info *dti,
                 fprintf(stderr, "%s: %s (%s): ",
                         strcmp(dti->outname, "-") ? dti->outname : "<stdout>",
                         (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");
         }
         va_end(ap);
 }
 
-#define FAIL(c, dti, ...)                                               \
+#define FAIL(c, dti, node, ...)                                         \
+        do {                                                            \
+                TRACE((c), "\t\tFAILED at %s:%d", __FILE__, __LINE__);  \
+                (c)->status = FAILED;                                   \
+                check_msg((c), dti, node, NULL, __VA_ARGS__);           \
+        } while (0)
+
+#define FAIL_PROP(c, dti, node, prop, ...)                              \
         do {                                                            \
                 TRACE((c), "\t\tFAILED at %s:%d", __FILE__, __LINE__);  \
                 (c)->status = FAILED;                                   \
-                check_msg((c), dti, __VA_ARGS__);                       \
+                check_msg((c), dti, node, prop, __VA_ARGS__);           \
         } while (0)
 
+
 static void check_nodes_props(struct check *c, struct dt_info *dti, struct node *node)
 {
         struct node *child;
@@ -126,7 +142,7 @@ static bool run_check(struct check *c, struct dt_info *dti)
                 error = error || run_check(prq, dti);
                 if (prq->status != PASSED) {
                         c->status = PREREQ;
-                        check_msg(c, dti, "Failed prerequisite '%s'",
+                        check_msg(c, dti, NULL, NULL, "Failed prerequisite '%s'",
                                   c->prereq[i]->name);
                 }
         }
@@ -156,7 +172,7 @@ out:
 static inline void check_always_fail(struct check *c, struct dt_info *dti,
                                      struct node *node)
 {
-        FAIL(c, dti, "always_fail check");
+        FAIL(c, dti, node, "always_fail check");
 }
 CHECK(always_fail, check_always_fail, NULL);
 
@@ -171,14 +187,42 @@ static void check_is_string(struct check *c, struct dt_info *dti,
                 return; /* Not present, assumed ok */
 
         if (!data_is_one_string(prop->val))
-                FAIL(c, dti, "\"%s\" property in %s is not a string",
-                     propname, node->fullpath);
+                FAIL_PROP(c, dti, node, prop, "property is not a string");
 }
 #define WARNING_IF_NOT_STRING(nm, propname) \
         WARNING(nm, check_is_string, (propname))
 #define ERROR_IF_NOT_STRING(nm, propname) \
         ERROR(nm, check_is_string, (propname))
 
+static void check_is_string_list(struct check *c, struct dt_info *dti,
+                                 struct node *node)
+{
+        int rem, l;
+        struct property *prop;
+        char *propname = c->data;
+        char *str;
+
+        prop = get_property(node, propname);
+        if (!prop)
+                return; /* Not present, assumed ok */
+
+        str = prop->val.val;
+        rem = prop->val.len;
+        while (rem > 0) {
+                l = strnlen(str, rem);
+                if (l == rem) {
+                        FAIL_PROP(c, dti, node, prop, "property is not a string list");
+                        break;
+                }
+                rem -= l + 1;
+                str += l + 1;
+        }
+}
+#define WARNING_IF_NOT_STRING_LIST(nm, propname) \
+        WARNING(nm, check_is_string_list, (propname))
+#define ERROR_IF_NOT_STRING_LIST(nm, propname) \
+        ERROR(nm, check_is_string_list, (propname))
+
 static void check_is_cell(struct check *c, struct dt_info *dti,
                           struct node *node)
 {
@@ -190,8 +234,7 @@ static void check_is_cell(struct check *c, struct dt_info *dti,
                 return; /* Not present, assumed ok */
 
         if (prop->val.len != sizeof(cell_t))
-                FAIL(c, dti, "\"%s\" property in %s is not a single cell",
+                FAIL_PROP(c, dti, node, prop, "property is not a single cell");