[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250430124910.195368-3-herve.codina@bootlin.com>
Date: Wed, 30 Apr 2025 14:49:01 +0200
From: Herve Codina <herve.codina@...tlin.com>
To: David Gibson <david@...son.dropbear.id.au>,
Andrew Davis <afd@...com>,
Ayush Singh <ayush@...gleboard.org>,
Geert Uytterhoeven <geert@...ux-m68k.org>,
Rob Herring <robh@...nel.org>,
Krzysztof Kozlowski <krzk+dt@...nel.org>,
Conor Dooley <conor+dt@...nel.org>,
Herve Codina <herve.codina@...tlin.com>,
Arnd Bergmann <arnd@...db.de>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Saravana Kannan <saravanak@...gle.com>
Cc: devicetree@...r.kernel.org,
devicetree-compiler@...r.kernel.org,
linux-kernel@...r.kernel.org,
Luca Ceresoli <luca.ceresoli@...tlin.com>,
Thomas Petazzoni <thomas.petazzoni@...tlin.com>
Subject: [PATCH 2/7] of: resolver: Introduce get_phandle_from_symbols_node()
In order to simplify the introduction of the export symbols node
handling, group necessary operations done to get a phandle from the
__symbols__ node in this dedicated get_phandle_from_symbols_node()
function.
Signed-off-by: Herve Codina <herve.codina@...tlin.com>
Tested-by: Ayush Singh <ayush@...gleboard.org>
---
drivers/of/resolver.c | 39 ++++++++++++++++++++++++++-------------
1 file changed, 26 insertions(+), 13 deletions(-)
diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c
index 86424e145919..2c7a3b479b15 100644
--- a/drivers/of/resolver.c
+++ b/drivers/of/resolver.c
@@ -212,6 +212,28 @@ static int adjust_local_phandle_references(const struct device_node *local_fixup
return 0;
}
+static int get_phandle_from_symbols_node(const struct device_node *tree_symbols,
+ const char *symbol_name,
+ phandle *phandle)
+{
+ struct device_node *refnode;
+ const char *refpath;
+ int err;
+
+ err = of_property_read_string(tree_symbols, symbol_name, &refpath);
+ if (err)
+ return err;
+
+ refnode = of_find_node_by_path(refpath);
+ if (!refnode)
+ return -ENOENT;
+
+ *phandle = refnode->phandle;
+ of_node_put(refnode);
+
+ return 0;
+}
+
/**
* of_resolve_phandles - Relocate and resolve overlay against live tree
*
@@ -247,11 +269,9 @@ static int adjust_local_phandle_references(const struct device_node *local_fixup
*/
int of_resolve_phandles(struct device_node *overlay)
{
- struct device_node *child, *refnode;
- struct device_node *overlay_fixups;
+ struct device_node *child, *overlay_fixups;
struct device_node __free(device_node) *local_fixups = NULL;
struct property *prop;
- const char *refpath;
phandle phandle, phandle_delta;
int err;
@@ -298,21 +318,14 @@ int of_resolve_phandles(struct device_node *overlay)
if (!of_prop_cmp(prop->name, "name"))
continue;
- err = of_property_read_string(tree_symbols,
- prop->name, &refpath);
+ err = get_phandle_from_symbols_node(tree_symbols, prop->name,
+ &phandle);
if (err) {
- pr_err("node label '%s' not found in live devicetree symbols table\n",
+ pr_err("node label '%s' not found or invalid in live devicetree symbols table\n",
prop->name);
return err;
}
- refnode = of_find_node_by_path(refpath);
- if (!refnode)
- return -ENOENT;
-
- phandle = refnode->phandle;
- of_node_put(refnode);
-
err = update_usages_of_a_phandle_reference(overlay, prop, phandle);
if (err)
break;
--
2.49.0
Powered by blists - more mailing lists