From nobody Sun Feb 8 12:36:38 2026 Received: from out-187.mta1.migadu.com (out-187.mta1.migadu.com [95.215.58.187]) (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 4F23E354719 for ; Thu, 13 Nov 2025 15:52:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.187 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763049168; cv=none; b=isvBbjLjmUTFWU1z2PXD1zDYguC/POvTTf55NnsBMQ0XY+kC/G3h18/8w6iztl8Y7n+DzQAQnMZgNxyk+B3+GpQOnLfOtZaUzRjwLwhH2icSlxeSIKSGWcl5pEiTmHVL63NJ/belD6WzUy6+WL+MXxMIcBv+rdIYvQIvlWsELgg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763049168; c=relaxed/simple; bh=5G5liWqxFwcJ7D8RGsG/gE2IicV/yIFdjGkZjr7uurQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=b/LGO4S2elGdY3b+OjPorFsmr/GEBqXhXd48yGVwITchRhUdOQs2zWbxjFOgd2xUbf7/l20+aLhCII+eUpifN1CoZi9PpwwBw1dv2Ju78Au/d8OdM+GC8NyA9qXJTsS35XRKIRVSreN4gu01kCtbvNZqtdbdJbN1mIJ9fNGDfW4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=AbRu5Qpz; arc=none smtp.client-ip=95.215.58.187 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="AbRu5Qpz" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1763049164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qItt33BqcN4ZI2ZReVqmwV+XG/u/w5Cwqt20oaz5aDg=; b=AbRu5QpzyVlPqtd8LU36S3Ru7fu4y4YOTEd9tpa7DbdjEukuf3F0exSzOzVnt4IE8TZOlg kpDZR4r3/TEXAlUWfpa3eS/82ViLx7kPs9PLYupB7RRHUvaN8yc58p8jA4G3TLeDmx7KS8 GTpYVka0FageKAGsVDEZnifspLLmOeY= From: Yuntao Wang To: Rob Herring , Saravana Kannan Cc: Geert Uytterhoeven , Catalin Marinas , James Morse , Baoquan He , Zhen Lei , Ard Biesheuvel , Mark Rutland , Geoff Levand , Andrew Morton , Changyuan Lyu , Alexander Graf , "Mike Rapoport (Microsoft)" , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Yuntao Wang Subject: [PATCH v2 4/7] of/fdt: Fix incorrect use of dt_root_addr_cells in early_init_dt_check_kho() Date: Thu, 13 Nov 2025 23:51:01 +0800 Message-ID: <20251113155104.226617-5-yuntao.wang@linux.dev> In-Reply-To: <20251113155104.226617-1-yuntao.wang@linux.dev> References: <20251113155104.226617-1-yuntao.wang@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" When reading the fdt_size value, the argument passed to dt_mem_next_cell() is dt_root_addr_cells, but it should be dt_root_size_cells. The same issue occurs when reading the scratch_size value. Use a helper function to simplify the code and fix these issues. Fixes: 274cdcb1c004 ("arm64: add KHO support") Signed-off-by: Yuntao Wang --- drivers/of/fdt.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index d0caaab42aa7..4c45a97d6652 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -918,26 +918,16 @@ static void __init early_init_dt_check_kho(void) { unsigned long node =3D chosen_node_offset; u64 fdt_start, fdt_size, scratch_start, scratch_size; - const __be32 *p; - int l; =20 if (!IS_ENABLED(CONFIG_KEXEC_HANDOVER) || (long)node < 0) return; =20 - p =3D of_get_flat_dt_prop(node, "linux,kho-fdt", &l); - if (l !=3D (dt_root_addr_cells + dt_root_size_cells) * sizeof(__be32)) + if (!of_fdt_get_addr_size(node, "linux,kho-fdt", &fdt_start, &fdt_size)) return; =20 - fdt_start =3D dt_mem_next_cell(dt_root_addr_cells, &p); - fdt_size =3D dt_mem_next_cell(dt_root_addr_cells, &p); - - p =3D of_get_flat_dt_prop(node, "linux,kho-scratch", &l); - if (l !=3D (dt_root_addr_cells + dt_root_size_cells) * sizeof(__be32)) + if (!of_fdt_get_addr_size(node, "linux,kho-scratch", &scratch_start, &scr= atch_size)) return; =20 - scratch_start =3D dt_mem_next_cell(dt_root_addr_cells, &p); - scratch_size =3D dt_mem_next_cell(dt_root_addr_cells, &p); - kho_populate(fdt_start, fdt_size, scratch_start, scratch_size); } =20 --=20 2.51.0