Commit 75f1f311 authored by Rob Herring (Arm)'s avatar Rob Herring (Arm)
Browse files

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



This reverts commit 267b21d0.

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>
parent 038e33fc

drivers/of/of_reserved_mem.c

+2 −2
Original line number Diff line number Diff line
@@ -415,12 +415,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_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;