]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
mpt3sas: Fix panic when aer correct error occurred
authorKefeng Wang <wangkefeng.wang@huawei.com>
Tue, 12 Jul 2016 09:43:25 +0000 (17:43 +0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 15 Jul 2016 19:08:30 +0000 (15:08 -0400)
The _scsih_pci_mmio_enabled called if scsih_pci_error_detected returns
PCI_ERS_RESULT_CAN_RECOVER, at this point, read/write to the device
still works, no need to reset slot.

Or the mpt3sas_base_map_resources in scsih_pci_slot_reset will fail,
and iounamp ioc->chip, then we will meet issue when read ioc->chip
in mpt3sas_base_get_iocstate from _base_fault_reset_work.

Cc: Sathya Prakash <sathya.prakash@broadcom.com>
Cc: Chaitra P B <chaitra.basappa@broadcom.com>
Cc: Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Acked-by: Chaitra P B <chaitra.basappa@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/mpt3sas/mpt3sas_scsih.c

index cd6be7be0c5ba4445073a8cd5a28092ae44a075e..cd91a684c945a2c62e8c3626f6e1001c96935d35 100644 (file)
@@ -9035,8 +9035,11 @@ scsih_pci_mmio_enabled(struct pci_dev *pdev)
 
        /* TODO - dump whatever for debugging purposes */
 
-       /* Request a slot reset. */
-       return PCI_ERS_RESULT_NEED_RESET;
+       /* This called only if scsih_pci_error_detected returns
+        * PCI_ERS_RESULT_CAN_RECOVER. Read/write to the device still
+        * works, no need to reset slot.
+        */
+       return PCI_ERS_RESULT_RECOVERED;
 }
 
 /*