summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuEe-GUI <[email protected]>2024-06-04 15:46:24 +0800
committerRbb666 <[email protected]>2024-09-19 21:16:56 +0800
commit87906499a387101e2f5b04f36fba8a3d21f25a8c (patch)
treedbd77618712bbb194d8a26e2f4f30cc7263ac9cb
parent992e79a0f8975657bf741d95d1faf4ab5c6f3ee3 (diff)
[DM/FDT] Fixup memory address reserved and translate in early
1.Fixup `fdt_reserved_memory_reg` loop time. 2.Fixup `rt_fdt_translate_address` cells value reader. Signed-off-by: GuEe-GUI <[email protected]>
-rw-r--r--components/drivers/ofw/fdt.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/components/drivers/ofw/fdt.c b/components/drivers/ofw/fdt.c
index b9e02e02e5..d1ee385f0f 100644
--- a/components/drivers/ofw/fdt.c
+++ b/components/drivers/ofw/fdt.c
@@ -85,15 +85,15 @@ rt_uint64_t rt_fdt_translate_address(void *fdt, int nodeoffset, rt_uint64_t addr
if (parent >= 0)
{
- ranges = fdt_getprop(fdt, nodeoffset, "ranges", &length);
+ ranges = fdt_getprop(fdt, parent, "ranges", &length);
}
if (ranges && length > 0)
{
- local.addr_cells = fdt_address_cells(fdt, nodeoffset);
- local.size_cells = fdt_size_cells(fdt, nodeoffset);
- cpu.addr_cells = fdt_io_addr_cells(fdt, nodeoffset);
- cpu.size_cells = fdt_io_size_cells(fdt, nodeoffset);
+ local.addr_cells = fdt_address_cells(fdt, parent);
+ local.size_cells = fdt_size_cells(fdt, parent);
+ cpu.addr_cells = fdt_io_addr_cells(fdt, parent);
+ cpu.size_cells = fdt_io_size_cells(fdt, parent);
group_len = local.addr_cells + cpu.addr_cells + local.size_cells;
@@ -105,7 +105,7 @@ rt_uint64_t rt_fdt_translate_address(void *fdt, int nodeoffset, rt_uint64_t addr
if (local.addr <= address && local.addr + local.size > address)
{
- ret += address - cpu.addr;
+ ret = address - local.addr + cpu.addr;
break;
}
@@ -247,9 +247,9 @@ static rt_err_t fdt_reserved_memory_reg(int nodeoffset, const char *uname)
rt_bool_t is_nomap = fdt_getprop(_fdt, nodeoffset, "no-map", RT_NULL) ? RT_TRUE : RT_FALSE;
base = rt_fdt_translate_address(_fdt, nodeoffset, base);
- rt_memblock_reserve_memory(uname, base, base + size, is_nomap);
- len -= t_len;
+ rt_memblock_reserve_memory(fdt_get_name(_fdt, nodeoffset, RT_NULL),
+ base, base + size, is_nomap);
}
}
}