From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chaitra Basappa Subject: RE: [PATCH] mpt3sas: Fix panic when aer correct error occured Date: Thu, 14 Jul 2016 16:19:02 +0530 Message-ID: <5ff4138de974ecb0307f283402235e5d@mail.gmail.com> References: <1468316605-788-1-git-send-email-wangkefeng.wang@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: In-Reply-To: <1468316605-788-1-git-send-email-wangkefeng.wang@huawei.com> Sender: linux-kernel-owner@vger.kernel.org To: Kefeng Wang , martin.petersen@oracle.com, Suganath Prabu Subramani , PDL-MPT-FUSIONLINUX Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, guohanjun@huawei.com, Sathya Prakash Veerichetty List-Id: linux-scsi@vger.kernel.org Hi, Please consider this patch as Acked-by: Chaitra P B 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 Cc: Chaitra P B Cc: Suganath Prabu Subramani Signed-off-by: Kefeng Wang --- 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(-) 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; } /* -- 1.7.12.4