4.4-stable patches

added patches:
	powerpc-eeh-fix-deadlock-when-pe-frozen-state-can-t-be-cleared.patch

diff --git a/queue-4.4/powerpc-eeh-fix-deadlock-when-pe-frozen-state-can-t-be-cleared.patch b/queue-4.4/powerpc-eeh-fix-deadlock-when-pe-frozen-state-can-t-be-cleared.patch
new file mode 100644 (file)
index 0000000..f0f2b28
--- /dev/null
+++ b/queue-4.4/powerpc-eeh-fix-deadlock-when-pe-frozen-state-can-t-be-cleared.patch
@@ -0,0 +1,42 @@
+From 409bf7f8a02ef88db5a0f2cdcf9489914f4b8508 Mon Sep 17 00:00:00 2001
+From: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
+Date: Thu, 1 Dec 2016 11:23:05 +1100
+Subject: powerpc/eeh: Fix deadlock when PE frozen state can't be cleared
+
+From: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
+
+commit 409bf7f8a02ef88db5a0f2cdcf9489914f4b8508 upstream.
+
+In eeh_reset_device(), we take the pci_rescan_remove_lock immediately after
+after we call eeh_reset_pe() to reset the PCI controller. We then call
+eeh_clear_pe_frozen_state(), which can return an error. In this case, we
+bail out of eeh_reset_device() without calling pci_unlock_rescan_remove().
+
+Add a call to pci_unlock_rescan_remove() in the eeh_clear_pe_frozen_state()
+error path so that we don't cause a deadlock later on.
+
+Reported-by: Pradipta Ghosh <pradghos@in.ibm.com>
+Fixes: 78954700631f ("powerpc/eeh: Avoid I/O access during PE reset")
+Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
+Acked-by: Russell Currey <ruscur@russell.cc>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/powerpc/kernel/eeh_driver.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/arch/powerpc/kernel/eeh_driver.c
++++ b/arch/powerpc/kernel/eeh_driver.c
+@@ -612,8 +612,10 @@ static int eeh_reset_device(struct eeh_p
+ 
+       /* Clear frozen state */
+       rc = eeh_clear_pe_frozen_state(pe, false);
+-      if (rc)
++      if (rc) {
++              pci_unlock_rescan_remove();
+               return rc;
++      }
+ 
+       /* Give the system 5 seconds to finish running the user-space
+        * hotplug shutdown scripts, e.g. ifdown for ethernet.  Yes,

diff --git a/queue-4.4/series b/queue-4.4/series
new file mode 100644 (file)
index 0000000..39434de
--- /dev/null
+++ b/queue-4.4/series
@@ -0,0 +1 @@
+powerpc-eeh-fix-deadlock-when-pe-frozen-state-can-t-be-cleared.patch

diff --git a/queue-4.8/series b/queue-4.8/series
new file mode 100644 (file)
index 0000000..24550cc
--- /dev/null
+++ b/queue-4.8/series
@@ -0,0 +1,4 @@
+powerpc-eeh-fix-deadlock-when-pe-frozen-state-can-t-be-cleared.patch
+powerpc-mm-fix-lazy-icache-flush-on-pre-power5.patch
+powerpc-boot-fix-build-failure-in-32-bit-boot-wrapper.patch
+fuse-fix-clearing-suid-sgid-for-chown.patch