Skip to content

Commit 643e12d

Browse files
jpbruckerctmarinas
authored andcommitted
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: Jean-Philippe Brucker <[email protected]> [ morse: Rewrote commit message ] Signed-off-by: James Morse <[email protected]> Tested-by: Miguel Luis <[email protected]> Tested-by: Vishnu Pajjuri <[email protected]> Tested-by: Jianyong Wu <[email protected]> Reviewed-by: Gavin Shan <[email protected]> Signed-off-by: Russell King (Oracle) <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]> Reviewed-by: Jonathan Cameron <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Catalin Marinas <[email protected]>
1 parent d633da5 commit 643e12d

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

arch/arm64/kernel/psci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static int cpu_psci_cpu_boot(unsigned int cpu)
4040
{
4141
phys_addr_t pa_secondary_entry = __pa_symbol(secondary_entry);
4242
int err = psci_ops.cpu_on(cpu_logical_map(cpu), pa_secondary_entry);
43-
if (err)
43+
if (err && err != -EPERM)
4444
pr_err("failed to boot CPU%d (%d)\n", cpu, err);
4545

4646
return err;

arch/arm64/kernel/smp.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,8 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle)
132132
/* Now bring the CPU into our world */
133133
ret = boot_secondary(cpu, idle);
134134
if (ret) {
135-
pr_err("CPU%u: failed to boot: %d\n", cpu, ret);
135+
if (ret != -EPERM)
136+
pr_err("CPU%u: failed to boot: %d\n", cpu, ret);
136137
return ret;
137138
}
138139

0 commit comments

Comments
 (0)