This is a note to let you know that I've just added the patch titled
cxl: Don't remove AFUs/vPHBs in cxl_reset
to the 4.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
cxl-don-t-remove-afus-vphbs-in-cxl_reset.patch
and it can be found in the queue-4.2 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 4e1efb403c1c016ae831bd9988a7d2e5e0af41a0 Mon Sep 17 00:00:00 2001
From: Daniel Axtens <dja@xxxxxxxxxx>
Date: Fri, 14 Aug 2015 17:41:24 +1000
Subject: cxl: Don't remove AFUs/vPHBs in cxl_reset
From: Daniel Axtens <dja@xxxxxxxxxx>
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@xxxxxxxxx>
Signed-off-by: Daniel Axtens <dja@xxxxxxxxxx>
Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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 */
Patches currently in stable-queue which might be from dja@xxxxxxxxxx are
queue-4.2/powerpc-eeh-probe-after-unbalanced-kref-check.patch
queue-4.2/cxl-remove-racy-attempt-to-force-eeh-invocation-in-reset.patch
queue-4.2/cxl-fix-unbalanced-pci_dev_get-in-cxl_probe.patch
queue-4.2/cxl-allow-release-of-contexts-which-have-been-opened-but-not-started.patch
queue-4.2/cxl-don-t-remove-afus-vphbs-in-cxl_reset.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html