Commit 702d930a authored by Rob Herring (Arm)'s avatar Rob Herring (Arm) Committed by Wentao Guan
Browse files

Revert "of: reserved-memory: Fix using wrong number of cells to get property 'alignment'" 

stable inclusion
from stable-v6.6.83
commit a9704893eec86ab935096cabb31d66f87bd5b440
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBX1M5

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a9704893eec86ab935096cabb31d66f87bd5b440



--------------------------------

commit 75f1f311d883dfaffb98be3c1da208d6ed5d4df9 upstream.

This reverts commit 267b21d0bef8e67dbe6c591c9991444e58237ec9.

Turns out some DTs do depend on this behavior. Specifically, a
downstream Pixel 6 DT. Revert the change at least until we can decide if
the DT spec can be changed instead.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarRob Herring (Arm) <robh@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit a9704893eec86ab935096cabb31d66f87bd5b440)
Signed-off-by: default avatarWentao Guan <guanwentao@uniontech.com>
parent ca06d7e1

drivers/of/of_reserved_mem.c

+2 −2
Original line number Diff line number Diff line
@@ -156,12 +156,12 @@ static int __init __reserved_mem_alloc_size(unsigned long node, 


	prop = of_get_flat_dt_prop(node, "alignment", &len);

	if (prop) {

		if (len != dt_root_size_cells * sizeof(__be32)) {

		if (len != dt_root_addr_cells * sizeof(__be32)) {

			pr_err("invalid alignment property in '%s' node.\n",

				uname);

			return -EINVAL;

		}

		align = dt_mem_next_cell(dt_root_size_cells, &prop);

		align = dt_mem_next_cell(dt_root_addr_cells, &prop);

	}



	nomap = of_get_flat_dt_prop(node, "no-map", NULL) != NULL;