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 913AB25B669; Wed, 30 Apr 2025 12:52:10 +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=1746017532; cv=none; b=YWQlnbAfGXSJ5eBS8DVUDdP9xAba+aR4W/v58cnlijxBeRkwLp+bZ23B6YLqOXbUYY64ObolgnBwJyGrxXBelBVhU1BkYTMMQQ2LEU9vPHWd/xWC+MAM+LdbWolU2KXXetTqycXUJx8g7vWNebRy7EWlI5ixY7LWPPg2FZY42+Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746017532; c=relaxed/simple; bh=Y7Zm8w9wG8YslhOw/WDwwhycO9VpWrlfhSRsBRFKNw8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YUQaYK9SRabQ7CV3/kzpzojUA9m01e60l51mwc88pNTzSIJ2oJkYMXkwqpKShw8VVUCpvZO00gN2+PwJrglDc1u5OE5hPFy4raR9EbTGzLEieYSVXWI8LfmZ6jMnIN+yjneyl+q4lk6YovpDLLK0qFb2Mz2EUaXJ8rQOQXenoeI= 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=bWZWa5JZ; 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="bWZWa5JZ" Received: by mail.gandi.net (Postfix) with ESMTPA id F0D16438B2; 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=1746017528; 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=zc5KU+vZ9ltSWyx9XaPn8D3Abm11V5SwRuQjnQVNZsw=; b=bWZWa5JZu7pPk819ten7Bf9cByfk+GTG0w4rTl6SSaXUz3EzDYrHuQ7K8uV884/mCmC9w7 1xnaVnwp2WRnLnTel1+amjqqJY/mCTqofiEyJuMF7mB4EGb8HLEH8+0r7k/ZxDovuyrU6j PPb1kHzSwSAHHcXLLkdSSkvQZ6RvuZrjgIEnzAOlV8d4DY7VKnhg9gc4fKGtkbvFOjJpuq XPO6wLVc9fTUh9kxs2ZQMioJgZnScTUuhFSDvOdBMvJX1JWQoxQHH64ZE3dWKKG4ngcrEX saWkUZDn35AjUUgrKWPvheRwvRgjbgemqjIJRRAaOmKoMbRzqaDlLpRmADDE9g== 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 3/7] of: resolver: Add export_symbols in of_resolve_phandles() parameters Date: Wed, 30 Apr 2025 14:51:47 +0200 Message-ID: <20250430125154.195498-4-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 prepare the introduction of the export symbols node handling, add a export_symbols parameter in of_resolve_phandles(). The export_symbols is the export symbols device tree node the resolver will use for the overlay symbols resolution. Signed-off-by: Herve Codina Tested-by: Ayush Singh --- drivers/of/of_private.h | 2 +- drivers/of/overlay.c | 2 +- drivers/of/resolver.c | 9 +++++++-- drivers/of/unittest.c | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h index df0bb00349e0..cf68edb873ab 100644 --- a/drivers/of/of_private.h +++ b/drivers/of/of_private.h @@ -94,7 +94,7 @@ static inline void __of_detach_node_sysfs(struct device_node *np) {} #endif #if defined(CONFIG_OF_RESOLVE) -int of_resolve_phandles(struct device_node *tree); +int of_resolve_phandles(struct device_node *tree, const struct device_node *export_symbols); #endif void __of_phandle_cache_inv_entry(phandle handle); diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 1af6f52d0708..aa1b97e634aa 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -919,7 +919,7 @@ static int of_overlay_apply(struct overlay_changeset *ovcs, { int ret = 0, ret_revert, ret_tmp; - ret = of_resolve_phandles(ovcs->overlay_root); + ret = of_resolve_phandles(ovcs->overlay_root, NULL); if (ret) goto out; diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c index 2c7a3b479b15..5c492711b21f 100644 --- a/drivers/of/resolver.c +++ b/drivers/of/resolver.c @@ -237,7 +237,8 @@ static int get_phandle_from_symbols_node(const struct device_node *tree_symbols, /** * of_resolve_phandles - Relocate and resolve overlay against live tree * - * @overlay: Pointer to devicetree overlay to relocate and resolve + * @overlay: Pointer to devicetree overlay to relocate and resolve + * @export_symbols: Pointer to devicetree export symbols node. * * Modify (relocate) values of local phandles in @overlay to a range that * does not conflict with the live expanded devicetree. Update references @@ -257,6 +258,10 @@ static int get_phandle_from_symbols_node(const struct device_node *tree_symbols, * corresponding to that symbol in the live tree. Update the references in * the overlay with the phandle values in the live tree. * + * @export_symbols can be use in this references update. The resolver tries + * first to find a match in the @export_symbols. If not found, it uses the + * "__symbol__" node in the live tree. + * * @overlay must be detached. * * Resolving and applying @overlay to the live expanded devicetree must be @@ -267,7 +272,7 @@ static int get_phandle_from_symbols_node(const struct device_node *tree_symbols, * * Return: %0 on success or a negative error value on error. */ -int of_resolve_phandles(struct device_node *overlay) +int of_resolve_phandles(struct device_node *overlay, const struct device_node *export_symbols) { struct device_node *child, *overlay_fixups; struct device_node __free(device_node) *local_fixups = NULL; diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 64d301893af7..620237365566 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -2026,7 +2026,7 @@ static int __init unittest_data_add(void) */ of_overlay_mutex_lock(); - rc = of_resolve_phandles(unittest_data_node); + rc = of_resolve_phandles(unittest_data_node, NULL); if (rc) { pr_err("%s: Failed to resolve phandles (rc=%i)\n", __func__, rc); of_overlay_mutex_unlock(); @@ -3915,7 +3915,7 @@ static __init void of_unittest_overlay_high_level(void) * because kmalloc() was not yet available. */ of_overlay_mutex_lock(); - of_resolve_phandles(overlay_base_root); + of_resolve_phandles(overlay_base_root, NULL); of_overlay_mutex_unlock(); -- 2.49.0