Commit 643e12da authored by Jean-Philippe Brucker's avatar Jean-Philippe Brucker Committed by Catalin Marinas

arm64: psci: Ignore DENIED CPUs

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.

Note the alternatives to the PSCI cpu_boot() callback do not
return -EPERM so the change in smp.c has no affect.

See https://developer.arm.com/documentation/den0022/f/?lang=en page 58.
Signed-off-by: default avatarJean-Philippe Brucker <jean-philippe@linaro.org>
[ morse: Rewrote commit message ]
Signed-off-by: default avatarJames Morse <james.morse@arm.com>
Tested-by: default avatarMiguel Luis <miguel.luis@oracle.com>
Tested-by: default avatarVishnu Pajjuri <vishnu@os.amperecomputing.com>
Tested-by: default avatarJianyong Wu <jianyong.wu@arm.com>
Reviewed-by: default avatarGavin Shan <gshan@redhat.com>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/20240529133446.28446-16-Jonathan.Cameron@huawei.comSigned-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent d633da5d
...@@ -40,7 +40,7 @@ static int cpu_psci_cpu_boot(unsigned int cpu) ...@@ -40,7 +40,7 @@ static int cpu_psci_cpu_boot(unsigned int cpu)
{ {
phys_addr_t pa_secondary_entry = __pa_symbol(secondary_entry); phys_addr_t pa_secondary_entry = __pa_symbol(secondary_entry);
int err = psci_ops.cpu_on(cpu_logical_map(cpu), pa_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); pr_err("failed to boot CPU%d (%d)\n", cpu, err);
return err; return err;
......
...@@ -132,7 +132,8 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle) ...@@ -132,7 +132,8 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle)
/* Now bring the CPU into our world */ /* Now bring the CPU into our world */
ret = boot_secondary(cpu, idle); ret = boot_secondary(cpu, idle);
if (ret) { 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; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment