From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
To: saravanak@google.com, linux-kernel@vger.kernel.org,
Rob Herring <robh+dt@kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: devicetree@vger.kernel.org,
Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Subject: [PATCH v2 2/2] of: property: Do not link to disabled devices
Date: Fri, 17 Apr 2020 18:54:42 +0200 [thread overview]
Message-ID: <20200417165442.1856-3-nsaenzjulienne@suse.de> (raw)
In-Reply-To: <20200417165442.1856-1-nsaenzjulienne@suse.de>
When creating a consumer/supplier relationship between two devices,
make sure the supplier node is actually active. Otherwise this will
create a link relationship that will never be fulfilled. This, in the
worst case scenario, will hang the system during boot.
Note that, in practice, the fact that a device-tree represented
consumer/supplier relationship isn't fulfilled will not prevent devices
from successfully probing.
Fixes: a3e1d1a7f5fc ("of: property: Add functional dependency link from DT bindings")
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
---
Changes since v1:
- Move availability check into the compatible search routine and bail
if device node disabled
drivers/of/property.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/drivers/of/property.c b/drivers/of/property.c
index dc034eb45defd..14b6266dd054b 100644
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@ -1045,8 +1045,25 @@ static int of_link_to_phandle(struct device *dev, struct device_node *sup_np,
* Find the device node that contains the supplier phandle. It may be
* @sup_np or it may be an ancestor of @sup_np.
*/
- while (sup_np && !of_find_property(sup_np, "compatible", NULL))
+ while (sup_np) {
+
+ /*
+ * Don't allow linking a device node as consumer of a disabled
+ * node.
+ */
+ if (!of_device_is_available(sup_np)) {
+ dev_dbg(dev, "Not linking to %pOFP - Not available\n",
+ sup_np);
+ of_node_put(sup_np);
+ return -ENODEV;
+ }
+
+ if (of_find_property(sup_np, "compatible", NULL))
+ break;
+
sup_np = of_get_next_parent(sup_np);
+ }
+
if (!sup_np) {
dev_dbg(dev, "Not linking to %pOFP - No device\n", tmp_np);
return -ENODEV;
--
2.26.0
next prev parent reply other threads:[~2020-04-17 16:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-17 16:54 [PATCH v2 0/2] of: property: fw_devlink misc fixes Nicolas Saenz Julienne
2020-04-17 16:54 ` [PATCH v2 1/2] of: property: Fix create device links for all child-supplier dependencies Nicolas Saenz Julienne
2020-04-17 20:56 ` Saravana Kannan
2020-04-17 16:54 ` Nicolas Saenz Julienne [this message]
2020-04-17 21:08 ` [PATCH v2 2/2] of: property: Do not link to disabled devices Saravana Kannan
2020-04-18 9:20 ` Nicolas Saenz Julienne
2020-04-17 18:06 ` [PATCH v2 0/2] of: property: fw_devlink misc fixes Nicolas Saenz Julienne
2020-04-17 20:55 ` Saravana Kannan
2020-04-20 11:29 ` Nicolas Saenz Julienne
2020-04-20 22:37 ` Saravana Kannan
2020-04-21 8:54 ` Nicolas Saenz Julienne
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=20200417165442.1856-3-nsaenzjulienne@suse.de \
--to=nsaenzjulienne@suse.de \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=saravanak@google.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).