Skip to content

Commit 8c0f606

Browse files
ytcooderobherring
authored andcommitted
of/reserved_mem: Simplify the logic of __reserved_mem_reserve_reg()
Use the existing helper functions to simplify the logic of __reserved_mem_reserve_reg() Signed-off-by: Yuntao Wang <yuntao.wang@linux.dev> Link: https://patch.msgid.link/20251115134753.179931-7-yuntao.wang@linux.dev Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
1 parent 46a8b01 commit 8c0f606

1 file changed

Lines changed: 9 additions & 14 deletions

File tree

drivers/of/of_reserved_mem.c

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -154,27 +154,24 @@ static int __init early_init_dt_reserve_memory(phys_addr_t base,
154154
static int __init __reserved_mem_reserve_reg(unsigned long node,
155155
const char *uname)
156156
{
157-
int t_len = (dt_root_addr_cells + dt_root_size_cells) * sizeof(__be32);
158157
phys_addr_t base, size;
159-
int len;
158+
int i, len;
160159
const __be32 *prop;
161160
bool nomap;
162161

163-
prop = of_get_flat_dt_prop(node, "reg", &len);
162+
prop = of_flat_dt_get_addr_size_prop(node, "reg", &len);
164163
if (!prop)
165164
return -ENOENT;
166165

167-
if (len && len % t_len != 0) {
168-
pr_err("Reserved memory: invalid reg property in '%s', skipping node.\n",
169-
uname);
170-
return -EINVAL;
171-
}
172-
173166
nomap = of_get_flat_dt_prop(node, "no-map", NULL) != NULL;
174167

175-
while (len >= t_len) {
176-
base = dt_mem_next_cell(dt_root_addr_cells, &prop);
177-
size = dt_mem_next_cell(dt_root_size_cells, &prop);
168+
for (i = 0; i < len; i++) {
169+
u64 b, s;
170+
171+
of_flat_dt_read_addr_size(prop, i, &b, &s);
172+
173+
base = b;
174+
size = s;
178175

179176
if (size && early_init_dt_reserve_memory(base, size, nomap) == 0) {
180177
/* Architecture specific contiguous memory fixup. */
@@ -187,8 +184,6 @@ static int __init __reserved_mem_reserve_reg(unsigned long node,
187184
pr_err("Reserved memory: failed to reserve memory for node '%s': base %pa, size %lu MiB\n",
188185
uname, &base, (unsigned long)(size / SZ_1M));
189186
}
190-
191-
len -= t_len;
192187
}
193188
return 0;
194189
}

0 commit comments

Comments
 (0)