Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

of/reserved_mem: Simplify the logic of __reserved_mem_alloc_size() 

Use the existing helper functions to simplify the logic of
__reserved_mem_alloc_size()

Signed-off-by: Yuntao Wang <yuntao.wang@linux.dev>
Link: https://patch.msgid.link/20251115134753.179931-9-yuntao.wang@linux.dev
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
This commit is contained in:
Yuntao Wang 2025-11-15 21:47:53 +08:00 committed by Rob Herring (Arm)
parent 85a8a30c5b
commit dd3feaf657
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/of/of_reserved_mem.c
View File

@ -385,10 +385,9 @@ static int __init __reserved_mem_alloc_in_range(phys_addr_t size,
*/ */
static int __init __reserved_mem_alloc_size(unsigned long node, const char *uname) static int __init __reserved_mem_alloc_size(unsigned long node, const char *uname)
{ {
int t_len = (dt_root_addr_cells + dt_root_size_cells) * sizeof(__be32);
phys_addr_t start = 0, end = 0; phys_addr_t start = 0, end = 0;
phys_addr_t base = 0, align = 0, size; phys_addr_t base = 0, align = 0, size;
int len; int i, len;
const __be32 *prop; const __be32 *prop;
bool nomap; bool nomap;
int ret; int ret;
@ -422,19 +421,15 @@ static int __init __reserved_mem_alloc_size(unsigned long node, const char *unam
&& !nomap) && !nomap)
align = max_t(phys_addr_t, align, CMA_MIN_ALIGNMENT_BYTES); align = max_t(phys_addr_t, align, CMA_MIN_ALIGNMENT_BYTES);
prop = of_get_flat_dt_prop(node, "alloc-ranges", &len); prop = of_flat_dt_get_addr_size_prop(node, "alloc-ranges", &len);
if (prop) { if (prop) {
for (i = 0; i < len; i++) {
u64 b, s;
if (len % t_len != 0) { of_flat_dt_read_addr_size(prop, i, &b, &s);
pr_err("invalid alloc-ranges property in '%s', skipping node.\n",
uname);
return -EINVAL;
}
while (len > 0) { start = b;
start = dt_mem_next_cell(dt_root_addr_cells, &prop); end = b + s;
end = start + dt_mem_next_cell(dt_root_size_cells,
&prop);
base = 0; base = 0;
ret = __reserved_mem_alloc_in_range(size, align, ret = __reserved_mem_alloc_in_range(size, align,
@ -445,9 +440,7 @@ static int __init __reserved_mem_alloc_size(unsigned long node, const char *unam
(unsigned long)(size / SZ_1M)); (unsigned long)(size / SZ_1M));
break; break;
} }
len -= t_len;
} }
} else { } else {
ret = early_init_dt_alloc_reserved_memory_arch(size, align, ret = early_init_dt_alloc_reserved_memory_arch(size, align,
0, 0, nomap, &base); 0, 0, nomap, &base);