From: Joe Carnuccio <joe.carnuccio@qlogic.com>
Date: Tue, 4 Aug 2015 17:37:53 +0000 (-0400)
Subject: qla2xxx: Use ssdid to gate semaphore manipulation.
X-Git-Tag: v4.1.12-92~259^2~3^2~11
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=241695d73f11a8979bbf4e9f75d8f75c63f521b7;p=users%2Fjedix%2Flinux-maple.git

qla2xxx: Use ssdid to gate semaphore manipulation.

Orabug: 21946579

Execute qla25xx_manipulate_risc_semaphore() only for
ssdid 0x0175 and 0x0240.

Signed-off-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 8ff3e9851752..f731d4cde28c 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1272,14 +1272,14 @@ qla25xx_write_risc_sema_reg(scsi_qla_host_t *vha, uint32_t data)
 static void
 qla25xx_manipulate_risc_semaphore(scsi_qla_host_t *vha)
 {
-	struct qla_hw_data *ha = vha->hw;
 	uint32_t wd32 = 0;
 	uint delta_msec = 100;
 	uint elapsed_msec = 0;
 	uint timeout_msec;
 	ulong n;
 
-	if (!IS_QLA25XX(ha) && !IS_QLA2031(ha))
+	if (vha->hw->pdev->subsystem_device != 0x0175 &&
+	    vha->hw->pdev->subsystem_device != 0x0240)
 		return;
 
 attempt: