From: "Rafael J. Wysocki" <rafael@kernel.org>
To: Russell King <rmk+kernel@armlinux.org.uk>
Cc: 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,
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>,
Huacai Chen <chenhuacai@kernel.org>,
WANG Xuerui <kernel@xen0n.name>,
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>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Len Brown <lenb@kernel.org>,
Paul Walmsley <paul.walmsley@sifive.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Albert Ou <aou@eecs.berkeley.edu>
Subject: Re: [PATCH 05/21] ACPI: Move ACPI_HOTPLUG_CPU to be disabled on arm64 and riscv
Date: Wed, 22 Nov 2023 21:16:39 +0100 [thread overview]
Message-ID: <CAJZ5v0iYRXh369M3XTM0V8Q9mWkAT2y+9pJMD7HMaGjgpvFEMw@mail.gmail.com> (raw)
In-Reply-To: <E1r5R31-00Csyt-Jq@rmk-PC.armlinux.org.uk>
On Tue, Nov 21, 2023 at 2:44 PM Russell King <rmk+kernel@armlinux.org.uk> wrote:
>
> From: James Morse <james.morse@arm.com>
>
> Neither arm64 nor riscv support physical hotadd of CPUs that were not
> present at boot. For arm64 much of the platform description is in static
> tables which do not have update methods. arm64 does support HOTPLUG_CPU,
> which is backed by a firmware interface to turn CPUs on and off.
>
> acpi_processor_hotadd_init() and acpi_processor_remove() are for adding
> and removing CPUs that were not present at boot. arm64 systems that do this
> are not supported as there is currently insufficient information in the
> platform description. (e.g. did the GICR get removed too?)
>
> arm64 currently relies on the MADT enabled flag check in map_gicc_mpidr()
> to prevent CPUs that were not described as present at boot from being
> added to the system. Similarly, riscv relies on the same check in
> map_rintc_hartid(). Both architectures also rely on the weak 'always fails'
> definitions of acpi_map_cpu() and arch_register_cpu().
>
> Subsequent changes will redefine ACPI_HOTPLUG_CPU as making possible
> CPUs present. Neither arm64 nor riscv support this.
>
> Disable ACPI_HOTPLUG_CPU for arm64 and riscv by removing 'default y' and
> selecting it on the other three ACPI architectures. This allows the weak
> definitions of some symbols to be removed.
>
> Signed-off-by: James Morse <james.morse@arm.com>
> Reviewed-by: Shaoqin Huang <shahuang@redhat.com>
> Reviewed-by: Gavin Shan <gshan@redhat.com>
> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
I can apply this if it gets ACKs from the maintainers of the affected
architectures.
> ---
> Changes since RFC:
> * Expanded conditions to avoid ACPI_HOTPLUG_CPU being enabled when
> HOTPLUG_CPU isn't.
> Changes since RFC v3:
> * Dropped ia64 changes
> ---
> arch/loongarch/Kconfig | 1 +
> arch/x86/Kconfig | 1 +
> drivers/acpi/Kconfig | 1 -
> drivers/acpi/acpi_processor.c | 18 ------------------
> 4 files changed, 2 insertions(+), 19 deletions(-)
>
> diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig
> index ee123820a476..331becb2cb4f 100644
> --- a/arch/loongarch/Kconfig
> +++ b/arch/loongarch/Kconfig
> @@ -5,6 +5,7 @@ config LOONGARCH
> select ACPI
> select ACPI_GENERIC_GSI if ACPI
> select ACPI_MCFG if ACPI
> + select ACPI_HOTPLUG_CPU if ACPI_PROCESSOR && HOTPLUG_CPU
> select ACPI_PPTT if ACPI
> select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
> select ARCH_BINFMT_ELF_STATE
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index 3762f41bb092..dbdcfc708369 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -59,6 +59,7 @@ config X86
> #
> select ACPI_LEGACY_TABLES_LOOKUP if ACPI
> select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
> + select ACPI_HOTPLUG_CPU if ACPI_PROCESSOR && HOTPLUG_CPU
> select ARCH_32BIT_OFF_T if X86_32
> select ARCH_CLOCKSOURCE_INIT
> select ARCH_CORRECT_STACKTRACE_ON_KRETPROBE
> diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
> index f819e760ff19..a3acfc750fce 100644
> --- a/drivers/acpi/Kconfig
> +++ b/drivers/acpi/Kconfig
> @@ -310,7 +310,6 @@ config ACPI_HOTPLUG_CPU
> bool
> depends on ACPI_PROCESSOR && HOTPLUG_CPU
> select ACPI_CONTAINER
> - default y
>
> config ACPI_PROCESSOR_AGGREGATOR
> tristate "Processor Aggregator"
> diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c
> index 0f5218e361df..4fe2ef54088c 100644
> --- a/drivers/acpi/acpi_processor.c
> +++ b/drivers/acpi/acpi_processor.c
> @@ -184,24 +184,6 @@ static void __init acpi_pcc_cpufreq_init(void) {}
>
> /* Initialization */
> #ifdef CONFIG_ACPI_HOTPLUG_CPU
> -int __weak acpi_map_cpu(acpi_handle handle,
> - phys_cpuid_t physid, u32 acpi_id, int *pcpu)
> -{
> - return -ENODEV;
> -}
> -
> -int __weak acpi_unmap_cpu(int cpu)
> -{
> - return -ENODEV;
> -}
> -
> -int __weak arch_register_cpu(int cpu)
> -{
> - return -ENODEV;
> -}
> -
> -void __weak arch_unregister_cpu(int cpu) {}
> -
> static int acpi_processor_hotadd_init(struct acpi_processor *pr)
> {
> unsigned long long sta;
> --
> 2.30.2
>
next prev parent reply other threads:[~2023-11-22 20:16 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 [this message]
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 ` [PATCH 14/21] x86/topology: Switch over to GENERIC_CPU_DEVICES Russell King
2023-11-30 16:56 ` 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=CAJZ5v0iYRXh369M3XTM0V8Q9mWkAT2y+9pJMD7HMaGjgpvFEMw@mail.gmail.com \
--to=rafael@kernel.org \
--cc=aou@eecs.berkeley.edu \
--cc=bp@alien8.de \
--cc=chenhuacai@kernel.org \
--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=kernel@xen0n.name \
--cc=kvmarm@lists.linux.dev \
--cc=lenb@kernel.org \
--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=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=rmk+kernel@armlinux.org.uk \
--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).