[PATCH 7/7] lib: utils/reset: Fix fdt_reset to search for more dt nodes

Xiang W wxjstz at 126.com
Tue Jun 11 04:19:34 PDT 2024


If there are multiple dt nodes, the previous code only tries to match
the first one, which may lose initialization.

Signed-off-by: Xiang W <wxjstz at 126.com>
---
 lib/utils/reset/fdt_reset.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/utils/reset/fdt_reset.c b/lib/utils/reset/fdt_reset.c
index 327fb99..df67da1 100644
--- a/lib/utils/reset/fdt_reset.c
+++ b/lib/utils/reset/fdt_reset.c
@@ -22,18 +22,18 @@ int fdt_reset_driver_init(void *fdt, struct fdt_reset *drv)
 	int noff, rc = SBI_ENODEV;
 	const struct fdt_match *match;
 
-	noff = fdt_find_match(fdt, -1, drv->match_table, &match);
-	if (noff < 0)
-		return SBI_ENODEV;
-
-	if (!fdt_node_is_enabled(fdt, noff))
-		return SBI_ENODEV;
-
-	if (drv->init) {
-		rc = drv->init(fdt, noff, match);
-		if (rc && rc != SBI_ENODEV) {
-			sbi_printf("%s: %s init failed, %d\n",
-				   __func__, match->compatible, rc);
+	noff = -1;
+	while ((noff = fdt_find_match(fdt, noff,
+				drv->match_table, &match)) >= 0) {
+		if (!fdt_node_is_enabled(fdt, noff))
+			continue;
+
+		if (drv->init) {
+			rc = drv->init(fdt, noff, match);
+			if (rc && rc != SBI_ENODEV) {
+				sbi_printf("%s: %s init failed, %d\n",
+					__func__, match->compatible, rc);
+			}
 		}
 	}
 
-- 
2.43.0




More information about the opensbi mailing list