Re: [PATCH 1/2] qla2xxx: Add fix to read correct register value for ISP82xx.

[Martin K. Petersen]

Himanshu Madhani  writes:

> Add fix to read correct register value for ISP82xx, during check for
> register disconnect.ISP82xx has different base register.

Applied to 4.11/scsi-fixes.

-- 
Martin K. Petersen  Oracle Linux Engineering

[PATCH 1/2] qla2xxx: Add fix to read correct register value for ISP82xx.

[Himanshu Madhani]

From: Sawan Chandak 

Add fix to read correct register value for ISP82xx, during
check for register disconnect.ISP82xx has different base register.

Fixes: a465537ad1a4 ("qla2xxx: Disable the adapter and skip error recovery in 
case of register disconnect")
Signed-off-by: Sawan Chandak 
Signed-off-by: Himanshu Madhani 
Cc: 
---
 drivers/scsi/qla2xxx/qla_os.c | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 3e7011757c82..83d61d2142e9 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1160,8 +1160,13 @@ static inline
 uint32_t qla2x00_isp_reg_stat(struct qla_hw_data *ha)
 {
struct device_reg_24xx __iomem *reg = >iobase->isp24;
+   struct device_reg_82xx __iomem *reg82 = >iobase->isp82;
 
-   return ((RD_REG_DWORD(>host_status)) == ISP_REG_DISCONNECT);
+   if (IS_P3P_TYPE(ha))
+   return ((RD_REG_DWORD(>host_int)) == ISP_REG_DISCONNECT);
+   else
+   return ((RD_REG_DWORD(>host_status)) ==
+   ISP_REG_DISCONNECT);
 }
 
 /**
-- 
2.12.0