Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 331298e7 authored by Will Deacon's avatar Will Deacon Committed by Greg Kroah-Hartman
Browse files

arm64: psci: Avoid printing in cpu_psci_cpu_die() 

[ Upstream commit 891deb87585017d526b67b59c15d38755b900fea ]

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: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2e22375d

arch/arm64/kernel/psci.c

+1 −4
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ static int cpu_psci_cpu_disable(unsigned int cpu) 


static void cpu_psci_cpu_die(unsigned int cpu)

{

	int ret;

	/*

	 * There are no known implementations of PSCI actually using the

	 * power state field, pass a sensible default for now.
@@ -77,9 +76,7 @@ static void cpu_psci_cpu_die(unsigned int cpu) 
	u32 state = PSCI_POWER_STATE_TYPE_POWER_DOWN <<

		    PSCI_0_2_POWER_STATE_TYPE_SHIFT;



	ret = psci_ops.cpu_off(state);



	pr_crit("unable to power off CPU%u (%d)\n", cpu, ret);

	psci_ops.cpu_off(state);

}



static int cpu_psci_cpu_kill(unsigned int cpu)