From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pv50p00im-zteg10011401.me.com (pv50p00im-zteg10011401.me.com [17.58.6.41]) (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 6BE85218EBD for ; Thu, 9 Jan 2025 13:28:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=17.58.6.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736429336; cv=none; b=kOIhY1Yl2/CnUO4kegSIR+pFtVXs2DnD4Vk8isz+8EUuyynd9dW77mQeVWgjgLGwMuq1n28ePuMkhtP/EvrPELSC1j0yeVmtzxKtW9WAiWHGwsujKiSKgSsUWMxbyvRaq9Vbtw3iWPb1HlJfaJsnkjuG4KBrEKXGDTjxf1sBZdA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736429336; c=relaxed/simple; bh=b/pklCdjN2LibMahnmkwgupW91Dgcx1mcf8XUscWfP4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bMRn4VrC+t8zwFebi5iBe0PYT7OFS4+GYUJ3xzFU7k1VEF64DcleHwUcoUjM2/TRItUc61BKLiPg31oqmptnPLbTbanIaVMbHBo/s8kUak77A8EXzrpCsgdlbaALIcDS7CO5qfKWDMb3/8mxLOveigyk4cgo3c/+gjF3l7Tj9aw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=icloud.com; spf=pass smtp.mailfrom=icloud.com; dkim=pass (2048-bit key) header.d=icloud.com header.i=@icloud.com header.b=qgEN2vL3; arc=none smtp.client-ip=17.58.6.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=icloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=icloud.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=icloud.com header.i=@icloud.com header.b="qgEN2vL3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; t=1736429335; bh=ZVUK9tSkNBSa1HB8rrwKraJSfeEd9vaKx7+agQUGQMw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To: x-icloud-hme; b=qgEN2vL3Bf9C9J8NjqbtXPUdP75KW7ZBJaFXvg8/i69u7V1WQQ7zb2xTvXBEOvdfH R9oP+zRO5vcWoRl5YyD2EfVuoEwIfnndCGU/k2qI3VIQWLJHOuVrwqJFIHfj8hMExF tcD1uvu77YqWAe0utfIhaF5FApnMfNfuHW7ft+tJyEYssQwjCrIULW01DFbfVfl1sO tkYgRMH0RXtrQC/MwNXDW8Kigt9RD56JIqneRzoAwb1Et2w53rQMJJTwg8plM+4EiU Gi0MiE5wR24t5HT7kmPvW7Did3S/ApRq6BeyynD2aaeHOEg3y2dY+1CZrBEW/IO0Rb WV7aQpMeuIPDg== Received: from [192.168.1.26] (pv50p00im-dlb-asmtp-mailmevip.me.com [17.56.9.10]) by pv50p00im-zteg10011401.me.com (Postfix) with ESMTPSA id 94E5434BAADC; Thu, 9 Jan 2025 13:28:49 +0000 (UTC) From: Zijun Hu Date: Thu, 09 Jan 2025 21:27:00 +0800 Subject: [PATCH v4 09/14] of: reserved-memory: Fix using wrong number of cells to get property 'alignment' Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20250109-of_core_fix-v4-9-db8a72415b8c@quicinc.com> References: <20250109-of_core_fix-v4-0-db8a72415b8c@quicinc.com> In-Reply-To: <20250109-of_core_fix-v4-0-db8a72415b8c@quicinc.com> To: Rob Herring , Saravana Kannan , Maxime Ripard , Robin Murphy , Grant Likely , Marc Zyngier , Andreas Herrmann , Marek Szyprowski , Catalin Marinas , Mike Rapoport , Oreoluwa Babatunde Cc: Zijun Hu , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Zijun Hu , stable@vger.kernel.org X-Mailer: b4 0.14.2 X-Proofpoint-GUID: qQrBuU6ig9ldJpdYx8h7nToBqt31-TIc X-Proofpoint-ORIG-GUID: qQrBuU6ig9ldJpdYx8h7nToBqt31-TIc X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-01-09_05,2025-01-09_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 clxscore=1015 malwarescore=0 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2501090108 X-Apple-Remote-Links: v=1;h=KCk=;charset=UTF-8 From: Zijun Hu 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 --- drivers/of/of_reserved_mem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 45517b9e57b1add36bdf2109227ebbf7df631a66..d2753756d7c30adcbd52f57338e281c16d821488 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -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; -- 2.34.1