diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-03 10:16:18 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-03 10:16:18 -0400 |
| commit | 9034fe9c78901f2cd56cdfc83372010bc9d4c408 (patch) | |
| tree | a43d85c76b917f75b0838448f15fe9e7bd7bac51 | |
| parent | f164477cdaccbde5c82f52f77e13444a120357bb (diff) | |
| download | longterm-queue-4.12-9034fe9c78901f2cd56cdfc83372010bc9d4c408.tar.gz | |
powerpc: drop patch relying on spin_* not in 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/powerpc-xmon-Avoid-tripping-SMP-hardlockup-watchdog.patch | 75 | ||||
| -rw-r--r-- | queue/series | 2 |
2 files changed, 0 insertions, 77 deletions
diff --git a/queue/powerpc-xmon-Avoid-tripping-SMP-hardlockup-watchdog.patch b/queue/powerpc-xmon-Avoid-tripping-SMP-hardlockup-watchdog.patch deleted file mode 100644 index c31f7b8..0000000 --- a/queue/powerpc-xmon-Avoid-tripping-SMP-hardlockup-watchdog.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 9138ef40fc5b2bb44cefbbda94e28a439b39ad71 Mon Sep 17 00:00:00 2001 -From: Nicholas Piggin <npiggin@gmail.com> -Date: Fri, 29 Sep 2017 13:29:40 +1000 -Subject: [PATCH] powerpc/xmon: Avoid tripping SMP hardlockup watchdog - -commit 064996d62a33ffe10264b5af5dca92d54f60f806 upstream. - -The SMP hardlockup watchdog cross-checks other CPUs for lockups, which -causes xmon headaches because it's assuming interrupts hard disabled -means no watchdog troubles. Try to improve that by calling -touch_nmi_watchdog() in obvious places where secondaries are spinning. - -Also annotate these spin loops with spin_begin/end calls. - -Signed-off-by: Nicholas Piggin <npiggin@gmail.com> -Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> -Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> - -diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c -index 8af45876b95c..69c4ea18202c 100644 ---- a/arch/powerpc/xmon/xmon.c -+++ b/arch/powerpc/xmon/xmon.c -@@ -524,14 +524,19 @@ static int xmon_core(struct pt_regs *regs, int fromipi) - - waiting: - secondary = 1; -+ spin_begin(); - while (secondary && !xmon_gate) { - if (in_xmon == 0) { -- if (fromipi) -+ if (fromipi) { -+ spin_end(); - goto leave; -+ } - secondary = test_and_set_bit(0, &in_xmon); - } -- barrier(); -+ spin_cpu_relax(); -+ touch_nmi_watchdog(); - } -+ spin_end(); - - if (!secondary && !xmon_gate) { - /* we are the first cpu to come in */ -@@ -562,21 +567,25 @@ static int xmon_core(struct pt_regs *regs, int fromipi) - mb(); - xmon_gate = 1; - barrier(); -+ touch_nmi_watchdog(); - } - - cmdloop: - while (in_xmon) { - if (secondary) { -+ spin_begin(); - if (cpu == xmon_owner) { - if (!test_and_set_bit(0, &xmon_taken)) { - secondary = 0; -+ spin_end(); - continue; - } - /* missed it */ - while (cpu == xmon_owner) -- barrier(); -+ spin_cpu_relax(); - } -- barrier(); -+ spin_cpu_relax(); -+ touch_nmi_watchdog(); - } else { - cmd = cmds(regs); - if (cmd != 0) { --- -2.15.0 - diff --git a/queue/series b/queue/series index c6c645d..4f3a522 100644 --- a/queue/series +++ b/queue/series @@ -26,7 +26,6 @@ Bluetooth-BT_HCIUART-now-depends-on-SERIAL_DEV_BUS.patch 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 ASoC-codecs-msm8916-wcd-analog-fix-module-autoload.patch fm10k-fix-mis-ordered-parameters-in-declaration-for-.patch scsi-lpfc-Fix-secure-firmware-updates.patch @@ -71,7 +70,6 @@ powerpc-perf-Dereference-BHRB-entries-safely.patch drm-i915-Flush-pending-GTT-writes-before-unbinding.patch drm-sun4i-Fix-error-path-handling.patch libnvdimm-dax-fix-1GB-aligned-namespaces-vs-physical.patch -libnvdimm-btt-Fix-an-incompatibility-in-the-log-layo.patch libnvdimm-pfn-fix-start_pad-handling-for-aligned-nam.patch net-add-rb_to_skb-and-other-rb-tree-helpers.patch tcp-free-batches-of-packets-in-tcp_prune_ofo_queue.patch |