From: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
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,
x86@kernel.org, linux-csky@vger.kernel.org,
linux-doc@vger.kernel.org, linux-ia64@vger.kernel.org,
linux-parisc@vger.kernel.org
Cc: Salil Mehta <salil.mehta@huawei.com>,
Jean-Philippe Brucker <jean-philippe@linaro.org>,
jianyong.wu@arm.com, justin.he@arm.com,
James Morse <james.morse@arm.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
"H. Peter Anvin" <hpa@zytor.com>
Subject: [PATCH 14/21] x86/topology: Switch over to GENERIC_CPU_DEVICES
Date: Tue, 21 Nov 2023 13:45:01 +0000 [thread overview]
Message-ID: <E1r5R3l-00Cszm-UA@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <ZVyz/Ve5pPu8AWoA@shell.armlinux.org.uk>
From: James Morse <james.morse@arm.com>
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.
x86's struct cpus come from struct x86_cpu, which has no other members
or users. Remove this and use the version defined by common code.
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.
This patch also has the effect of moving the registration of CPUs from
subsys to driver core initialisation, prior to any initcalls running.
Signed-off-by: James Morse <james.morse@arm.com>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
----
Changes since RFC:
* Fixed the second copy of arch_register_cpu() used for non-hotplug
Changes since RFC v2:
* Remove duplicate of the weak generic arch_register_cpu(), spotted
by Jonathan Cameron. Add note about initialisation order change.
Changes since RFC v3:
* Adapt to removal of EXPORT_SYMBOL()s
---
arch/x86/Kconfig | 1 +
arch/x86/include/asm/cpu.h | 4 ----
arch/x86/kernel/topology.c | 27 ++++-----------------------
3 files changed, 5 insertions(+), 27 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index dbdcfc708369..8330c4ac26b3 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -148,6 +148,7 @@ config X86
select GENERIC_CLOCKEVENTS_MIN_ADJUST
select GENERIC_CMOS_UPDATE
select GENERIC_CPU_AUTOPROBE
+ select GENERIC_CPU_DEVICES
select GENERIC_CPU_VULNERABILITIES
select GENERIC_EARLY_IOREMAP
select GENERIC_ENTRY
diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h
index fecc4fe1d68a..f8f9a9b79395 100644
--- a/arch/x86/include/asm/cpu.h
+++ b/arch/x86/include/asm/cpu.h
@@ -23,10 +23,6 @@ static inline void prefill_possible_map(void) {}
#endif /* CONFIG_SMP */
-struct x86_cpu {
- struct cpu cpu;
-};
-
#ifdef CONFIG_HOTPLUG_CPU
extern void soft_restart_cpu(void);
#endif
diff --git a/arch/x86/kernel/topology.c b/arch/x86/kernel/topology.c
index fcb62cfdf946..c2ed3145a93b 100644
--- a/arch/x86/kernel/topology.c
+++ b/arch/x86/kernel/topology.c
@@ -35,36 +35,17 @@
#include <asm/io_apic.h>
#include <asm/cpu.h>
-static DEFINE_PER_CPU(struct x86_cpu, cpu_devices);
-
#ifdef CONFIG_HOTPLUG_CPU
int arch_register_cpu(int cpu)
{
- struct x86_cpu *xc = per_cpu_ptr(&cpu_devices, cpu);
+ struct cpu *c = per_cpu_ptr(&cpu_devices, cpu);
- xc->cpu.hotpluggable = cpu > 0;
- return register_cpu(&xc->cpu, cpu);
+ c->hotpluggable = cpu > 0;
+ return register_cpu(c, cpu);
}
void arch_unregister_cpu(int num)
{
- unregister_cpu(&per_cpu(cpu_devices, num).cpu);
-}
-#else /* CONFIG_HOTPLUG_CPU */
-
-int __init arch_register_cpu(int num)
-{
- return register_cpu(&per_cpu(cpu_devices, num).cpu, num);
+ unregister_cpu(&per_cpu(cpu_devices, num));
}
#endif /* CONFIG_HOTPLUG_CPU */
-
-static int __init topology_init(void)
-{
- int i;
-
- for_each_present_cpu(i)
- arch_register_cpu(i);
-
- return 0;
-}
-subsys_initcall(topology_init);
--
2.30.2
next prev parent reply other threads:[~2023-11-21 13:45 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-21 13:43 [PATCH 00/21] Initial cleanups for vCPU hotplug Russell King (Oracle)
2023-11-21 13:43 ` [PATCH 01/21] arch_topology: Make register_cpu_capacity_sysctl() tolerant to late CPUs Russell King
2023-11-30 16:46 ` Jonathan Cameron
2023-12-01 10:45 ` Thomas Gleixner
2023-11-21 13:44 ` [PATCH 02/21] x86: intel_epb: Don't rely on link order Russell King
2023-11-22 20:12 ` Rafael J. Wysocki
2023-11-21 13:44 ` [PATCH 03/21] x86/topology: remove arch_*register_cpu() exports Russell King (Oracle)
2023-11-30 16:48 ` Jonathan Cameron
2023-11-21 13:44 ` [PATCH 04/21] Loongarch: " Russell King (Oracle)
2023-11-30 16:48 ` Jonathan Cameron
2023-11-21 13:44 ` [PATCH 05/21] ACPI: Move ACPI_HOTPLUG_CPU to be disabled on arm64 and riscv Russell King
2023-11-22 20:16 ` Rafael J. Wysocki
2023-11-30 16:49 ` Jonathan Cameron
2023-11-21 13:44 ` [PATCH 06/21] drivers: base: Use present CPUs in GENERIC_CPU_DEVICES Russell King
2023-11-21 13:44 ` [PATCH 07/21] drivers: base: Allow parts of GENERIC_CPU_DEVICES to be overridden Russell King
2023-11-30 16:50 ` Jonathan Cameron
2023-11-21 13:44 ` [PATCH 08/21] drivers: base: Implement weak arch_unregister_cpu() Russell King
2023-11-30 16:50 ` Jonathan Cameron
2023-12-01 3:47 ` Gavin Shan
2023-12-01 11:06 ` Thomas Gleixner
2023-11-21 13:44 ` [PATCH 09/21] drivers: base: add arch_cpu_is_hotpluggable() Russell King (Oracle)
2023-11-30 16:51 ` Jonathan Cameron
2023-12-01 3:47 ` Gavin Shan
2023-11-21 13:44 ` [PATCH 10/21] drivers: base: Move cpu_dev_init() after node_dev_init() Russell King
2023-11-30 16:52 ` Jonathan Cameron
2023-12-01 3:48 ` Gavin Shan
2023-11-21 13:44 ` [PATCH 11/21] drivers: base: Print a warning instead of panic() when register_cpu() fails Russell King
2023-11-30 16:53 ` Jonathan Cameron
2023-12-01 3:49 ` Gavin Shan
2023-11-21 13:44 ` [PATCH 12/21] arm64: setup: Switch over to GENERIC_CPU_DEVICES using arch_register_cpu() Russell King
2023-11-30 16:54 ` Jonathan Cameron
2023-12-11 13:20 ` Will Deacon
2023-11-21 13:44 ` [PATCH 13/21] arm64: convert to arch_cpu_is_hotpluggable() Russell King (Oracle)
2023-11-30 16:54 ` Jonathan Cameron
2023-12-11 13:21 ` Will Deacon
2023-11-21 13:45 ` Russell King [this message]
2023-11-30 16:56 ` [PATCH 14/21] x86/topology: Switch over to GENERIC_CPU_DEVICES Jonathan Cameron
2023-11-21 13:45 ` [PATCH 15/21] x86/topology: use weak version of arch_unregister_cpu() Russell King (Oracle)
2023-11-30 16:57 ` Jonathan Cameron
2023-11-21 13:45 ` [PATCH 16/21] x86/topology: convert to use arch_cpu_is_hotpluggable() Russell King (Oracle)
2023-11-30 16:55 ` Jonathan Cameron
2023-11-21 13:45 ` [PATCH 17/21] LoongArch: Switch over to GENERIC_CPU_DEVICES Russell King
2023-11-30 16:57 ` Jonathan Cameron
2023-11-21 13:45 ` [PATCH 18/21] LoongArch: Use the __weak version of arch_unregister_cpu() Russell King
2023-11-21 13:45 ` [PATCH 19/21] LoongArch: convert to use arch_cpu_is_hotpluggable() Russell King (Oracle)
2023-11-30 16:55 ` Jonathan Cameron
2023-11-21 13:45 ` [PATCH 20/21] riscv: Switch over to GENERIC_CPU_DEVICES Russell King
2023-11-22 20:05 ` Samuel Holland
2023-11-21 13:45 ` [PATCH 21/21] riscv: convert to use arch_cpu_is_hotpluggable() Russell King (Oracle)
2023-11-22 20:08 ` Samuel Holland
2023-11-30 16:55 ` Jonathan Cameron
2023-12-01 8:53 ` [PATCH 00/21] Initial cleanups for vCPU hotplug Thomas Gleixner
2023-12-01 11:25 ` Thomas Gleixner
2023-12-01 12:28 ` Greg Kroah-Hartman
2023-12-01 16:09 ` Thomas Gleixner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1r5R3l-00Cszm-UA@rmk-PC.armlinux.org.uk \
--to=rmk+kernel@armlinux.org.uk \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=james.morse@arm.com \
--cc=jean-philippe@linaro.org \
--cc=jianyong.wu@arm.com \
--cc=justin.he@arm.com \
--cc=kvmarm@lists.linux.dev \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-csky@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=loongarch@lists.linux.dev \
--cc=mingo@redhat.com \
--cc=salil.mehta@huawei.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).