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 14/18] arm64: psci: Ignore DENIED CPUs Date: Fri, 12 Apr 2024 15:37:15 +0100 [thread overview] Message-ID: <20240412143719.11398-15-Jonathan.Cameron@huawei.com> (raw) In-Reply-To: <20240412143719.11398-1-Jonathan.Cameron@huawei.com> From: Jean-Philippe Brucker <jean-philippe@linaro.org> When a CPU is marked as disabled, but online capable in the MADT, PSCI applies some firmware policy to control when it can be brought online. PSCI returns DENIED to a CPU_ON request if this is not currently permitted. The OS can learn the current policy from the _STA enabled bit. Handle the PSCI DENIED return code gracefully instead of printing an error. See https://developer.arm.com/documentation/den0022/f/?lang=en page 58. Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> [ morse: Rewrote commit message ] 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> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> --- v5: No change --- arch/arm64/kernel/psci.c | 2 +- arch/arm64/kernel/smp.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c index 29a8e444db83..fabd732d0a2d 100644 --- a/arch/arm64/kernel/psci.c +++ b/arch/arm64/kernel/psci.c @@ -40,7 +40,7 @@ static int cpu_psci_cpu_boot(unsigned int cpu) { phys_addr_t pa_secondary_entry = __pa_symbol(secondary_entry); int err = psci_ops.cpu_on(cpu_logical_map(cpu), pa_secondary_entry); - if (err) + if (err && err != -EPERM) pr_err("failed to boot CPU%d (%d)\n", cpu, err); return err; diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 4ced34f62dab..dc0e0b3ec2d4 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -132,7 +132,8 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle) /* Now bring the CPU into our world */ ret = boot_secondary(cpu, idle); if (ret) { - pr_err("CPU%u: failed to boot: %d\n", cpu, ret); + if (ret != -EPERM) + pr_err("CPU%u: failed to boot: %d\n", cpu, ret); return ret; } -- 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 14/18] arm64: psci: Ignore DENIED CPUs Date: Fri, 12 Apr 2024 15:37:15 +0100 [thread overview] Message-ID: <20240412143719.11398-15-Jonathan.Cameron@huawei.com> (raw) In-Reply-To: <20240412143719.11398-1-Jonathan.Cameron@huawei.com> From: Jean-Philippe Brucker <jean-philippe@linaro.org> When a CPU is marked as disabled, but online capable in the MADT, PSCI applies some firmware policy to control when it can be brought online. PSCI returns DENIED to a CPU_ON request if this is not currently permitted. The OS can learn the current policy from the _STA enabled bit. Handle the PSCI DENIED return code gracefully instead of printing an error. See https://developer.arm.com/documentation/den0022/f/?lang=en page 58. Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> [ morse: Rewrote commit message ] 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> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> --- v5: No change --- arch/arm64/kernel/psci.c | 2 +- arch/arm64/kernel/smp.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c index 29a8e444db83..fabd732d0a2d 100644 --- a/arch/arm64/kernel/psci.c +++ b/arch/arm64/kernel/psci.c @@ -40,7 +40,7 @@ static int cpu_psci_cpu_boot(unsigned int cpu) { phys_addr_t pa_secondary_entry = __pa_symbol(secondary_entry); int err = psci_ops.cpu_on(cpu_logical_map(cpu), pa_secondary_entry); - if (err) + if (err && err != -EPERM) pr_err("failed to boot CPU%d (%d)\n", cpu, err); return err; diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 4ced34f62dab..dc0e0b3ec2d4 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -132,7 +132,8 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle) /* Now bring the CPU into our world */ ret = boot_secondary(cpu, idle); if (ret) { - pr_err("CPU%u: failed to boot: %d\n", cpu, ret); + if (ret != -EPERM) + pr_err("CPU%u: failed to boot: %d\n", cpu, ret); return ret; } -- 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:44 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 ` [PATCH v5 09/18] ACPI: Check _STA present bit before making CPUs not present Jonathan Cameron 2024-04-12 14:37 ` 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 ` Jonathan Cameron [this message] 2024-04-12 14:37 ` [PATCH v5 14/18] arm64: psci: Ignore DENIED CPUs 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-15-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.