[PATCH 1/2] fdtdec: Fix the types of addr and size in fdtdec_add_reserved_memory()
From: Bin Meng bin.meng@windriver.com
fdtdec_get_addr_size() expects size is of type 'fdt_size_t', and return value is of type 'fdt_addr_t'. Adjust their types accordingly.
Signed-off-by: Bin Meng bin.meng@windriver.com ---
lib/fdtdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 9c4d571..2d8ef65 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1294,7 +1294,8 @@ int fdtdec_add_reserved_memory(void *blob, const char *basename, /* find a matching node and return the phandle to that */ fdt_for_each_subnode(node, blob, parent) { const char *name = fdt_get_name(blob, node, NULL); - phys_addr_t addr, size; + fdt_addr_t addr; + fdt_size_t size;
addr = fdtdec_get_addr_size(blob, node, "reg", &size); if (addr == FDT_ADDR_T_NONE) {
From: Bin Meng bin.meng@windriver.com
At present fdtdec_add_reserved_memory() calls fdtdec_get_addr_size() to get address and size for the subnodes of /reserved-memory node.
We should honor #address-cells and #size-cells properties in the parent node.
Signed-off-by: Bin Meng bin.meng@windriver.com ---
lib/fdtdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 2d8ef65..3bfb462 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1297,7 +1297,8 @@ int fdtdec_add_reserved_memory(void *blob, const char *basename, fdt_addr_t addr; fdt_size_t size;
- addr = fdtdec_get_addr_size(blob, node, "reg", &size); + addr = fdtdec_get_addr_size_fixed(blob, node, "reg", 0, na, ns, + &size, false); if (addr == FDT_ADDR_T_NONE) { debug("failed to read address/size for %s\n", name); continue;
Hi Bin,
On Wed, 20 May 2020 at 00:38, Bin Meng bmeng.cn@gmail.com wrote:
From: Bin Meng bin.meng@windriver.com
At present fdtdec_add_reserved_memory() calls fdtdec_get_addr_size() to get address and size for the subnodes of /reserved-memory node.
We should honor #address-cells and #size-cells properties in the parent node.
Signed-off-by: Bin Meng bin.meng@windriver.com
lib/fdtdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Reviewed-by: Simon Glass sjg@chromium.org
Are there no tests for this?
Hi Simon,
On Wed, May 20, 2020 at 10:20 PM Simon Glass sjg@chromium.org wrote:
Hi Bin,
On Wed, 20 May 2020 at 00:38, Bin Meng bmeng.cn@gmail.com wrote:
From: Bin Meng bin.meng@windriver.com
At present fdtdec_add_reserved_memory() calls fdtdec_get_addr_size() to get address and size for the subnodes of /reserved-memory node.
We should honor #address-cells and #size-cells properties in the parent node.
Signed-off-by: Bin Meng bin.meng@windriver.com
lib/fdtdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Reviewed-by: Simon Glass sjg@chromium.org
Are there no tests for this?
There is currently no tests for this unforuatunately.
Regards, Bin
On Wed, 20 May 2020 at 00:38, Bin Meng bmeng.cn@gmail.com wrote:
From: Bin Meng bin.meng@windriver.com
fdtdec_get_addr_size() expects size is of type 'fdt_size_t', and return value is of type 'fdt_addr_t'. Adjust their types accordingly.
Signed-off-by: Bin Meng bin.meng@windriver.com
lib/fdtdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Reviewed-by: Simon Glass sjg@chromium.org
participants (2)
-
Bin Meng -
Simon Glass