From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9976525A65B; Wed, 30 Apr 2025 12:52:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.194 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746017531; cv=none; b=HryDafu5dBPVkZE9/2dYDqvs0wR23LNXHAnYhF73KAFAi4duN6jLZIY+xZwHXBD7lytjhIy1J8PIJ6hi0HL8jspxl08mAKe+scsIcMZkPxUD/17fOUMoiwhpGjAJ0GBS72Pzn2XjTX3P44lGoN7j5CJfaNFlC2rmQUAiRtGFMTA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746017531; c=relaxed/simple; bh=04Lgsevk075WoZNcBOi6TghRMwt8xkLiKvl4P7+VTdQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JSPC9o2KeVYdjT57urSBjX2rF1CESWl1WYZy2Njt0zqg6VCpor6pAd1Oum3P57AuGr0B6gOjJfzCb3zOhHivCnq36GHinxgzfeaDG3J0Rh3w38RcFoOeCVVqzNbrgJdWaBgxFS99/8h63x6+dNi47qvK2dq7Z7W6YuX9aoBr08I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=pMX7HqAH; arc=none smtp.client-ip=217.70.183.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="pMX7HqAH" Received: by mail.gandi.net (Postfix) with ESMTPA id 18F8E438AF; Wed, 30 Apr 2025 12:52:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1746017527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MeC3Blleg5ID5FjARVSQZ7w0x3ZCmA8mRG7YjX82K+A=; b=pMX7HqAHsWNh3AUjTppEwZBlIfYDPUbcEzKyp40WRB5bJu6IVHACeqrzwIaV6xij6m4UUq 7GcxYuWK2SbRO0M/SKyJx+Upfsv1OAMXsqIXX9t/tn4My/tXBfoPijO82jd7EB8jNYhW0h 10aFPTyNvM8a+3ZWBY/2xPNAl0xFSy2HP3QnzPpQCU01ZgcEZ4quJaf6XC55NWYFBqBuN1 w8Y67nuDbXoZeOcTf07JRSL33cquJ2NZU/RUaZz8kZ5dTw76AtXsN1erD/ZARLMZGgOPjR eCARbQOmiT3529bz7Y/aZdp1zJvdQgtr5tF3GS/BxAM6SWk9SC6GzWgqTRw6Sw== From: Herve Codina To: David Gibson , Andrew Davis , Ayush Singh , Geert Uytterhoeven , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Herve Codina , Arnd Bergmann , Greg Kroah-Hartman , Saravana Kannan Cc: devicetree@vger.kernel.org, devicetree-compiler@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Ceresoli , Thomas Petazzoni Subject: [PATCH v2 2/7] of: resolver: Introduce get_phandle_from_symbols_node() Date: Wed, 30 Apr 2025 14:51:46 +0200 Message-ID: <20250430125154.195498-3-herve.codina@bootlin.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250430125154.195498-1-herve.codina@bootlin.com> References: <20250430125154.195498-1-herve.codina@bootlin.com> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-GND-State: clean X-GND-Score: -100 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvieeijeehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefjvghrvhgvucevohguihhnrgcuoehhvghrvhgvrdgtohguihhnrgessghoohhtlhhinhdrtghomheqnecuggftrfgrthhtvghrnhepheffiefgjeeuleeuueffleeufefglefhjefhheeigedukeetieeltddthfffkeffnecukfhppeeltddrkeelrdduieefrdduvdejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepledtrdekledrudeifedruddvjedphhgvlhhopehlohgtrghlhhhoshhtrdhlohgtrghlughomhgrihhnpdhmrghilhhfrhhomhephhgvrhhvvgdrtghoughinhgrsegsohhothhlihhnrdgtohhmpdhnsggprhgtphhtthhopeduiedprhgtphhtthhopegurghvihgusehgihgsshhonhdrughrohhpsggvrghrrdhiugdrrghupdhrtghpthhtoheprghfugesthhirdgtohhmpdhrtghpthhtoheprgihuhhshhessggvrghglhgvsghorghrugdrohhrghdprhgtphhtthhopehgvggvrhhtsehlihhnuhigqdhmieekkhdrohhrghdprhgtphhtthhopehrohgshheskhgvrhhnvghlrdhorhhgpdhrtghpthhtohepk hhriihkodgutheskhgvrhhnvghlrdhorhhgpdhrtghpthhtoheptghonhhorhdoughtsehkvghrnhgvlhdrohhrghdprhgtphhtthhopehhvghrvhgvrdgtohguihhnrgessghoohhtlhhinhdrtghomh X-GND-Sasl: herve.codina@bootlin.com 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 Tested-by: Ayush Singh --- 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