From: frowand.list@gmail.com
To: Rob Herring <robh+dt@kernel.org>,
Pantelis Antoniou <pantelis.antoniou@konsulko.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>, Alan Tull <atull@kernel.org>,
Moritz Fischer <mdf@kernel.org>
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
devicetree@vger.kernel.org, linux-fpga@vger.kernel.org
Subject: [PATCH v6 16/18] of: unittest: allow base devicetree to have symbol metadata
Date: Mon, 5 Nov 2018 07:25:13 -0800 [thread overview]
Message-ID: <1541431515-25197-17-git-send-email-frowand.list@gmail.com> (raw)
In-Reply-To: <1541431515-25197-1-git-send-email-frowand.list@gmail.com>
From: Frank Rowand <frank.rowand@sony.com>
The overlay metadata nodes in the FDT created from testcases.dts
are not handled properly.
The __fixups__ and __local_fixups__ node were added to the live
devicetree, but should not be.
Only the first property in the /__symbols__ node was added to the
live devicetree if the live devicetree already contained a
/__symbols node. All of the node's properties must be added.
Tested-by: Alan Tull <atull@kernel.org>
Signed-off-by: Frank Rowand <frank.rowand@sony.com>
---
drivers/of/unittest.c | 43 +++++++++++++++++++++++++++++++++++--------
1 file changed, 35 insertions(+), 8 deletions(-)
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index 14838b21ec6a..d625a91a7f60 100644
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -1071,20 +1071,44 @@ static void __init of_unittest_platform_populate(void)
* of np into dup node (present in live tree) and
* updates parent of children of np to dup.
*
- * @np: node already present in live tree
+ * @np: node whose properties are being added to the live tree
* @dup: node present in live tree to be updated
*/
static void update_node_properties(struct device_node *np,
struct device_node *dup)
{
struct property *prop;
+ struct property *save_next;
struct device_node *child;
-
- for_each_property_of_node(np, prop)
- of_add_property(dup, prop);
+ int ret;
for_each_child_of_node(np, child)
child->parent = dup;
+
+ /*
+ * "unittest internal error: unable to add testdata property"
+ *
+ * If this message reports a property in node '/__symbols__' then
+ * the respective unittest overlay contains a label that has the
+ * same name as a label in the live devicetree. The label will
+ * be in the live devicetree only if the devicetree source was
+ * compiled with the '-@' option. If you encounter this error,
+ * please consider renaming __all__ of the labels in the unittest
+ * overlay dts files with an odd prefix that is unlikely to be
+ * used in a real devicetree.
+ */
+
+ /*
+ * open code for_each_property_of_node() because of_add_property()
+ * sets prop->next to NULL
+ */
+ for (prop = np->properties; prop != NULL; prop = save_next) {
+ save_next = prop->next;
+ ret = of_add_property(dup, prop);
+ if (ret)
+ pr_err("unittest internal error: unable to add testdata property %pOF/%s",
+ np, prop->name);
+ }
}
/**
@@ -1093,18 +1117,23 @@ static void update_node_properties(struct device_node *np,
*
* @np: Node to attach to live tree
*/
-static int attach_node_and_children(struct device_node *np)
+static void attach_node_and_children(struct device_node *np)
{
struct device_node *next, *dup, *child;
unsigned long flags;
const char *full_name;
full_name = kasprintf(GFP_KERNEL, "%pOF", np);
+
+ if (!strcmp(full_name, "/__local_fixups__") ||
+ !strcmp(full_name, "/__fixups__"))
+ return;
+
dup = of_find_node_by_path(full_name);
kfree(full_name);
if (dup) {
update_node_properties(np, dup);
- return 0;
+ return;
}
child = np->child;
@@ -1125,8 +1154,6 @@ static int attach_node_and_children(struct device_node *np)
attach_node_and_children(child);
child = next;
}
-
- return 0;
}
/**
--
Frank Rowand <frank.rowand@sony.com>
next prev parent reply other threads:[~2018-11-05 15:27 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-05 15:24 [PATCH v6 00/18] of: overlay: validation checks, subsequent fixes frowand.list
2018-11-05 15:24 ` [PATCH v6 01/18] of: overlay: add tests to validate kfrees from overlay removal frowand.list
2018-11-05 15:24 ` [PATCH v6 02/18] of: overlay: add missing of_node_put() after add new node to changeset frowand.list
2018-11-05 15:25 ` [PATCH v6 03/18] of: overlay: add missing of_node_get() in __of_attach_node_sysfs frowand.list
2018-11-07 12:14 ` Michael Ellerman
2018-11-07 14:57 ` Frank Rowand
2018-11-05 15:25 ` [PATCH v6 04/18] powerpc/pseries: add of_node_put() in dlpar_detach_node() frowand.list
2018-11-07 12:23 ` Michael Ellerman
2018-11-07 14:58 ` Frank Rowand
2018-11-05 15:25 ` [PATCH v6 05/18] of: overlay: use prop add changeset entry for property in new nodes frowand.list
2018-11-05 15:25 ` [PATCH v6 06/18] of: overlay: do not duplicate properties from overlay for " frowand.list
2018-11-05 15:25 ` [PATCH v6 07/18] of: dynamic: change type of of_{at,de}tach_node() to void frowand.list
2018-11-07 12:08 ` Michael Ellerman
2018-11-07 14:55 ` Frank Rowand
2018-11-07 23:48 ` Michael Ellerman
2018-11-05 15:25 ` [PATCH v6 08/18] of: overlay: reorder fields in struct fragment frowand.list
2018-11-05 15:25 ` [PATCH v6 09/18] of: overlay: validate overlay properties #address-cells and #size-cells frowand.list
2018-11-05 15:25 ` [PATCH v6 10/18] of: overlay: make all pr_debug() and pr_err() messages unique frowand.list
2018-11-05 15:25 ` [PATCH v6 11/18] of: overlay: test case of two fragments adding same node frowand.list
2018-11-05 15:25 ` [PATCH v6 12/18] of: overlay: check prevents multiple fragments add or delete " frowand.list
2018-11-05 15:25 ` [PATCH v6 13/18] of: overlay: check prevents multiple fragments touching same property frowand.list
2018-11-05 15:25 ` [PATCH v6 14/18] of: unittest: remove unused of_unittest_apply_overlay() argument frowand.list
2018-11-05 15:25 ` [PATCH v6 15/18] of: overlay: set node fields from properties when add new overlay node frowand.list
2018-11-05 15:25 ` frowand.list [this message]
2018-11-05 15:25 ` [PATCH v6 17/18] of: unittest: find overlays[] entry by name instead of index frowand.list
2018-11-05 15:25 ` [PATCH v6 18/18] of: unittest: initialize args before calling of_*parse_*() frowand.list
2018-11-05 19:24 ` [PATCH v6 00/18] of: overlay: validation checks, subsequent fixes Rob Herring
2018-11-05 21:55 ` Frank Rowand
2018-11-07 12:09 ` Michael Ellerman
2018-11-07 14:59 ` Frank Rowand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1541431515-25197-17-git-send-email-frowand.list@gmail.com \
--to=frowand.list@gmail.com \
--cc=atull@kernel.org \
--cc=benh@kernel.crashing.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-fpga@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mdf@kernel.org \
--cc=mpe@ellerman.id.au \
--cc=pantelis.antoniou@konsulko.com \
--cc=paulus@samba.org \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).