From 56a4b491f74f5dcdf10a9023fed3efebb55f7ab7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 23 Sep 2015 14:54:34 -0700 Subject: [PATCH] 4.2-stable patches added patches: cxl-don-t-remove-afus-vphbs-in-cxl_reset.patch --- ...don-t-remove-afus-vphbs-in-cxl_reset.patch | 40 +++++++++++++++++++ queue-4.2/series | 1 + 2 files changed, 41 insertions(+) create mode 100644 queue-4.2/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 index 00000000000..0cbe0ee5021 --- /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 +Date: Fri, 14 Aug 2015 17:41:24 +1000 +Subject: cxl: Don't remove AFUs/vPHBs in cxl_reset + +From: Daniel Axtens + +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 +Signed-off-by: Daniel Axtens +Signed-off-by: Michael Ellerman +Signed-off-by: Greg Kroah-Hartman + +--- + 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 4a430b8dd8e..5c0d7a2e4c8 100644 --- 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 -- 2.47.2