From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50083CD37B0 for ; Mon, 18 Sep 2023 05:24:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239574AbjIRFXu (ORCPT ); Mon, 18 Sep 2023 01:23:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239647AbjIRFX3 (ORCPT ); Mon, 18 Sep 2023 01:23:29 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC4AB188 for ; Sun, 17 Sep 2023 22:22:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695014546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EvMO1Lp1XkXRY9wGT8TKvKnSfeYSp+m+W1bfNmW+8XA=; b=GzQLDPeQJ7xun1wv9Bw8+guAP3zXjMOoT0A49CyquJkKN4dLM5BcmoK30NRXVZ18T+qD82 6gp3Q6ngzVVR+TeaY0Cav7N52QhUQo3s8pxd9LrxG+tKsrZFG5kpe+pgO5mXiJmqNzRoh+ hDAW8Bs3NQNyEqKY/GWvuzUfBlJftDo= Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-416-gPG68xcbN7qT3xL1154flA-1; Mon, 18 Sep 2023 01:22:24 -0400 X-MC-Unique: gPG68xcbN7qT3xL1154flA-1 Received: by mail-pg1-f199.google.com with SMTP id 41be03b00d2f7-56fb25fdf06so2750585a12.1 for ; Sun, 17 Sep 2023 22:22:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695014543; x=1695619343; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=EvMO1Lp1XkXRY9wGT8TKvKnSfeYSp+m+W1bfNmW+8XA=; b=BVxxxpwtksQDMP7p7Uj10ThKRvhu+C0p94V4Q9I5HgxOHDHZdGRdsXRHWZ1uZ4v8SX Tf0zZ/CcfN0J+SoRfjj2b5t++gzXn8J/wnX7M76fXAsPOaUdnlUTr7Vt4uDG4dBEAU7k 2+sOfBa1NC+oW7LynFFXE/d5Vkb6zS83YyT3Na16FQ+NHuSmMUyE6eZaMtAAjum+1ybr rn/zD1kVgTdFcedXyUKntCFO3IJcUYnA6rJ40pup+cpBIUw/IXn+F1Gz4z8rKB2fcRn0 qrXzVa8FvIdfFOESpjEgeXC9eLV1QHQv+H1E+982xETV4ssIGy6uJMRyC6iSAp2btGoy Yd2A== X-Gm-Message-State: AOJu0Ywybebp+SqLtH+6XA7okWDMp2XW8LXIo+0wXaDVZbuDS4qOQ8H+ CyZf40XynDYJPTU3SyaZuFbcF4cLzvYObyjVFM8t80R9jmZMAV0QQXoGyyY8Ho/2hN9PX6lG+6G butOKDahJr3bYfXivyRJPZw== X-Received: by 2002:a17:902:6943:b0:1b8:c6:ec8f with SMTP id k3-20020a170902694300b001b800c6ec8fmr6078238plt.46.1695014543152; Sun, 17 Sep 2023 22:22:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEjQVdMm7nBDU1mZANeOLwn1iptamUPcm7CKLo7LNUirDNak1L3qng2r1diOCjxNwuzyI3Qrw== X-Received: by 2002:a17:902:6943:b0:1b8:c6:ec8f with SMTP id k3-20020a170902694300b001b800c6ec8fmr6078226plt.46.1695014542790; Sun, 17 Sep 2023 22:22:22 -0700 (PDT) Received: from ?IPV6:2001:8003:e5b0:9f00:dbbc:1945:6e65:ec5? ([2001:8003:e5b0:9f00:dbbc:1945:6e65:ec5]) by smtp.gmail.com with ESMTPSA id 17-20020a170902ee5100b001bb7a736b4csm1109626plo.77.2023.09.17.22.22.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 17 Sep 2023 22:22:22 -0700 (PDT) Message-ID: <8cc0b616-a50d-c3aa-ebd5-2db1a8e1ed46@redhat.com> Date: Mon, 18 Sep 2023 15:22:13 +1000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [RFC PATCH v2 18/35] ACPI: Rename ACPI_HOTPLUG_CPU to include 'present' Content-Language: en-US To: James Morse , 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 , Russell King , Jean-Philippe Brucker , jianyong.wu@arm.com, justin.he@arm.com References: <20230913163823.7880-1-james.morse@arm.com> <20230913163823.7880-19-james.morse@arm.com> From: Gavin Shan In-Reply-To: <20230913163823.7880-19-james.morse@arm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-arch@vger.kernel.org On 9/14/23 02:38, James Morse wrote: > The code behind ACPI_HOTPLUG_CPU allows a not-present CPU to become > present. This isn't the only use of HOTPLUG_CPU. On arm64 and riscv > CPUs can be taken offline as a power saving measure. > > On arm64 an offline CPU may be disabled by firmware, preventing it from > being brought back online, but it remains present throughout. > > Adding code to prevent user-space trying to online these disabled CPUs > needs some additional terminology. > > Rename the Kconfig symbol CONFIG_ACPI_HOTPLUG_PRESENT_CPU to reflect > that it makes possible CPUs present. > > HOTPLUG_CPU is untouched as this is only about the ACPI mechanism. > > Signed-off-by: James Morse > --- > arch/ia64/Kconfig | 2 +- > arch/ia64/include/asm/acpi.h | 2 +- > arch/ia64/kernel/acpi.c | 6 +++--- > arch/ia64/kernel/setup.c | 2 +- > arch/loongarch/configs/loongson3_defconfig | 2 +- > arch/loongarch/kernel/acpi.c | 4 ++-- > arch/x86/Kconfig | 2 +- > arch/x86/kernel/acpi/boot.c | 4 ++-- > drivers/acpi/Kconfig | 4 ++-- > drivers/acpi/acpi_processor.c | 10 +++++----- > include/acpi/processor.h | 2 +- > include/linux/acpi.h | 6 +++--- > 12 files changed, 23 insertions(+), 23 deletions(-) > The replacement is missed for arch/loongarch. [gshan@gshan l]$ git grep ACPI_HOTPLUG_CPU arch/loongarch/Kconfig: select ACPI_HOTPLUG_CPU if ACPI_PROCESSOR && HOTPLUG_CPU > diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig > index a3bfd42467ab..54972f9fe804 100644 > --- a/arch/ia64/Kconfig > +++ b/arch/ia64/Kconfig > @@ -16,7 +16,7 @@ config IA64 > select ARCH_MIGHT_HAVE_PC_PARPORT > select ARCH_MIGHT_HAVE_PC_SERIO > select ACPI > - select ACPI_HOTPLUG_CPU if ACPI_PROCESSOR && HOTPLUG_CPU > + select ACPI_HOTPLUG_PRESENT_CPU if ACPI_PROCESSOR && HOTPLUG_CPU > select ACPI_NUMA if NUMA > select ARCH_ENABLE_MEMORY_HOTPLUG > select ARCH_ENABLE_MEMORY_HOTREMOVE > diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h > index 58500a964238..482ea994d1e1 100644 > --- a/arch/ia64/include/asm/acpi.h > +++ b/arch/ia64/include/asm/acpi.h > @@ -52,7 +52,7 @@ extern unsigned int is_cpu_cpei_target(unsigned int cpu); > extern void set_cpei_target_cpu(unsigned int cpu); > extern unsigned int get_cpei_target_cpu(void); > extern void prefill_possible_map(void); > -#ifdef CONFIG_ACPI_HOTPLUG_CPU > +#ifdef CONFIG_ACPI_HOTPLUG_PRESENT_CPU > extern int additional_cpus; > #else > #define additional_cpus 0 > diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c > index 15f6cfddcc08..35881bf4b016 100644 > --- a/arch/ia64/kernel/acpi.c > +++ b/arch/ia64/kernel/acpi.c > @@ -194,7 +194,7 @@ acpi_parse_plat_int_src(union acpi_subtable_headers * header, > return 0; > } > > -#ifdef CONFIG_HOTPLUG_CPU > +#ifdef CONFIG_ACPI_HOTPLUG_PRESENT_CPU > unsigned int can_cpei_retarget(void) > { > extern int cpe_vector; > @@ -711,7 +711,7 @@ int acpi_isa_irq_to_gsi(unsigned isa_irq, u32 *gsi) > /* > * ACPI based hotplug CPU support > */ > -#ifdef CONFIG_ACPI_HOTPLUG_CPU > +#ifdef CONFIG_ACPI_HOTPLUG_PRESENT_CPU > int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid) > { > #ifdef CONFIG_ACPI_NUMA > @@ -820,7 +820,7 @@ int acpi_unmap_cpu(int cpu) > return (0); > } > EXPORT_SYMBOL(acpi_unmap_cpu); > -#endif /* CONFIG_ACPI_HOTPLUG_CPU */ > +#endif /* CONFIG_ACPI_HOTPLUG_PRESENT_CPU */ > > #ifdef CONFIG_ACPI_NUMA > static acpi_status acpi_map_iosapic(acpi_handle handle, u32 depth, > diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c > index 5a55ac82c13a..44591716d07b 100644 > --- a/arch/ia64/kernel/setup.c > +++ b/arch/ia64/kernel/setup.c > @@ -569,7 +569,7 @@ setup_arch (char **cmdline_p) > #ifdef CONFIG_ACPI_NUMA > acpi_numa_init(); > acpi_numa_fixup(); > -#ifdef CONFIG_ACPI_HOTPLUG_CPU > +#ifdef CONFIG_ACPI_HOTPLUG_PRESENT_CPU > prefill_possible_map(); > #endif > per_cpu_scan_finalize((cpumask_empty(&early_cpu_possible_map) ? > diff --git a/arch/loongarch/configs/loongson3_defconfig b/arch/loongarch/configs/loongson3_defconfig > index a3b52aaa83b3..ef3bc76313e4 100644 > --- a/arch/loongarch/configs/loongson3_defconfig > +++ b/arch/loongarch/configs/loongson3_defconfig > @@ -59,7 +59,7 @@ CONFIG_ACPI_SPCR_TABLE=y > CONFIG_ACPI_TAD=y > CONFIG_ACPI_DOCK=y > CONFIG_ACPI_IPMI=m > -CONFIG_ACPI_HOTPLUG_CPU=y > +CONFIG_ACPI_HOTPLUG_PRESENT_CPU=y > CONFIG_ACPI_PCI_SLOT=y > CONFIG_ACPI_HOTPLUG_MEMORY=y > CONFIG_EFI_ZBOOT=y > diff --git a/arch/loongarch/kernel/acpi.c b/arch/loongarch/kernel/acpi.c > index 9450e09073eb..b5153e395ad9 100644 > --- a/arch/loongarch/kernel/acpi.c > +++ b/arch/loongarch/kernel/acpi.c > @@ -289,7 +289,7 @@ void __init arch_reserve_mem_area(acpi_physical_address addr, size_t size) > memblock_reserve(addr, size); > } > > -#ifdef CONFIG_ACPI_HOTPLUG_CPU > +#ifdef CONFIG_ACPI_HOTPLUG_PRESENT_CPU > > #include > > @@ -341,4 +341,4 @@ int acpi_unmap_cpu(int cpu) > } > EXPORT_SYMBOL(acpi_unmap_cpu); > > -#endif /* CONFIG_ACPI_HOTPLUG_CPU */ > +#endif /* CONFIG_ACPI_HOTPLUG_PRESENT_CPU */ > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index 133ea5f561b5..295a7a3debb6 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -60,7 +60,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 ACPI_HOTPLUG_PRESENT_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/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c > index 2a0ea38955df..84dd4133754b 100644 > --- a/arch/x86/kernel/acpi/boot.c > +++ b/arch/x86/kernel/acpi/boot.c > @@ -814,7 +814,7 @@ static void __init acpi_set_irq_model_ioapic(void) > /* > * ACPI based hotplug support for CPU > */ > -#ifdef CONFIG_ACPI_HOTPLUG_CPU > +#ifdef CONFIG_ACPI_HOTPLUG_PRESENT_CPU > #include > > static int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid) > @@ -863,7 +863,7 @@ int acpi_unmap_cpu(int cpu) > return (0); > } > EXPORT_SYMBOL(acpi_unmap_cpu); > -#endif /* CONFIG_ACPI_HOTPLUG_CPU */ > +#endif /* CONFIG_ACPI_HOTPLUG_PRESENT_CPU */ > > int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base) > { > diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig > index 8456d48ba702..417f9f3077d2 100644 > --- a/drivers/acpi/Kconfig > +++ b/drivers/acpi/Kconfig > @@ -305,7 +305,7 @@ config ACPI_IPMI > To compile this driver as a module, choose M here: > the module will be called as acpi_ipmi. > > -config ACPI_HOTPLUG_CPU > +config ACPI_HOTPLUG_PRESENT_CPU > bool > depends on ACPI_PROCESSOR && HOTPLUG_CPU > select ACPI_CONTAINER > @@ -399,7 +399,7 @@ config ACPI_PCI_SLOT > > config ACPI_CONTAINER > bool "Container and Module Devices" > - default (ACPI_HOTPLUG_MEMORY || ACPI_HOTPLUG_CPU) > + default (ACPI_HOTPLUG_MEMORY || ACPI_HOTPLUG_PRESENT_CPU) > help > This driver supports ACPI Container and Module devices (IDs > ACPI0004, PNP0A05, and PNP0A06). > diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c > index 867782bc50b0..75257fae10e7 100644 > --- a/drivers/acpi/acpi_processor.c > +++ b/drivers/acpi/acpi_processor.c > @@ -182,7 +182,7 @@ static void __init acpi_pcc_cpufreq_init(void) {} > #endif /* CONFIG_X86 */ > > /* Initialization */ > -#ifdef CONFIG_ACPI_HOTPLUG_CPU > +#ifdef CONFIG_ACPI_HOTPLUG_PRESENT_CPU > static int acpi_processor_hotadd_init(struct acpi_processor *pr) > { > unsigned long long sta; > @@ -227,7 +227,7 @@ static inline int acpi_processor_hotadd_init(struct acpi_processor *pr) > { > return -ENODEV; > } > -#endif /* CONFIG_ACPI_HOTPLUG_CPU */ > +#endif /* CONFIG_ACPI_HOTPLUG_PRESENT_CPU */ > > static int acpi_processor_get_info(struct acpi_device *device) > { > @@ -461,7 +461,7 @@ static int acpi_processor_add(struct acpi_device *device, > return result; > } > > -#ifdef CONFIG_ACPI_HOTPLUG_CPU > +#ifdef CONFIG_ACPI_HOTPLUG_PRESENT_CPU > /* Removal */ > static void acpi_processor_remove(struct acpi_device *device) > { > @@ -505,7 +505,7 @@ static void acpi_processor_remove(struct acpi_device *device) > free_cpumask_var(pr->throttling.shared_cpu_map); > kfree(pr); > } > -#endif /* CONFIG_ACPI_HOTPLUG_CPU */ > +#endif /* CONFIG_ACPI_HOTPLUG_PRESENT_CPU */ > > #ifdef CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC > bool __init processor_physically_present(acpi_handle handle) > @@ -630,7 +630,7 @@ static const struct acpi_device_id processor_device_ids[] = { > static struct acpi_scan_handler processor_handler = { > .ids = processor_device_ids, > .attach = acpi_processor_add, > -#ifdef CONFIG_ACPI_HOTPLUG_CPU > +#ifdef CONFIG_ACPI_HOTPLUG_PRESENT_CPU > .detach = acpi_processor_remove, > #endif > .hotplug = { > diff --git a/include/acpi/processor.h b/include/acpi/processor.h > index 94181fe9780a..fd6913370c72 100644 > --- a/include/acpi/processor.h > +++ b/include/acpi/processor.h > @@ -465,7 +465,7 @@ extern int acpi_processor_ffh_lpi_probe(unsigned int cpu); > extern int acpi_processor_ffh_lpi_enter(struct acpi_lpi_state *lpi); > #endif > > -#ifdef CONFIG_ACPI_HOTPLUG_CPU > +#ifdef CONFIG_ACPI_HOTPLUG_PRESENT_CPU > extern int arch_register_cpu(int cpu); > extern void arch_unregister_cpu(int cpu); > #endif > diff --git a/include/linux/acpi.h b/include/linux/acpi.h > index a73246c3c35e..651dd43976a9 100644 > --- a/include/linux/acpi.h > +++ b/include/linux/acpi.h > @@ -316,12 +316,12 @@ static inline int acpi_processor_evaluate_cst(acpi_handle handle, u32 cpu, > } > #endif > > -#ifdef CONFIG_ACPI_HOTPLUG_CPU > +#ifdef CONFIG_ACPI_HOTPLUG_PRESENT_CPU > /* Arch dependent functions for cpu hotplug support */ > int acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, u32 acpi_id, > int *pcpu); > int acpi_unmap_cpu(int cpu); > -#endif /* CONFIG_ACPI_HOTPLUG_CPU */ > +#endif /* CONFIG_ACPI_HOTPLUG_PRESENT_CPU */ > > #ifdef CONFIG_ACPI_HOTPLUG_IOAPIC > int acpi_get_ioapic_id(acpi_handle handle, u32 gsi_base, u64 *phys_addr); > @@ -644,7 +644,7 @@ static inline u32 acpi_osc_ctx_get_cxl_control(struct acpi_osc_context *context) > #define ACPI_GSB_ACCESS_ATTRIB_RAW_PROCESS 0x0000000F > > /* Enable _OST when all relevant hotplug operations are enabled */ > -#if defined(CONFIG_ACPI_HOTPLUG_CPU) && \ > +#if defined(CONFIG_ACPI_HOTPLUG_PRESENT_CPU) && \ > defined(CONFIG_ACPI_HOTPLUG_MEMORY) && \ > defined(CONFIG_ACPI_CONTAINER) > #define ACPI_HOTPLUG_OST Thanks, Gavin