From: Saurav Kashyap <saurav.kashyap@qlogic.com>
Date: Fri, 3 Sep 2010 22:20:57 +0000 (-0700)
Subject: [SCSI] qla2xxx: AER Support-Return recovered from mmio_enable function for 82XX.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bcc5b6d3233688a5179f445ef06a28e055c5873a;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

[SCSI] qla2xxx: AER Support-Return recovered from mmio_enable function for 82XX.

Return recovered from pci_mmio_enabled function if it is 82XX.

Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
---

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 2e10f2b2e017..bdd53f0ebef0 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -3803,6 +3803,9 @@ qla2xxx_pci_mmio_enabled(struct pci_dev *pdev)
 	struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
 	struct device_reg_24xx __iomem *reg24 = &ha->iobase->isp24;
 
+	if (IS_QLA82XX(ha))
+		return PCI_ERS_RESULT_RECOVERED;
+
 	spin_lock_irqsave(&ha->hardware_lock, flags);
 	if (IS_QLA2100(ha) || IS_QLA2200(ha)){
 		stat = RD_REG_DWORD(&reg->hccr);