summaryrefslogtreecommitdiff
path: root/arch/powerpc
diff options
context:
space:
mode:
authorLaurent Dufour <ldufour@linux.ibm.com>2022-11-25 18:32:04 +0100
committerMichael Ellerman <mpe@ellerman.id.au>2022-12-07 20:30:09 +1100
commit9b574cfab7d4e68c67c4ee4fcde912ef54a25b88 (patch)
treecbd873252cf1d7061b14e25c02c5baad2d5fd6e6 /arch/powerpc
parent340a4a9f8773e102cc5ef531665970a686dfa245 (diff)
downloadlinux-rpi-9b574cfab7d4e68c67c4ee4fcde912ef54a25b88.tar.gz
linux-rpi-9b574cfab7d4e68c67c4ee4fcde912ef54a25b88.tar.bz2
linux-rpi-9b574cfab7d4e68c67c4ee4fcde912ef54a25b88.zip
powerpc/pseries: reset the RCU watchdogs after a LPM
The RCU watchdog timer should be reset when restarting the CPU after a Live Partition Mobility operation. Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com> Acked-by: Nicholas Piggin <npiggin@gmail.com> [mpe: Combine comments into a single comment block] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20221125173204.15329-1-ldufour@linux.ibm.com
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/platforms/pseries/mobility.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pseries/mobility.c b/arch/powerpc/platforms/pseries/mobility.c
index 634fac5db3f9..4cea71aa0f41 100644
--- a/arch/powerpc/platforms/pseries/mobility.c
+++ b/arch/powerpc/platforms/pseries/mobility.c
@@ -635,10 +635,13 @@ retry:
prod_others();
}
/*
- * Execution may have been suspended for several seconds, so
- * reset the watchdog.
+ * Execution may have been suspended for several seconds, so reset
+ * the watchdogs. touch_nmi_watchdog() also touches the soft lockup
+ * watchdog.
*/
+ rcu_cpu_stall_reset();
touch_nmi_watchdog();
+
return ret;
}