s390/pci: Do not try re-enabling load/store if device is disabled

If a device is disabled unblocking load/store on its own is not useful
as a full re-enable of the function is necessary anyway. Note that SCLP
Write Event Data Action Qualifier 0 (Reset) leaves the device disabled
and triggers this case unless the driver already requests a reset.

Cc: stable@vger.kernel.org
Fixes: 4cdf2f4e24ff ("s390/pci: implement minimal PCI error recovery")
Reviewed-by: Farhan Ali <alifm@linux.ibm.com>
Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>

diff --git a/arch/s390/pci/pci_event.c b/arch/s390/pci/pci_event.c
index 82ee2578279a114e6bbd199c6753ef82c575a5af..6c8922ad70f340f717847a397be795ab16f42831 100644 (file)
--- a/arch/s390/pci/pci_event.c
+++ b/arch/s390/pci/pci_event.c
@@ -106,6 +106,10 @@ static pci_ers_result_t zpci_event_do_error_state_clear(struct pci_dev *pdev,
        struct zpci_dev *zdev = to_zpci(pdev);
        int rc;
 
+       /* The underlying device may have been disabled by the event */
+       if (!zdev_enabled(zdev))
+               return PCI_ERS_RESULT_NEED_RESET;
+
        pr_info("%s: Unblocking device access for examination\n", pci_name(pdev));
        rc = zpci_reset_load_store_blocked(zdev);
        if (rc) {