Message ID | 20230913163823.7880-10-james.morse@arm.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1213747vqx; Wed, 13 Sep 2023 09:41:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGgjYdHklMFJ40y4JV/Q6uCV30jOOzq3bK82B5b8SEfPcuW/pbJik1o7fYJkQzYUQHkYUpK X-Received: by 2002:a17:902:e88a:b0:1c3:19d6:3559 with SMTP id w10-20020a170902e88a00b001c319d63559mr4631296plg.1.1694623268217; Wed, 13 Sep 2023 09:41:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694623268; cv=none; d=google.com; s=arc-20160816; b=n4UX7Z1EpUXAK3Fuif9D2alM3j7gfpK8lztu5PeGWxW/cYX8ac3QCNOMBw+E3faasU HignPMJD05GFn2YN6WUSaZKovIAttaLCJKLtsForp04etY+zrlE/rjfJHp7lTpmaqPDm G2CPdonO/MVLBfjUNUIp+is0OYXIFO0q/rSq/dsI9kq9KsmhrsRprzq6jxOyg/tuNUfL 0rFkVR3KdRZjilKD/Xg2eUWnmMZCAwa4kfoVvreJBkoDzZXHiKaG/NJ7i1L3V5igNJWv DQWkH0VWe8txIFwSE5aQA6kPTkulQLCbOe8u4sUCo69ewWw3OXBFUzVOjqRYbwPnWx+S OdMw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=mU+w7afSVmVnsGgu6g5tMwxnhU9WQ4Lm3QzdVcBA0Qo=; fh=2nhVWB0fZ+8YH0lLFpnF/Mo8eq+n1VMLe+b+IpvS0g0=; b=kGLU0TsgptvMH7Yj4QcrNK6YO/t1Iywnn7smzi9qJhIf1jSI0MvMYyI5Ygur6E3nya yd9/okTBdSQNkLU3OQqzAaVjYDpOnpdCW6dR7R8yheEfstTac49oYnIZ1ebmSHCupPT0 b37mXvtpYnb5DKLH0q9xvTVT8zijMzsE/cJh6Y3UVAP28lY5CoMRluLACN7PDPlFTIGh njh27AXQOs8rweP2I47xDMWO6tCBrrfu0jHFK8Bq8jPGxczJ93jxCsUfHk7hNMPFDSYm /+osEVnXKH9xAXIkI6YD1BmhkVLALcU3lCptQ+zUnbIs7qu55nyOMeCYmnJdiX0SIP+w MdeA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id ix13-20020a170902f80d00b001bf0e15c0a9si10123853plb.269.2023.09.13.09.41.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 09:41:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 3541A81DE58F; Wed, 13 Sep 2023 09:40:05 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230235AbjIMQjm (ORCPT <rfc822;pwkd43@gmail.com> + 35 others); Wed, 13 Sep 2023 12:39:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230432AbjIMQjZ (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 13 Sep 2023 12:39:25 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 3F6151BF0; Wed, 13 Sep 2023 09:39:11 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4008E1007; Wed, 13 Sep 2023 09:39:48 -0700 (PDT) Received: from merodach.members.linode.com (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 459803F5A1; Wed, 13 Sep 2023 09:39:09 -0700 (PDT) From: James Morse <james.morse@arm.com> To: linux-pm@vger.kernel.org, loongarch@lists.linux.dev, linux-acpi@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-riscv@lists.infradead.org, kvmarm@lists.linux.dev Cc: x86@kernel.org, Salil Mehta <salil.mehta@huawei.com>, Russell King <linux@armlinux.org.uk>, Jean-Philippe Brucker <jean-philippe@linaro.org>, jianyong.wu@arm.com, justin.he@arm.com Subject: [RFC PATCH v2 09/35] LoongArch: Switch over to GENERIC_CPU_DEVICES Date: Wed, 13 Sep 2023 16:37:57 +0000 Message-Id: <20230913163823.7880-10-james.morse@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230913163823.7880-1-james.morse@arm.com> References: <20230913163823.7880-1-james.morse@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Wed, 13 Sep 2023 09:40:05 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776941287782924046 X-GMAIL-MSGID: 1776941287782924046 |
Series |
ACPI/arm64: add support for virtual cpuhotplug
|
|
Commit Message
James Morse
Sept. 13, 2023, 4:37 p.m. UTC
Now that GENERIC_CPU_DEVICES calls arch_register_cpu(), which can be
overridden by the arch code, switch over to this to allow common code
to choose when the register_cpu() call is made.
This allows topology_init() to be removed.
This is an intermediate step to the logic being moved to drivers/acpi,
where GENERIC_CPU_DEVICES will do the work when booting with acpi=off.
Signed-off-by: James Morse <james.morse@arm.com>
---
arch/loongarch/Kconfig | 1 +
arch/loongarch/kernel/topology.c | 29 ++---------------------------
2 files changed, 3 insertions(+), 27 deletions(-)
Comments
On Wed, Sep 13, 2023 at 04:37:57PM +0000, James Morse wrote: > Now that GENERIC_CPU_DEVICES calls arch_register_cpu(), which can be > overridden by the arch code, switch over to this to allow common code > to choose when the register_cpu() call is made. > > This allows topology_init() to be removed. > > This is an intermediate step to the logic being moved to drivers/acpi, > where GENERIC_CPU_DEVICES will do the work when booting with acpi=off. > > Signed-off-by: James Morse <james.morse@arm.com> Same comment as x86 (moving the point at which cpus are registered ought to be mentioned in the commit message.)
On Wed, 13 Sep 2023 16:37:57 +0000 James Morse <james.morse@arm.com> wrote: > Now that GENERIC_CPU_DEVICES calls arch_register_cpu(), which can be > overridden by the arch code, switch over to this to allow common code > to choose when the register_cpu() call is made. > > This allows topology_init() to be removed. > > This is an intermediate step to the logic being moved to drivers/acpi, > where GENERIC_CPU_DEVICES will do the work when booting with acpi=off. > > Signed-off-by: James Morse <james.morse@arm.com> > --- > arch/loongarch/Kconfig | 1 + > arch/loongarch/kernel/topology.c | 29 ++--------------------------- > 2 files changed, 3 insertions(+), 27 deletions(-) > > diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig > index 2bddd202470e..5bed51adc68c 100644 > --- a/arch/loongarch/Kconfig > +++ b/arch/loongarch/Kconfig > @@ -72,6 +72,7 @@ config LOONGARCH > select GENERIC_CLOCKEVENTS > select GENERIC_CMOS_UPDATE > select GENERIC_CPU_AUTOPROBE > + select GENERIC_CPU_DEVICES > select GENERIC_ENTRY > select GENERIC_GETTIMEOFDAY > select GENERIC_IOREMAP if !ARCH_IOREMAP > diff --git a/arch/loongarch/kernel/topology.c b/arch/loongarch/kernel/topology.c > index caa7cd859078..8e4441c1ff39 100644 > --- a/arch/loongarch/kernel/topology.c > +++ b/arch/loongarch/kernel/topology.c > @@ -7,20 +7,13 @@ > #include <linux/percpu.h> > #include <asm/bootinfo.h> > > -static DEFINE_PER_CPU(struct cpu, cpu_devices); > - > #ifdef CONFIG_HOTPLUG_CPU > int arch_register_cpu(int cpu) > { > - int ret; > struct cpu *c = &per_cpu(cpu_devices, cpu); > > - c->hotpluggable = 1; This is a bit subtle. Can loongarch hotplug a CPU that is also io_master(cpu)? I have no idea if there is a subtle difference between. 1) CPUs present at boot where if they are an io_master they are not allowed to be hot removed. 2) CPUs that turn up (hotplugged) later which are an io_master and by original code can be removed. My guess is that no io_master CPU can be hotplugged in making this irrelevant and your code correct as the =1 is just a micro optimizatoin. If we can confirm that, a one line addition to the patch description would be great. Otherwise LGTM > - ret = register_cpu(c, cpu); > - if (ret < 0) > - pr_warn("register_cpu %d failed (%d)\n", cpu, ret); > - > - return ret; > + c->hotpluggable = !io_master(cpu); > + return register_cpu(c, cpu); > } > EXPORT_SYMBOL(arch_register_cpu); > > @@ -33,21 +26,3 @@ void arch_unregister_cpu(int cpu) > } > EXPORT_SYMBOL(arch_unregister_cpu); > #endif > - > -static int __init topology_init(void) > -{ > - int i, ret; > - > - for_each_present_cpu(i) { > - struct cpu *c = &per_cpu(cpu_devices, i); > - > - c->hotpluggable = !io_master(i); > - ret = register_cpu(c, i); > - if (ret < 0) > - pr_warn("topology_init: register_cpu %d failed (%d)\n", i, ret); > - } > - > - return 0; > -} > - > -subsys_initcall(topology_init);
diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig index 2bddd202470e..5bed51adc68c 100644 --- a/arch/loongarch/Kconfig +++ b/arch/loongarch/Kconfig @@ -72,6 +72,7 @@ config LOONGARCH select GENERIC_CLOCKEVENTS select GENERIC_CMOS_UPDATE select GENERIC_CPU_AUTOPROBE + select GENERIC_CPU_DEVICES select GENERIC_ENTRY select GENERIC_GETTIMEOFDAY select GENERIC_IOREMAP if !ARCH_IOREMAP diff --git a/arch/loongarch/kernel/topology.c b/arch/loongarch/kernel/topology.c index caa7cd859078..8e4441c1ff39 100644 --- a/arch/loongarch/kernel/topology.c +++ b/arch/loongarch/kernel/topology.c @@ -7,20 +7,13 @@ #include <linux/percpu.h> #include <asm/bootinfo.h> -static DEFINE_PER_CPU(struct cpu, cpu_devices); - #ifdef CONFIG_HOTPLUG_CPU int arch_register_cpu(int cpu) { - int ret; struct cpu *c = &per_cpu(cpu_devices, cpu); - c->hotpluggable = 1; - ret = register_cpu(c, cpu); - if (ret < 0) - pr_warn("register_cpu %d failed (%d)\n", cpu, ret); - - return ret; + c->hotpluggable = !io_master(cpu); + return register_cpu(c, cpu); } EXPORT_SYMBOL(arch_register_cpu); @@ -33,21 +26,3 @@ void arch_unregister_cpu(int cpu) } EXPORT_SYMBOL(arch_unregister_cpu); #endif - -static int __init topology_init(void) -{ - int i, ret; - - for_each_present_cpu(i) { - struct cpu *c = &per_cpu(cpu_devices, i); - - c->hotpluggable = !io_master(i); - ret = register_cpu(c, i); - if (ret < 0) - pr_warn("topology_init: register_cpu %d failed (%d)\n", i, ret); - } - - return 0; -} - -subsys_initcall(topology_init);