Skip to content

Commit 891deb8

Browse files
committed
arm64: psci: Avoid printing in cpu_psci_cpu_die()
cpu_psci_cpu_die() is called in the context of the dying CPU, which will no longer be online or tracked by RCU. It is therefore not generally safe to call printk() if the PSCI "cpu off" request fails, so remove the pr_crit() invocation. Cc: Qian Cai <cai@redhat.com> Cc: "Paul E. McKenney" <paulmck@kernel.org> Cc: Catalin Marinas <catalin.marinas@arm.com> Link: https://lore.kernel.org/r/20201106103602.9849-2-will@kernel.org Signed-off-by: Will Deacon <will@kernel.org>
1 parent 85f0b2f commit 891deb8

1 file changed

Lines changed: 1 addition & 4 deletions

File tree

arch/arm64/kernel/psci.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,14 @@ static int cpu_psci_cpu_disable(unsigned int cpu)
6666

6767
static void cpu_psci_cpu_die(unsigned int cpu)
6868
{
69-
int ret;
7069
/*
7170
* There are no known implementations of PSCI actually using the
7271
* power state field, pass a sensible default for now.
7372
*/
7473
u32 state = PSCI_POWER_STATE_TYPE_POWER_DOWN <<
7574
PSCI_0_2_POWER_STATE_TYPE_SHIFT;
7675

77-
ret = psci_ops.cpu_off(state);
78-
79-
pr_crit("unable to power off CPU%u (%d)\n", cpu, ret);
76+
psci_ops.cpu_off(state);
8077
}
8178

8279
static int cpu_psci_cpu_kill(unsigned int cpu)

0 commit comments

Comments
 (0)