diff options
| author | Daniel Axtens <dja@axtens.net> | 2015-08-14 17:41:24 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-09-29 19:33:26 +0200 |
| commit | acf549cbe68802cfd3864453bd9561c80ee5baf9 (patch) | |
| tree | 05b4d41aeb98c78349795d8ab97101842a638023 | |
| parent | 7a195e608722ed0d38db9f1140aa048ca731a0b9 (diff) | |
| download | lwn-acf549cbe68802cfd3864453bd9561c80ee5baf9.tar.gz lwn-acf549cbe68802cfd3864453bd9561c80ee5baf9.zip | |
cxl: Don't remove AFUs/vPHBs in cxl_reset
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>
| -rw-r--r-- | drivers/misc/cxl/pci.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c index b96b3f46ec78..dc836071c633 100644 --- 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 */ |