From patchwork Thu Jan 5 03:37:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ley Foon Tan X-Patchwork-Id: 39295 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp102310wrt; Wed, 4 Jan 2023 19:41:27 -0800 (PST) X-Google-Smtp-Source: AMrXdXsIp/W+ux46Wci1KEbuBDb7NMGIActDXbfkpvX8MMXwflDdmhKKUxAlTZlQ1P/YzEtMgEiG X-Received: by 2002:a05:6a00:301e:b0:581:254d:7a45 with SMTP id ay30-20020a056a00301e00b00581254d7a45mr34591403pfb.9.1672890086716; Wed, 04 Jan 2023 19:41:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672890086; cv=none; d=google.com; s=arc-20160816; b=J8CGZ5FGSUknIZ1c/zjwrIcrJDPnN76PjajZ9otx+npJ4PU2yidD6lNJoh3AS0sFtb TZYHxQ24Us1cqNvmlvBpfPn3hlA7hiMfC8QrkwXyofZIkSIFEVKsrVp6WV1hgzzR+GnC cC+eTmSPaoMd70Irz3bt0FvzVWVMJ2xo+OlRqVSNgjkegWGCvdkDmo4dHgFXyomNRea2 92EggOGD9NcUxD+UjUkRkS7keygc4m8Oqi5MptpWaLdNUMdu0RVFnP8zT/ee+L8+TmoK Vx2sswGBAQN0mvKCMZq+yqJtI0o9vmrvwtWy13lSzcawAhHABnHcrRYErWQpe/2jqaSv y62w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=OrxMgF/GqRY3OMjM9S02hgtUYs7SCJqcZze7fvpNOAE=; b=V/atY45H7TzN0x80Pozmsr3yZgyrSC2eeEGJ3VOKQe0OSGe2gBtSg875JLzuW5B9SN M/+CzKsE/uC2xeOdd9Vlb0SSgPkhgf/w+4PpFFE1KIpNt0HZmHy9lqjnR+xrH+YS8Pic Ey18ei3NNZNRBZXX0hcf4LFAr55/n6XAo0U5+JAyC1x6sx8Ol0kf36/h4SXfegjfL1Id PevO6V2DVLVSaNPkq9L9HIxzecK6HfSRmOvAz4ov7wbNFNiHSywt0ykHKIs5bOiMCiVl eam3P6UBFmoAxQIy6EyJgFXeW2bLQm3uVP+r/GebTGOcc3X9G9Xvnvc5HcrU/nd7Z20a z53A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c15-20020a056a00248f00b005814490890bsi12051482pfv.127.2023.01.04.19.41.14; Wed, 04 Jan 2023 19:41:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230155AbjAEDhz convert rfc822-to-8bit (ORCPT + 99 others); Wed, 4 Jan 2023 22:37:55 -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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753972236735144027?= X-GMAIL-MSGID: =?utf-8?q?1754152395665913559?= 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.1379453-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); void __init smp_prepare_boot_cpu(void) { - init_cpu_topology(); } 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; + init_cpu_topology(); + curr_cpuid = smp_processor_id(); store_cpu_topology(curr_cpuid); numa_store_cpu_info(curr_cpuid);