leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: fix ofnode_read_addr/size_cells()

Browse Source 
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>
This commit is contained in:
Heinrich Schuchardt 2020-07-25 21:38:49 +02:00 committed by Simon Glass
parent 2e6132d835
commit ae6b33dcc3
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/core/ofnode.c
View File

@ -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)

10
include/dm/read.h
View File

@ -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)