From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1A00D22154C; Mon, 10 Mar 2025 17:21:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741627275; cv=none; b=n77ZV4G8BjPgyeGdDSYXgu/9HqJQyCt/i038e6h09xqAVkbxwHUE69NE8Segh+ZcTvDv+9L9kRfjLQGLyNxYiG0fW4UUdTaPLnKYrGRF1rR3ZvLfrzp0NkZKnXsB3W0TO7Lt5tNSdYgmDTeQJfnOPobRVnjane+7Yt34qQeaDGo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741627275; c=relaxed/simple; bh=2HJS8GwaImbM1rvv4Gsh2QX73RLQpAokWR1QN8b5v4A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QlMKbL0T14NxR+b91EmXSJLR9uf9E+VsnkosvqcepBi0IiBnHtqA7PjKcUm8eSZZ2vrEItKo8FmTTHfTQr7Cz5K1xp3VGIzNcv6t/I57EfZZLULRURikfGIwVwZvOnAYWdGnxHoItJQEoW5PsJwAKlLplpVmTSrupDnWHFMhU/Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=xHAGkOWX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="xHAGkOWX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 97D94C4CEE5; Mon, 10 Mar 2025 17:21:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741627275; bh=2HJS8GwaImbM1rvv4Gsh2QX73RLQpAokWR1QN8b5v4A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xHAGkOWXNI5J/clul0hlY6Y4TQsmjxpGbl6OTtSMp+R8qr87IyV8PtC16PzNka+qH uMYKL3CmaEt7MGbLiQX0PFZlJwt0LAA2kagk1pOIMvfEjC2I6b8SKOPmUCzWbphwpp lfEU1iI4Nk3Aub66pYjcvwrwMuf5Fc3jzjoqhwig= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Rob Herring (Arm)" Subject: [PATCH 6.12 072/269] Revert "of: reserved-memory: Fix using wrong number of cells to get property alignment" Date: Mon, 10 Mar 2025 18:03:45 +0100 Message-ID: <20250310170500.598950909@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170457.700086763@linuxfoundation.org> References: <20250310170457.700086763@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rob Herring (Arm) 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: Rob Herring (Arm) Signed-off-by: Greg Kroah-Hartman --- drivers/of/of_reserved_mem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -360,12 +360,12 @@ static int __init __reserved_mem_alloc_s 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;