summaryrefslogtreecommitdiff
path: root/drivers/of
diff options
context:
space:
mode:
authorWandun Chen <chenwandun@lixiang.com>2026-05-27 11:29:10 +0800
committerRob Herring (Arm) <robh@kernel.org>2026-06-12 09:36:37 -0500
commit50a488de5fccfc58eedc6d0525f92dc64a41f806 (patch)
tree960452548cc421039d8f37339877adfeb9f3b9d5 /drivers/of
parentcfba13a18672415591d4db5320ac56ef67b460f4 (diff)
downloadlinux-next-50a488de5fccfc58eedc6d0525f92dc64a41f806.tar.gz
linux-next-50a488de5fccfc58eedc6d0525f92dc64a41f806.zip
of: reserved_mem: zero total_reserved_mem_cnt if no valid /reserved-memory entry
Prepare for storing /memreserve/ entries in the reserved_mem array. Zero total_reserved_mem_cnt if no valid /reserved-memory entry, instead of keeping it's initial value of MAX_RESERVED_REGIONS, this allows accounting /memreserve entries based on total_reserved_mem_cnt in a follow-up patch. No functional change. Signed-off-by: Wandun Chen <chenwandun@lixiang.com> Link: https://patch.msgid.link/20260527032917.3385849-5-chenwandun1@gmail.com Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/of_reserved_mem.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
index c41f5550cb7b..82222bd45ac6 100644
--- a/drivers/of/of_reserved_mem.c
+++ b/drivers/of/of_reserved_mem.c
@@ -336,11 +336,14 @@ int __init fdt_scan_reserved_mem(void)
const void *fdt = initial_boot_params;
node = fdt_path_offset(fdt, "/reserved-memory");
- if (node < 0)
+ if (node < 0) {
+ total_reserved_mem_cnt = 0;
return -ENODEV;
+ }
if (__reserved_mem_check_root(node) != 0) {
pr_err("Reserved memory: unsupported node format, ignoring\n");
+ total_reserved_mem_cnt = 0;
return -EINVAL;
}