From nobody Tue Sep 16 07:15:15 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA5F3C4708D for ; Thu, 5 Jan 2023 03:38:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230162AbjAEDh7 convert rfc822-to-8bit (ORCPT ); Wed, 4 Jan 2023 22:37:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229793AbjAEDhX (ORCPT ); Wed, 4 Jan 2023 22:37:23 -0500 Received: from ex01.ufhost.com (ex01.ufhost.com [61.152.239.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D45A42E35 for ; Wed, 4 Jan 2023 19:37:19 -0800 (PST) Received: from EXMBX165.cuchost.com (unknown [175.102.18.54]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "EXMBX165", Issuer "EXMBX165" (not verified)) by ex01.ufhost.com (Postfix) with ESMTP id 98BFE24E1E1; Thu, 5 Jan 2023 11:37:17 +0800 (CST) Received: from EXMBX161.cuchost.com (172.16.6.71) by EXMBX165.cuchost.com (172.16.6.75) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Thu, 5 Jan 2023 11:37:17 +0800 Received: from localhost.localdomain (202.188.176.82) by EXMBX161.cuchost.com (172.16.6.71) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Thu, 5 Jan 2023 11:37:14 +0800 From: Ley Foon Tan To: Palmer Dabbelt , Paul Walmsley , Albert Ou CC: , , "Ley Foon Tan" , Conor Dooley , Andrew Jones Subject: [PATCH v2] riscv: Move call to init_cpu_topology() to later initialization stage Date: Thu, 5 Jan 2023 11:37:05 +0800 Message-ID: <20230105033705.3946130-1-leyfoon.tan@starfivetech.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [202.188.176.82] X-ClientProxiedBy: EXCAS066.cuchost.com (172.16.6.26) To EXMBX161.cuchost.com (172.16.6.71) X-YovoleRuleAgent: yovoleflag Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" If "capacity-dmips-mhz" is present in a CPU DT node, topology_parse_cpu_capacity() will fail to allocate memory. ARM64, with which this code path is shared, does not call topology_parse_cpu_capacity() until later in boot where memory allocation is available. Move init_cpu_topology(), which calls topology_parse_cpu_capacity(), to a later initialization stage, to match ARM64. Tested on Qemu platform. Fixes: 03f11f03dbfe ("RISC-V: Parse cpu topology during boot.") Reviewed-by: Conor Dooley Reviewed-by: Andrew Jones Signed-off-by: Ley Foon Tan Tested-by: Geert Uytterhoeven --- Changes: v2: - Update commit description with suggestion from Conor. - Added Reviewed-by. - Added Fixes. History: [v1]: https://patchwork.kernel.org/project/linux-riscv/patch/20230103035316= .3841303-1-leyfoon.tan@starfivetech.com/ Conor also submitted patches in [1] to add "capacity-dmips-mhz" DT parameter for RISC-V platform: https://patchwork.kernel.org/project/linux-riscv/cover/20230104180513.13794= 53-1-conor@kernel.org/ --- arch/riscv/kernel/smpboot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/riscv/kernel/smpboot.c b/arch/riscv/kernel/smpboot.c index 3373df413c88..ddb2afba6d25 100644 --- a/arch/riscv/kernel/smpboot.c +++ b/arch/riscv/kernel/smpboot.c @@ -39,7 +39,6 @@ static DECLARE_COMPLETION(cpu_running); =20 void __init smp_prepare_boot_cpu(void) { - init_cpu_topology(); } =20 void __init smp_prepare_cpus(unsigned int max_cpus) @@ -48,6 +47,8 @@ void __init smp_prepare_cpus(unsigned int max_cpus) int ret; unsigned int curr_cpuid; =20 + init_cpu_topology(); + curr_cpuid =3D smp_processor_id(); store_cpu_topology(curr_cpuid); numa_store_cpu_info(curr_cpuid); --=20 2.25.1