riscv: Fix setting no-map in reserved memory nodes

The no-map property is wrongly skipped if a no-map reserved memory
node follows one without that property. Fix this by not remembering
the absence of a no-map property across loop iterations.

Fixes: d4ea649f179a ("riscv: Provide a mechanism to fix DT for reserved memory")
Signed-off-by: Samuel Holland <samuel@sholland.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Rick Chen <rick@andestech.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>

diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c
index f636b28449783cf2198bb988b06f20a1c9f7ca48..61cf89352698ac01f754d9d482b729d597fb8054 100644 (file)
--- a/arch/riscv/lib/fdt_fixup.c
+++ b/arch/riscv/lib/fdt_fixup.c
@@ -31,7 +31,6 @@ int riscv_fdt_copy_resv_mem_node(const void *src, void *dst)
        fdt_addr_t addr;
        fdt_size_t size;
        int offset, node, err, rmem_offset;
-       bool nomap = true;
        char basename[32] = {0};
        int bname_len;
        int max_len = sizeof(basename);
@@ -81,9 +80,7 @@ int riscv_fdt_copy_resv_mem_node(const void *src, void *dst)
                        log_err("failed to add reserved memory: %d\n", err);
                        return err;
                }
-               if (!fdt_getprop(src, node, "no-map", NULL))
-                       nomap = false;
-               if (nomap) {
+               if (fdt_getprop(src, node, "no-map", NULL)) {
                        rmem_offset = fdt_node_offset_by_phandle(dst, phandle);
                        fdt_setprop_empty(dst, rmem_offset, "no-map");
                }