From: Jonathan Cameron <Jonathan.Cameron@huawei.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>, <kvmarm@lists.linux.dev>, <x86@kernel.org>, Russell King <linux@armlinux.org.uk>, "Rafael J . Wysocki" <rafael@kernel.org>, Miguel Luis <miguel.luis@oracle.com>, James Morse <james.morse@arm.com>, Salil Mehta <salil.mehta@huawei.com>, Jean-Philippe Brucker <jean-philippe@linaro.org>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org> Cc: <linuxarm@huawei.com>, <justin.he@arm.com>, <jianyong.wu@arm.com> Subject: [PATCH v5 09/18] ACPI: Check _STA present bit before making CPUs not present Date: Fri, 12 Apr 2024 15:37:10 +0100 [thread overview] Message-ID: <20240412143719.11398-10-Jonathan.Cameron@huawei.com> (raw) In-Reply-To: <20240412143719.11398-1-Jonathan.Cameron@huawei.com> From: James Morse <james.morse@arm.com> When called acpi_processor_post_eject() unconditionally make a CPU not-present and unregisters it. To add support for AML events where the CPU has become disabled, but remains present, the _STA method should be checked before calling acpi_processor_remove(). Rename acpi_processor_post_eject() acpi_processor_remove_possible(), and check the _STA before calling. Adding the function prototype for arch_unregister_cpu() allows the preprocessor guards to be removed. After this change CPUs will remain registered and visible to user-space as offline if buggy firmware triggers an eject-request, but doesn't clear the corresponding _STA bits after _EJ0 has been called. Signed-off-by: James Morse <james.morse@arm.com> Tested-by: Miguel Luis <miguel.luis@oracle.com> Tested-by: Vishnu Pajjuri <vishnu@os.amperecomputing.com> Tested-by: Jianyong Wu <jianyong.wu@arm.com> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> --- v5: No change --- drivers/acpi/acpi_processor.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index 15d89f80857b..0403eddb3f80 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c @@ -462,16 +462,13 @@ static int acpi_processor_add(struct acpi_device *device, } /* Removal */ -static void acpi_processor_post_eject(struct acpi_device *device) +static void acpi_processor_make_not_present(struct acpi_device *device) { struct acpi_processor *pr; if (!IS_ENABLED(CONFIG_ACPI_HOTPLUG_CPU)) return; - if (!device || !acpi_driver_data(device)) - return; - pr = acpi_driver_data(device); if (pr->id >= nr_cpu_ids) goto out; @@ -508,6 +505,29 @@ static void acpi_processor_post_eject(struct acpi_device *device) kfree(pr); } +static void acpi_processor_post_eject(struct acpi_device *device) +{ + struct acpi_processor *pr; + unsigned long long sta; + acpi_status status; + + if (!device) + return; + + pr = acpi_driver_data(device); + if (!pr || pr->id >= nr_cpu_ids || invalid_phys_cpuid(pr->phys_id)) + return; + + status = acpi_evaluate_integer(pr->handle, "_STA", NULL, &sta); + if (ACPI_FAILURE(status)) + return; + + if (cpu_present(pr->id) && !(sta & ACPI_STA_DEVICE_PRESENT)) { + acpi_processor_make_not_present(device); + return; + } +} + #ifdef CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC bool __init processor_physically_present(acpi_handle handle) { -- 2.39.2
WARNING: multiple messages have this Message-ID (diff)
From: Jonathan Cameron <Jonathan.Cameron@huawei.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>, <kvmarm@lists.linux.dev>, <x86@kernel.org>, Russell King <linux@armlinux.org.uk>, "Rafael J . Wysocki" <rafael@kernel.org>, Miguel Luis <miguel.luis@oracle.com>, James Morse <james.morse@arm.com>, Salil Mehta <salil.mehta@huawei.com>, Jean-Philippe Brucker <jean-philippe@linaro.org>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org> Cc: <linuxarm@huawei.com>, <justin.he@arm.com>, <jianyong.wu@arm.com> Subject: [PATCH v5 09/18] ACPI: Check _STA present bit before making CPUs not present Date: Fri, 12 Apr 2024 15:37:10 +0100 [thread overview] Message-ID: <20240412143719.11398-10-Jonathan.Cameron@huawei.com> (raw) In-Reply-To: <20240412143719.11398-1-Jonathan.Cameron@huawei.com> From: James Morse <james.morse@arm.com> When called acpi_processor_post_eject() unconditionally make a CPU not-present and unregisters it. To add support for AML events where the CPU has become disabled, but remains present, the _STA method should be checked before calling acpi_processor_remove(). Rename acpi_processor_post_eject() acpi_processor_remove_possible(), and check the _STA before calling. Adding the function prototype for arch_unregister_cpu() allows the preprocessor guards to be removed. After this change CPUs will remain registered and visible to user-space as offline if buggy firmware triggers an eject-request, but doesn't clear the corresponding _STA bits after _EJ0 has been called. Signed-off-by: James Morse <james.morse@arm.com> Tested-by: Miguel Luis <miguel.luis@oracle.com> Tested-by: Vishnu Pajjuri <vishnu@os.amperecomputing.com> Tested-by: Jianyong Wu <jianyong.wu@arm.com> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> --- v5: No change --- drivers/acpi/acpi_processor.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index 15d89f80857b..0403eddb3f80 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c @@ -462,16 +462,13 @@ static int acpi_processor_add(struct acpi_device *device, } /* Removal */ -static void acpi_processor_post_eject(struct acpi_device *device) +static void acpi_processor_make_not_present(struct acpi_device *device) { struct acpi_processor *pr; if (!IS_ENABLED(CONFIG_ACPI_HOTPLUG_CPU)) return; - if (!device || !acpi_driver_data(device)) - return; - pr = acpi_driver_data(device); if (pr->id >= nr_cpu_ids) goto out; @@ -508,6 +505,29 @@ static void acpi_processor_post_eject(struct acpi_device *device) kfree(pr); } +static void acpi_processor_post_eject(struct acpi_device *device) +{ + struct acpi_processor *pr; + unsigned long long sta; + acpi_status status; + + if (!device) + return; + + pr = acpi_driver_data(device); + if (!pr || pr->id >= nr_cpu_ids || invalid_phys_cpuid(pr->phys_id)) + return; + + status = acpi_evaluate_integer(pr->handle, "_STA", NULL, &sta); + if (ACPI_FAILURE(status)) + return; + + if (cpu_present(pr->id) && !(sta & ACPI_STA_DEVICE_PRESENT)) { + acpi_processor_make_not_present(device); + return; + } +} + #ifdef CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC bool __init processor_physically_present(acpi_handle handle) { -- 2.39.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2024-04-12 14:41 UTC|newest] Thread overview: 116+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-04-12 14:37 [PATCH v5 00/18] ACPI/arm64: add support for virtual cpu hotplug Jonathan Cameron 2024-04-12 14:37 ` Jonathan Cameron 2024-04-12 14:37 ` [PATCH v5 01/18] cpu: Do not warn on arch_register_cpu() returning -EPROBE_DEFER Jonathan Cameron 2024-04-12 14:37 ` Jonathan Cameron 2024-04-12 17:42 ` Rafael J. Wysocki 2024-04-12 17:42 ` Rafael J. Wysocki 2024-04-22 3:53 ` Gavin Shan 2024-04-22 3:53 ` Gavin Shan 2024-04-12 14:37 ` [PATCH v5 02/18] ACPI: processor: Set the ACPI_COMPANION for the struct cpu instance Jonathan Cameron 2024-04-12 14:37 ` Jonathan Cameron 2024-04-12 18:10 ` Rafael J. Wysocki 2024-04-12 18:10 ` Rafael J. Wysocki 2024-04-15 15:48 ` Jonathan Cameron 2024-04-15 15:48 ` Jonathan Cameron 2024-04-15 16:16 ` Rafael J. Wysocki 2024-04-15 16:16 ` Rafael J. Wysocki 2024-04-15 16:19 ` Rafael J. Wysocki 2024-04-15 16:19 ` Rafael J. Wysocki 2024-04-15 16:50 ` Jonathan Cameron 2024-04-15 16:50 ` Jonathan Cameron 2024-04-15 17:34 ` Jonathan Cameron 2024-04-15 17:34 ` Jonathan Cameron 2024-04-15 17:41 ` Rafael J. Wysocki 2024-04-15 17:41 ` Rafael J. Wysocki 2024-04-16 17:35 ` Jonathan Cameron 2024-04-16 17:35 ` Jonathan Cameron 2024-04-12 14:37 ` [PATCH v5 03/18] ACPI: processor: Register deferred CPUs from acpi_processor_get_info() Jonathan Cameron 2024-04-12 14:37 ` Jonathan Cameron 2024-04-12 18:30 ` Rafael J. Wysocki 2024-04-12 18:30 ` Rafael J. Wysocki 2024-04-12 20:16 ` Russell King (Oracle) 2024-04-12 20:16 ` Russell King (Oracle) 2024-04-12 20:54 ` Thomas Gleixner 2024-04-12 20:54 ` Thomas Gleixner 2024-04-12 21:52 ` Russell King (Oracle) 2024-04-12 21:52 ` Russell King (Oracle) 2024-04-12 23:23 ` Thomas Gleixner 2024-04-12 23:23 ` Thomas Gleixner 2024-04-15 8:45 ` Jonathan Cameron 2024-04-15 8:45 ` Jonathan Cameron 2024-04-15 9:16 ` Jonathan Cameron 2024-04-15 9:16 ` Jonathan Cameron 2024-04-15 9:31 ` Jonathan Cameron 2024-04-15 9:31 ` Jonathan Cameron 2024-04-15 11:57 ` Jonathan Cameron 2024-04-15 11:57 ` Jonathan Cameron 2024-04-15 11:37 ` Rafael J. Wysocki 2024-04-15 11:37 ` Rafael J. Wysocki 2024-04-15 11:56 ` Jonathan Cameron 2024-04-15 11:56 ` Jonathan Cameron 2024-04-15 12:04 ` Rafael J. Wysocki 2024-04-15 12:04 ` Rafael J. Wysocki 2024-04-15 12:23 ` Jonathan Cameron 2024-04-15 12:23 ` Jonathan Cameron 2024-04-16 17:41 ` Jonathan Cameron 2024-04-16 17:41 ` Jonathan Cameron 2024-04-16 19:02 ` Rafael J. Wysocki 2024-04-16 19:02 ` Rafael J. Wysocki 2024-04-17 10:39 ` Jonathan Cameron 2024-04-17 10:39 ` Jonathan Cameron 2024-04-15 12:37 ` Salil Mehta 2024-04-15 12:37 ` Salil Mehta 2024-04-15 12:41 ` Rafael J. Wysocki 2024-04-15 12:41 ` Rafael J. Wysocki 2024-04-15 11:51 ` Salil Mehta 2024-04-15 11:51 ` Salil Mehta 2024-04-15 12:51 ` Rafael J. Wysocki 2024-04-15 12:51 ` Rafael J. Wysocki 2024-04-15 15:31 ` Salil Mehta 2024-04-15 15:31 ` Salil Mehta 2024-04-15 16:38 ` Rafael J. Wysocki 2024-04-15 16:38 ` Rafael J. Wysocki 2024-04-17 15:01 ` Salil Mehta 2024-04-17 15:01 ` Salil Mehta 2024-04-17 16:19 ` Rafael J. Wysocki 2024-04-17 16:19 ` Rafael J. Wysocki 2024-04-15 10:52 ` Jonathan Cameron 2024-04-15 10:52 ` Jonathan Cameron 2024-04-15 11:11 ` Jonathan Cameron 2024-04-15 11:11 ` Jonathan Cameron 2024-04-15 11:52 ` Rafael J. Wysocki 2024-04-15 11:52 ` Rafael J. Wysocki 2024-04-15 11:07 ` Salil Mehta 2024-04-15 11:07 ` Salil Mehta 2024-04-16 14:00 ` Jonathan Cameron 2024-04-16 14:00 ` Jonathan Cameron 2024-04-12 14:37 ` [PATCH v5 04/18] ACPI: Rename acpi_processor_hotadd_init and remove pre-processor guards Jonathan Cameron 2024-04-12 14:37 ` Jonathan Cameron 2024-04-12 14:37 ` [PATCH v5 05/18] ACPI: utils: Add an acpi_sta_enabled() helper and use it in acpi_processor_make_present() Jonathan Cameron 2024-04-12 14:37 ` Jonathan Cameron 2024-04-12 14:37 ` [PATCH v5 06/18] ACPI: scan: Add parameter to allow defering some actions in acpi_scan_check_and_detach Jonathan Cameron 2024-04-12 14:37 ` Jonathan Cameron 2024-04-12 14:37 ` [PATCH v5 07/18] ACPI: Add post_eject to struct acpi_scan_handler for cpu hotplug Jonathan Cameron 2024-04-12 14:37 ` Jonathan Cameron 2024-04-12 14:37 ` [PATCH v5 08/18] ACPI: convert acpi_processor_post_eject() to use IS_ENABLED() Jonathan Cameron 2024-04-12 14:37 ` Jonathan Cameron 2024-04-12 14:37 ` Jonathan Cameron [this message] 2024-04-12 14:37 ` [PATCH v5 09/18] ACPI: Check _STA present bit before making CPUs not present Jonathan Cameron 2024-04-12 14:37 ` [PATCH v5 10/18] ACPI: Warn when the present bit changes but the feature is not enabled Jonathan Cameron 2024-04-12 14:37 ` Jonathan Cameron 2024-04-12 14:37 ` [PATCH v5 11/18] arm64: acpi: Move get_cpu_for_acpi_id() to a header Jonathan Cameron 2024-04-12 14:37 ` Jonathan Cameron 2024-04-12 14:37 ` [PATCH v5 12/18] irqchip/gic-v3: Don't return errors from gic_acpi_match_gicc() Jonathan Cameron 2024-04-12 14:37 ` Jonathan Cameron 2024-04-12 14:37 ` [PATCH v5 13/18] irqchip/gic-v3: Add support for ACPI's disabled but 'online capable' CPUs Jonathan Cameron 2024-04-12 14:37 ` Jonathan Cameron 2024-04-12 14:37 ` [PATCH v5 14/18] arm64: psci: Ignore DENIED CPUs Jonathan Cameron 2024-04-12 14:37 ` Jonathan Cameron 2024-04-12 14:37 ` [PATCH v5 15/18] arm64: arch_register_cpu() variant to allow checking of ACPI _STA Jonathan Cameron 2024-04-12 14:37 ` Jonathan Cameron 2024-04-12 14:37 ` [PATCH v5 16/18] ACPI: add support to (un)register CPUs based on the _STA enabled bit Jonathan Cameron 2024-04-12 14:37 ` Jonathan Cameron 2024-04-12 14:37 ` [PATCH v5 17/18] arm64: document virtual CPU hotplug's expectations Jonathan Cameron 2024-04-12 14:37 ` Jonathan Cameron 2024-04-12 14:37 ` [PATCH v5 18/18] cpumask: Add enabled cpumask for present CPUs that can be brought online Jonathan Cameron 2024-04-12 14:37 ` Jonathan Cameron
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=20240412143719.11398-10-Jonathan.Cameron@huawei.com \ --to=jonathan.cameron@huawei.com \ --cc=catalin.marinas@arm.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-kernel@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=linuxarm@huawei.com \ --cc=loongarch@lists.linux.dev \ --cc=miguel.luis@oracle.com \ --cc=rafael@kernel.org \ --cc=salil.mehta@huawei.com \ --cc=will@kernel.org \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.