]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
of: reserved-memory: Fix using wrong number of cells to get property 'alignment'
authorZijun Hu <quic_zijuhu@quicinc.com>
Thu, 9 Jan 2025 13:27:00 +0000 (21:27 +0800)
committerRob Herring (Arm) <robh@kernel.org>
Mon, 13 Jan 2025 23:47:29 +0000 (17:47 -0600)
According to DT spec, size of property 'alignment' is based on parent
node’s #size-cells property.

But __reserved_mem_alloc_size() wrongly uses @dt_root_addr_cells to get
the property obviously.

Fix by using @dt_root_size_cells instead of @dt_root_addr_cells.

Fixes: 3f0c82066448 ("drivers: of: add initialization code for dynamic reserved memory")
Cc: stable@vger.kernel.org
Signed-off-by: Zijun Hu <quic_zijuhu@quicinc.com>
Link: https://lore.kernel.org/r/20250109-of_core_fix-v4-9-db8a72415b8c@quicinc.com
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
drivers/of/of_reserved_mem.c

index 45517b9e57b1add36bdf2109227ebbf7df631a66..d2753756d7c30adcbd52f57338e281c16d821488 100644 (file)
@@ -409,12 +409,12 @@ static int __init __reserved_mem_alloc_size(unsigned long node, const char *unam
 
        prop = of_get_flat_dt_prop(node, "alignment", &len);
        if (prop) {
-               if (len != dt_root_addr_cells * sizeof(__be32)) {
+               if (len != dt_root_size_cells * sizeof(__be32)) {
                        pr_err("invalid alignment property in '%s' node.\n",
                                uname);
                        return -EINVAL;
                }
-               align = dt_mem_next_cell(dt_root_addr_cells, &prop);
+               align = dt_mem_next_cell(dt_root_size_cells, &prop);
        }
 
        nomap = of_get_flat_dt_prop(node, "no-map", NULL) != NULL;