| From c54efa63e0bcd19408b41777ff3cb980cb7f8595 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 6 Nov 2020 09:57:55 +0000 |
| Subject: arm64: psci: Avoid printing in cpu_psci_cpu_die() |
| |
| From: Will Deacon <will@kernel.org> |
| |
| [ 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: Will Deacon <will@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm64/kernel/psci.c | 5 +---- |
| 1 file changed, 1 insertion(+), 4 deletions(-) |
| |
| diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c |
| index 3856d51c645b5..3ebb2a56e5f7b 100644 |
| --- a/arch/arm64/kernel/psci.c |
| +++ b/arch/arm64/kernel/psci.c |
| @@ -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) |
| -- |
| 2.27.0 |
| |