From patchwork Tue Jan 3 03:53:16 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: 38264 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4427201wrt; Mon, 2 Jan 2023 19:57:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXvc2Jvholie9wACl8/vPROEpkPCTLtVIbMrH+LuXylFjlLatiZym3uQ28qZLROhibVirb+I X-Received: by 2002:a17:907:c24e:b0:7c0:1db5:ea10 with SMTP id tj14-20020a170907c24e00b007c01db5ea10mr48054966ejc.53.1672718273638; Mon, 02 Jan 2023 19:57:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672718273; cv=none; d=google.com; s=arc-20160816; b=Uf+y+DGqeJ8QHRzYj5waChgfgzF6T4IYZ9QPgZ3mp0Exwr4UwHc2xjnYBwOctesjtC H3HP5F+0rR8FQkTOiRE/m8noZyoV4RDVXuRAOoKuamylwYbZn8Z643jJ2dLnmOz+MFeE Ha7L9jFQ100DYUqKlJdj00q8ZoLZTzpW3k07vuoYVQdMp0xQfFhRBzIhMuRZAIcf5qSj JyrXjzaPod/xAXo0KLYIHpFjyLdamv8bQlyD+Jj4IrGxcnZJEjQLtmLUG0gfMZlzoHcD Z1B/oqeIG21jCgmvc+CWdEJ8gkRmZLGVKLHfMJGuJnqKCwA5yZiVdec3DIwI5g9LosVj lGiw== 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=aR1SX0ipxq8QTfsLUMTcSvBflVKA6PM5ia94xyAyikc=; b=oRCk1WFaqduOG9lYUFM4eRhG0qJOGWZX9sQG7Lji5LpLl35hP5Oal034SRI3Tc/OjU cEUfkO8dFIE4dSxlj2W3dvWXMYuofmGKW6K7QEDPr1b8+A/Qj0TMy4tiBpYwDhuJG03t VYO4SpH8NSJyyvfjcu2A83RdOx1RZ/+XshiZxkUcomPduM5MBo8NWU9DVHPVq2wHkILe Wa0tsVM/WWdBfFh9yahVuGDd0mA7ug8zWrgys/xKqpz+eKFKOIbMvSZAamWqIISvT3Sy En9XnNmUuw+gOskdxtBQNbFVGgIWTSwaL/GdEli3q2161Pbsdu5zVz9Ah8vnpNS50wGa BeQg== 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 xd2-20020a170907078200b007ae4ed48290si27682310ejb.279.2023.01.02.19.57.29; Mon, 02 Jan 2023 19:57:53 -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 S232636AbjACDxc convert rfc822-to-8bit (ORCPT + 99 others); Mon, 2 Jan 2023 22:53:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230050AbjACDxb (ORCPT ); Mon, 2 Jan 2023 22:53:31 -0500 Received: from ex01.ufhost.com (ex01.ufhost.com [61.152.239.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B68E23F for ; Mon, 2 Jan 2023 19:53:28 -0800 (PST) Received: from EXMBX166.cuchost.com (unknown [175.102.18.54]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "EXMBX166", Issuer "EXMBX166" (not verified)) by ex01.ufhost.com (Postfix) with ESMTP id 8B48924E1E1; Tue, 3 Jan 2023 11:53:26 +0800 (CST) Received: from EXMBX161.cuchost.com (172.16.6.71) by EXMBX166.cuchost.com (172.16.6.76) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Tue, 3 Jan 2023 11:53:26 +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; Tue, 3 Jan 2023 11:53:23 +0800 From: Ley Foon Tan To: Palmer Dabbelt , Paul Walmsley , Albert Ou CC: , , "Ley Foon Tan" Subject: [PATCH] riscv: Move call to init_cpu_topology() to later initialization stage Date: Tue, 3 Jan 2023 11:53:16 +0800 Message-ID: <20230103035316.3841303-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?1753972236735144027?= topology_parse_cpu_capacity() is failed to allocate memory with kcalloc() after read "capacity-dmips-mhz" DT parameter in CPU DT nodes. This topology_parse_cpu_capacity() is called from init_cpu_topology(), move call to init_cpu_topology() to later initialization stage (after memory allocation is available). Note, this refers to ARM64 implementation, call init_cpu_topology() in smp_prepare_cpus(). Tested on Qemu platform. Signed-off-by: Ley Foon Tan Reviewed-by: Andrew Jones Reviewed-by: Conor Dooley --- In drivers/base/arch_topology.c: topology_parse_cpu_capacity(): ret = of_property_read_u32(cpu_node, "capacity-dmips-mhz", &cpu_capacity); if (!ret) { if (!raw_capacity) { raw_capacity = kcalloc(num_possible_cpus(), sizeof(*raw_capacity), GFP_KERNEL); if (!raw_capacity) { cap_parsing_failed = true; return false; } --- 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);