dm: fix ofnode_read_addr/size_cells()

In the case of the live tree ofnode_read_addr_cells() and
ofnode_read_size_cells() return the #address-cells and #size-cells defined
in the parent node. With the patch the same is done for a non-live tree.

The only consumer of these functions is currently the CFI flash driver.

This patch fixes the incorrect parsing of the device tree leading to
'saveenv' failing on qemu_arm64_defconfig.

For testing qemu-system-aarch64 has to be called with

    -drive if=pflash,format=raw,index=1,file=envstore.img

to provide the flash memory. envstore.img must be 64 MiB large.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index c37afa1fe6fc8967fbbb3cab8f45cde83d24b30f..d02d8d33fef178410bae3a9c1327a7b12bb3542b 100644 (file)
--- a/drivers/core/ofnode.c
+++ b/drivers/core/ofnode.c
@@ -776,18 +776,26 @@ int ofnode_read_pci_vendev(ofnode node, u16 *vendor, u16 *device)
 
 int ofnode_read_addr_cells(ofnode node)
 {
-       if (ofnode_is_np(node))
+       if (ofnode_is_np(node)) {
                return of_n_addr_cells(ofnode_to_np(node));
-       else  /* NOTE: this call should walk up the parent stack */
-               return fdt_address_cells(gd->fdt_blob, ofnode_to_offset(node));
+       } else {
+               int parent = fdt_parent_offset(gd->fdt_blob,
+                                              ofnode_to_offset(node));
+
+               return fdt_address_cells(gd->fdt_blob, parent);
+       }
 }
 
 int ofnode_read_size_cells(ofnode node)
 {
-       if (ofnode_is_np(node))
+       if (ofnode_is_np(node)) {
                return of_n_size_cells(ofnode_to_np(node));
-       else  /* NOTE: this call should walk up the parent stack */
-               return fdt_size_cells(gd->fdt_blob, ofnode_to_offset(node));
+       } else {
+               int parent = fdt_parent_offset(gd->fdt_blob,
+                                              ofnode_to_offset(node));
+
+               return fdt_size_cells(gd->fdt_blob, parent);
+       }
 }
 
 int ofnode_read_simple_addr_cells(ofnode node)

diff --git a/include/dm/read.h b/include/dm/read.h
index 487ec9e9c933e26e47cb22d894ef63b7c143cb8f..cac7dd5f187ee9e26e3f036153884022daae3d0c 100644 (file)
--- a/include/dm/read.h
+++ b/include/dm/read.h
@@ -878,14 +878,16 @@ static inline int dev_count_phandle_with_args(const struct udevice *dev,
 
 static inline int dev_read_addr_cells(const struct udevice *dev)
 {
-       /* NOTE: this call should walk up the parent stack */
-       return fdt_address_cells(gd->fdt_blob, dev_of_offset(dev));
+       int parent = fdt_parent_offset(gd->fdt_blob, dev_of_offset(dev));
+
+       return fdt_address_cells(gd->fdt_blob, parent);
 }
 
 static inline int dev_read_size_cells(const struct udevice *dev)
 {
-       /* NOTE: this call should walk up the parent stack */
-       return fdt_size_cells(gd->fdt_blob, dev_of_offset(dev));
+       int parent = fdt_parent_offset(gd->fdt_blob, dev_of_offset(dev));
+
+       return fdt_size_cells(gd->fdt_blob, parent);
 }
 
 static inline int dev_read_simple_addr_cells(const struct udevice *dev)