diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-01 16:20:15 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-01 16:20:15 -0400 |
| commit | 1853f15d39ee934acb3fc5b5e55d822ddc6822f6 (patch) | |
| tree | b664ea57424d41791e8bd5ecc60476fdb16a3e72 | |
| parent | a23d387b767d5a363a8f7b0d86fcb4e2e76b1fa2 (diff) | |
| download | longterm-queue-4.12-1853f15d39ee934acb3fc5b5e55d822ddc6822f6.tar.gz | |
ppc: drop wdt patch; no source file in 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/powerpc-watchdog-Do-not-trigger-SMP-crash-from-touch.patch | 42 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 43 deletions
diff --git a/queue/powerpc-watchdog-Do-not-trigger-SMP-crash-from-touch.patch b/queue/powerpc-watchdog-Do-not-trigger-SMP-crash-from-touch.patch deleted file mode 100644 index 32e3fd4..0000000 --- a/queue/powerpc-watchdog-Do-not-trigger-SMP-crash-from-touch.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 80e4d70b06863e0104e5a0dc78aa3710297fbd4b Mon Sep 17 00:00:00 2001 -From: Nicholas Piggin <npiggin@gmail.com> -Date: Fri, 29 Sep 2017 13:29:39 +1000 -Subject: [PATCH] powerpc/watchdog: Do not trigger SMP crash from - touch_nmi_watchdog - -commit 80e4d70b06863e0104e5a0dc78aa3710297fbd4b upstream. - -In xmon, touch_nmi_watchdog() is not expected to be checking that -other CPUs have not touched the watchdog, so the code will just call -touch_nmi_watchdog() once before re-enabling hard interrupts. - -Just update our CPU's state, and ignore apparently stuck SMP threads. - -Arguably touch_nmi_watchdog should check for SMP lockups, and callers -should be fixed, but that's not trivial for the input code of xmon. - -Signed-off-by: Nicholas Piggin <npiggin@gmail.com> -Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> - -diff --git a/arch/powerpc/kernel/watchdog.c b/arch/powerpc/kernel/watchdog.c -index 920e61c79f47..1fb9379dc683 100644 ---- a/arch/powerpc/kernel/watchdog.c -+++ b/arch/powerpc/kernel/watchdog.c -@@ -277,9 +277,12 @@ void arch_touch_nmi_watchdog(void) - { - unsigned long ticks = tb_ticks_per_usec * wd_timer_period_ms * 1000; - int cpu = smp_processor_id(); -+ u64 tb = get_tb(); - -- if (get_tb() - per_cpu(wd_timer_tb, cpu) >= ticks) -- watchdog_timer_interrupt(cpu); -+ if (tb - per_cpu(wd_timer_tb, cpu) >= ticks) { -+ per_cpu(wd_timer_tb, cpu) = tb; -+ wd_smp_clear_cpu_pending(cpu, tb); -+ } - } - EXPORT_SYMBOL(arch_touch_nmi_watchdog); - --- -2.15.0 - diff --git a/queue/series b/queue/series index 5617b08..9318e45 100644 --- a/queue/series +++ b/queue/series @@ -25,7 +25,6 @@ PCI-AER-Report-non-fatal-errors-only-to-the-affected.patch tracing-Exclude-generic-fields-from-histograms.patch ASoC-img-parallel-out-Add-pm_runtime_get-put-to-set_.patch powerpc-xmon-Avoid-tripping-SMP-hardlockup-watchdog.patch -powerpc-watchdog-Do-not-trigger-SMP-crash-from-touch.patch sctp-silence-warns-on-sctp_stream_init-allocations.patch ASoC-codecs-msm8916-wcd-analog-fix-module-autoload.patch fm10k-fix-mis-ordered-parameters-in-declaration-for-.patch |