diff mbox

mpt3sas: Fix panic when aer correct error occured

Message ID 5ff4138de974ecb0307f283402235e5d@mail.gmail.com (mailing list archive)
State Accepted, archived
Headers show

Commit Message

Chaitra P B July 14, 2016, 10:49 a.m. UTC 
Hi,
 Please consider this patch as Acked-by: Chaitra P B
<chaitra.basappa@broadcom.com>

Thanks,
 Chaitra

-----Original Message-----
From: Kefeng Wang [mailto:wangkefeng.wang@huawei.com]
Sent: Tuesday, July 12, 2016 3:13 PM
To: martin.petersen@oracle.com; suganath-prabu.subramani@broadcom.com;
MPT-FusionLinux.pdl@broadcom.com
Cc: linux-scsi@vger.kernel.org; linux-kernel@vger.kernel.org;
guohanjun@huawei.com; Kefeng Wang; Sathya Prakash; Chaitra P B
Subject: [PATCH] mpt3sas: Fix panic when aer correct error occured

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>
---

NOTE: I found this with an earlier kernel version, but the logic is not
changed.

 drivers/scsi/mpt3sas/mpt3sas_scsih.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--
1.7.12.4
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 6bff13e..eedd62e3 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -9033,8 +9033,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, not need to reset slot.
+	 */
+	return PCI_ERS_RESULT_RECOVERED;
 }

 /*