From: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Date: Tue, 10 Mar 2026 15:15:15 +0000 (+0100)
Subject: reset: don't overwrite fwnode_reset_n_cells
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62d11b80ea5d118ba4a1b24e55ca13d77a4cf161;p=thirdparty%2Fkernel%2Flinux.git

reset: don't overwrite fwnode_reset_n_cells

Fix a logic bug in reset_controller_register() where we set
fwnode_reset_n_cells to 1 if fwnode is set and fwnode_xlate is not but
we do it after assigning of_fwnode_handle(of_node) to fwnode.

Modify the logic to: assign fwnode from of_node if applicable, if fwnode
is still not set, try to get it from the device and only then check
of_xlate and fwnode_xlate and either assign fwnode_reset_n_cells from OF
or default to fwnode_reset_simple_xlate and fwnode_reset_n_cells = 1.

Fixes: ba8dbbb14b7e ("reset: convert the core API to using firmware nodes")
Reported-by: Mark Brown <broonie@kernel.org>
Closes: https://lore.kernel.org/all/0b72286b-33dd-4bc9-8c0e-161c2f4baed8@sirena.org.uk/
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Tested-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---

diff --git a/drivers/reset/core.c b/drivers/reset/core.c
index 726b7346b148b..a0d8c68f2afc2 100644
--- a/drivers/reset/core.c
+++ b/drivers/reset/core.c
@@ -132,20 +132,21 @@ int reset_controller_register(struct reset_controller_dev *rcdev)
 	if ((rcdev->of_node && rcdev->fwnode) || (rcdev->of_xlate && rcdev->fwnode_xlate))
 		return -EINVAL;
 
-	if (!rcdev->of_node && !rcdev->fwnode) {
+	if (rcdev->of_node && !rcdev->fwnode)
+		rcdev->fwnode = of_fwnode_handle(rcdev->of_node);
+
+	if (!rcdev->fwnode) {
 		rcdev->fwnode = dev_fwnode(rcdev->dev);
 		if (!rcdev->fwnode)
 			return -EINVAL;
 	}
 
-	if (rcdev->of_node) {
-		rcdev->fwnode = of_fwnode_handle(rcdev->of_node);
+	if (rcdev->of_xlate)
 		rcdev->fwnode_reset_n_cells = rcdev->of_reset_n_cells;
-	}
 
-	if (rcdev->fwnode && !rcdev->fwnode_xlate) {
-		rcdev->fwnode_reset_n_cells = 1;
+	if (!rcdev->fwnode_xlate && !rcdev->of_xlate) {
 		rcdev->fwnode_xlate = fwnode_reset_simple_xlate;
+		rcdev->fwnode_reset_n_cells = 1;
 	}
 
 	INIT_LIST_HEAD(&rcdev->reset_control_head);