From: frowand.list@gmail.com
To: Rob Herring <robh+dt@kernel.org>,
Pantelis Antoniou <pantelis.antoniou@konsulko.com>,
David Airlie <airlied@linux.ie>, Jyri Sarha <jsarha@ti.com>
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Mark Rutland <mark.rutland@arm.com>,
Tomi Valkeinen <tomi.valkeinen@ti.com>,
dri-devel@lists.freedesktop.org
Subject: [PATCH v3 07/12] of: overlay: expand check of whether overlay changeset can be removed
Date: Tue, 17 Oct 2017 16:36:27 -0700 [thread overview]
Message-ID: <1508283392-18252-8-git-send-email-frowand.list@gmail.com> (raw)
In-Reply-To: <1508283392-18252-1-git-send-email-frowand.list@gmail.com>
From: Frank Rowand <frank.rowand@sony.com>
The test of whether it is safe to remove an overlay changeset
looked at whether any node in the overlay changeset was in a
subtree rooted at any more recently applied overlay changeset
node.
The test failed to determine whether any node in the overlay
changeset was the root of a subtree that contained a more
recently applied overlay changeset node. Add this additional
check to the test.
The test is still lacking any check for any phandle dependencies.
Signed-off-by: Frank Rowand <frank.rowand@sony.com>
---
drivers/of/overlay.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 78c50fd57750..4cdee169a5ab 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -707,13 +707,13 @@ static int find_node(struct device_node *tree, struct device_node *np)
}
/*
- * Is @remove_ce_np a child of or the same as any
+ * Is @remove_ce_node a child of, a parent of, or the same as any
* node in an overlay changeset more topmost than @remove_ovcs?
*
* Returns 1 if found, else 0
*/
-static int node_in_later_cs(struct overlay_changeset *remove_ovcs,
- struct device_node *remove_ce_np)
+static int node_overlaps_later_cs(struct overlay_changeset *remove_ovcs,
+ struct device_node *remove_ce_node)
{
struct overlay_changeset *ovcs;
struct of_changeset_entry *ce;
@@ -723,10 +723,16 @@ static int node_in_later_cs(struct overlay_changeset *remove_ovcs,
break;
list_for_each_entry(ce, &ovcs->cset.entries, node) {
- if (find_node(ce->np, remove_ce_np)) {
- pr_err("%s: #%d clashes #%d @%pOF\n",
+ if (find_node(ce->np, remove_ce_node)) {
+ pr_err("%s: #%d overlaps with #%d @%pOF\n",
__func__, remove_ovcs->id, ovcs->id,
- remove_ce_np);
+ remove_ce_node);
+ return 1;
+ }
+ if (find_node(remove_ce_node, ce->np)) {
+ pr_err("%s: #%d overlaps with #%d @%pOF\n",
+ __func__, remove_ovcs->id, ovcs->id,
+ remove_ce_node);
return 1;
}
}
@@ -750,7 +756,7 @@ static int overlay_removal_is_ok(struct overlay_changeset *remove_ovcs)
struct of_changeset_entry *remove_ce;
list_for_each_entry(remove_ce, &remove_ovcs->cset.entries, node) {
- if (node_in_later_cs(remove_ovcs, remove_ce->np)) {
+ if (node_overlaps_later_cs(remove_ovcs, remove_ce->np)) {
pr_err("overlay #%d is not topmost\n", remove_ovcs->id);
return 0;
}
--
Frank Rowand <frank.rowand@sony.com>
next prev parent reply other threads:[~2017-10-17 23:38 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-17 23:36 [PATCH v3 00/12] of: overlay: clean up device tree overlay code frowand.list
2017-10-17 23:36 ` [PATCH v3 01/12] of: overlay.c: Remove comments that state the obvious, to reduce clutter frowand.list
2017-10-17 23:36 ` [PATCH v3 02/12] of: overlay.c: Convert comparisons to zero or NULL to logical expressions frowand.list
2017-10-17 23:36 ` [PATCH v3 03/12] of: overlay: rename identifiers to more reflect what they do frowand.list
2017-10-17 23:36 ` [PATCH v3 04/12] of: overlay: rename identifiers in dup_and_fixup_symbol_prop() frowand.list
2017-10-17 23:36 ` [PATCH v3 05/12] of: overlay: minor restructuring frowand.list
2017-10-17 23:36 ` [PATCH v3 06/12] of: overlay: detect cases where device tree may become corrupt frowand.list
2017-10-19 19:04 ` Alan Tull
2017-10-19 19:19 ` Frank Rowand
2017-10-17 23:36 ` frowand.list [this message]
2017-10-17 23:36 ` [PATCH v3 08/12] of: overlay: loosen overly strict phandle clash check frowand.list
2017-10-17 23:36 ` [PATCH v3 09/12] of: overlay: avoid race condition between applying multiple overlays frowand.list
2017-10-17 23:36 ` [PATCH v3 10/12] of: overlay: simplify applying symbols from an overlay frowand.list
2017-10-17 23:36 ` [PATCH v3 11/12] of: overlay: remove a dependency on device node full_name frowand.list
2017-10-17 23:36 ` [PATCH v3 12/12] of: overlay: remove unneeded check for NULL kbasename() frowand.list
2017-10-18 1:49 ` [PATCH v3 00/12] of: overlay: clean up device tree overlay code Rob Herring
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=1508283392-18252-8-git-send-email-frowand.list@gmail.com \
--to=frowand.list@gmail.com \
--cc=airlied@linux.ie \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=jsarha@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=pantelis.antoniou@konsulko.com \
--cc=robh+dt@kernel.org \
--cc=tomi.valkeinen@ti.com \
/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).