4.2-stable patches

added patches:
	cxl-don-t-remove-afus-vphbs-in-cxl_reset.patch

diff --git a/queue-4.2/cxl-don-t-remove-afus-vphbs-in-cxl_reset.patch b/queue-4.2/cxl-don-t-remove-afus-vphbs-in-cxl_reset.patch
new file mode 100644 (file)
index 0000000..0cbe0ee
--- /dev/null
+++ b/queue-4.2/cxl-don-t-remove-afus-vphbs-in-cxl_reset.patch
@@ -0,0 +1,40 @@
+From 4e1efb403c1c016ae831bd9988a7d2e5e0af41a0 Mon Sep 17 00:00:00 2001
+From: Daniel Axtens <dja@axtens.net>
+Date: Fri, 14 Aug 2015 17:41:24 +1000
+Subject: cxl: Don't remove AFUs/vPHBs in cxl_reset
+
+From: Daniel Axtens <dja@axtens.net>
+
+commit 4e1efb403c1c016ae831bd9988a7d2e5e0af41a0 upstream.
+
+If the driver doesn't participate in EEH, the AFUs will be removed
+by cxl_remove, which will be invoked by EEH.
+
+If the driver does particpate in EEH, the vPHB needs to stick around
+so that the it can particpate.
+
+In both cases, we shouldn't remove the AFU/vPHB.
+
+Reviewed-by: Cyril Bur <cyrilbur@gmail.com>
+Signed-off-by: Daniel Axtens <dja@axtens.net>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/misc/cxl/pci.c |    5 -----
+ 1 file changed, 5 deletions(-)
+
+--- a/drivers/misc/cxl/pci.c
++++ b/drivers/misc/cxl/pci.c
+@@ -854,11 +854,6 @@ int cxl_reset(struct cxl *adapter)
+ 
+       dev_info(&dev->dev, "CXL reset\n");
+ 
+-      for (i = 0; i < adapter->slices; i++) {
+-              cxl_pci_vphb_remove(adapter->afu[i]);
+-              cxl_remove_afu(adapter->afu[i]);
+-      }
+-
+       /* pcie_warm_reset requests a fundamental pci reset which includes a
+        * PERST assert/deassert.  PERST triggers a loading of the image
+        * if "user" or "factory" is selected in sysfs */

diff --git a/queue-4.2/series b/queue-4.2/series
index 4a430b8dd8edb2b94b2da1b9c0523458e1346755..5c0d7a2e4c825b95b0fcaa92492520e955e5a346 100644 (file)
--- a/queue-4.2/series
+++ b/queue-4.2/series
@@ -63,3 +63,4 @@ mm-check-if-section-present-during-memory-block-registering.patch
 x86-mm-initialize-pmd_idx-in-page_table_range_init_count.patch
 drm-i915-don-t-use-link_bw-for-pll-setup.patch
 i915-set-ddi_pll_sel-in-dp-mst-path.patch
+cxl-don-t-remove-afus-vphbs-in-cxl_reset.patch