git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 75f1f311d883dfaffb98be3c1da208d6ed5d4df9 Mon Sep 17 00:00:00 2001
   2 From: "Rob Herring (Arm)" <robh@kernel.org>
   3 Date: Wed, 26 Feb 2025 13:38:19 -0600
   4 Subject: Revert "of: reserved-memory: Fix using wrong number of cells to get property 'alignment'"
   5
   6 From: Rob Herring (Arm) <robh@kernel.org>
   7
   8 commit 75f1f311d883dfaffb98be3c1da208d6ed5d4df9 upstream.
   9
  10 This reverts commit 267b21d0bef8e67dbe6c591c9991444e58237ec9.
  11
  12 Turns out some DTs do depend on this behavior. Specifically, a
  13 downstream Pixel 6 DT. Revert the change at least until we can decide if
  14 the DT spec can be changed instead.
  15
  16 Cc: stable@vger.kernel.org
  17 Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  19 ---
  20  drivers/of/of_reserved_mem.c |    4 ++--
  21  1 file changed, 2 insertions(+), 2 deletions(-)
  22
  23 --- a/drivers/of/of_reserved_mem.c
  24 +++ b/drivers/of/of_reserved_mem.c
  25 @@ -105,12 +105,12 @@ static int __init __reserved_mem_alloc_s
  26
  27         prop = of_get_flat_dt_prop(node, "alignment", &len);
  28         if (prop) {
  29 -               if (len != dt_root_size_cells * sizeof(__be32)) {
  30 +               if (len != dt_root_addr_cells * sizeof(__be32)) {
  31                         pr_err("invalid alignment property in '%s' node.\n",
  32                                 uname);
  33                         return -EINVAL;
  34                 }
  35 -               align = dt_mem_next_cell(dt_root_size_cells, &prop);
  36 +               align = dt_mem_next_cell(dt_root_addr_cells, &prop);
  37         }
  38
  39         nomap = of_get_flat_dt_prop(node, "no-map", NULL) != NULL;