scsi: qla2xxx: Add fix to read correct register value for ISP82xx.

Sawan Chandak · martinkpetersen · commit bf6061b17a8d · 2017-04-07T17:07:15.000-04:00
Add fix to read correct register value for ISP82xx, during check for register disconnect.ISP82xx has different base register. Fixes: a465537 ("qla2xxx: Disable the adapter and skip error recovery in case of register disconnect") Signed-off-by: Sawan Chandak <sawan.chandak@cavium.com> Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com> Cc: <stable@vger.kernel.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
@@ -1126,8 +1126,13 @@ static inline
 uint32_t qla2x00_isp_reg_stat(struct qla_hw_data *ha)
 {
 	struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
+	struct device_reg_82xx __iomem *reg82 = &ha->iobase->isp82;
 
-	return ((RD_REG_DWORD(&reg->host_status)) == ISP_REG_DISCONNECT);
+	if (IS_P3P_TYPE(ha))
+		return ((RD_REG_DWORD(&reg82->host_int)) == ISP_REG_DISCONNECT);
+	else
+		return ((RD_REG_DWORD(&reg->host_status)) ==
+			ISP_REG_DISCONNECT);
 }
 
 /**************************************************************************

Original file line number	Diff line number	Diff line change
`@@ -1126,8 +1126,13 @@ static inline`
`1126`	`1126`	`uint32_t qla2x00_isp_reg_stat(struct qla_hw_data *ha)`
`1127`	`1127`	`{`
`1128`	`1128`	`struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;`
	`1129`	`+ struct device_reg_82xx __iomem *reg82 = &ha->iobase->isp82;`
`1129`	`1130`
`1130`		`- return ((RD_REG_DWORD(&reg->host_status)) == ISP_REG_DISCONNECT);`
	`1131`	`+ if (IS_P3P_TYPE(ha))`
	`1132`	`+ return ((RD_REG_DWORD(&reg82->host_int)) == ISP_REG_DISCONNECT);`
	`1133`	`+ else`
	`1134`	`+ return ((RD_REG_DWORD(&reg->host_status)) ==`
	`1135`	`+ ISP_REG_DISCONNECT);`
`1131`	`1136`	`}`
`1132`	`1137`
`1133`	`1138`	`/**************************************************************************`