Skip to contentSkip to conversation

Revert "dm: core: Scan "/firmware" node by default"

PATCH New Thirupathaiah Annapureddy 2 participants 3 messages Jan 8, 2020 – Jan 9, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "dm: core: Scan "/firmware" node by default"

Subnodes under "/firmware" node are scanned twice in dm_scan_fdt_node and dm_extended_scan_fdt. This patch removes the double scanning.

This reverts commit 1712ca21924bff678f19fd3141f435408d23bdbf.

---
 drivers/core/root.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/core/root.c +1 -7
index e85643819e..daf7c61190 100644
@@ -342,14 +342,8 @@ int dm_extended_scan_fdt(const void *blob, bool pre_reloc_only)
 	}
 
 	ret = dm_scan_fdt_ofnode_path("/clocks", pre_reloc_only);
-	if (ret) {
-		debug("scan for /clocks failed: %d\n", ret);
-		return ret;
-	}
-
-	ret = dm_scan_fdt_ofnode_path("/firmware", pre_reloc_only);
 	if (ret)
-		debug("scan for /firmware failed: %d\n", ret);
+		debug("scan for /clocks failed: %d\n", ret);
 
 	return ret;
 }
Signature · 1 line
2.24.1
#1 lore raw

PATCH 1/1 Revert "dm: core: Scan "/firmware" node by default"

Hi T,

Quoted 32 lines · Thirupathaiah Annapureddy

Subnodes under "/firmware" node are scanned twice in dm_scan_fdt_node and dm_extended_scan_fdt. This patch removes the double scanning.

This reverts commit 1712ca21924bff678f19fd3141f435408d23bdbf.

---
 drivers/core/root.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/core/root.c +1 -8
index e85643819e..daf7c61190 100644
@@ -342,14 +342,8 @@ int dm_extended_scan_fdt(const void *blob, bool pre_reloc_only)
        }
 
        ret = dm_scan_fdt_ofnode_path("/clocks", pre_reloc_only);
-       if (ret) {
-               debug("scan for /clocks failed: %d\n", ret);
-               return ret;
-       }
-
-       ret = dm_scan_fdt_ofnode_path("/firmware", pre_reloc_only);
        if (ret)
-               debug("scan for /firmware failed: %d\n", ret);
+               debug("scan for /clocks failed: %d\n", ret);
 
        return ret;
 }
--
Quoted 2 lines

2.24.1

I actually think it would be better to remove this from dm_scan_fdt_node() since that function looks for f

#2 lore raw

PATCH 1/1 Revert "dm: core: Scan "/firmware" node by default"

Quoted 33 lines · Simon Glass

Hi T,

Quoted 29 lines · Thirupathaiah Annapureddy

Subnodes under "/firmware" node are scanned twice in dm_scan_fdt_node and dm_extended_scan_fdt. This patch removes the double scanning.

This reverts commit 1712ca21924bff678f19fd3141f435408d23bdbf.

---
 drivers/core/root.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/core/root.c +1 -7
index e85643819e..daf7c61190 100644
@@ -342,14 +342,8 @@ int dm_extended_scan_fdt(const void *blob, bool pre_reloc_only)
        }
 
        ret = dm_scan_fdt_ofnode_path("/clocks", pre_reloc_only);
-       if (ret) {
-               debug("scan for /clocks failed: %d\n", ret);
-               return ret;
-       }
-
-       ret = dm_scan_fdt_ofnode_path("/firmware", pre_reloc_only);
        if (ret)
-               debug("scan for /firmware failed: %d\n", ret);
+               debug("scan for /clocks failed: %d\n", ret);
 
Quoted 9 lines
Quoted 5 lines
drivers/core/root.c +0 -1
        return ret;
 }
--

2.24.1

I actually think it would be better to remove this from dm_scan_fdt_node() since that function looks for f

Hi Simon,

Thanks. I will address your comment and send new patch.
My rationale for removing the scanning from dm_extended_scan_fdt() was based on the order of the scan. Why do you think removing the scan from dm_extended_scan_fdt() is better?

--Thiru