From: Mike Hernandez <michael.hernandez@qlogic.com>
Date: Fri, 2 Dec 2011 06:42:07 +0000 (-0800)
Subject: qla4xxx: Fix CPU lockups when ql4xdontresethba set
X-Git-Tag: v2.6.39-400.9.0~695
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c3b026bd68b984351f455c2f581b5d52561201d1;p=users%2Fjedix%2Flinux-maple.git

qla4xxx: Fix CPU lockups when ql4xdontresethba set

Fix issue where CPU lockup is seen when ql4xdontresethba is set and
driver is "stuck" in NEED_RESET state handler.

Jira Key: IUEKR2ISCSI-2

Signed-off-by: Mike Hernandez <michael.hernandez@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Signed-off-by: Tej Parkash <tej.parkash@qlogic.com>
Signed-off-by: Chuck Anderson <chuck.anderson@oracle.com>
---

diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c
index f484ff438199..7fc29c6ff57e 100644
--- a/drivers/scsi/qla4xxx/ql4_nx.c
+++ b/drivers/scsi/qla4xxx/ql4_nx.c
@@ -1836,6 +1836,10 @@ int qla4_8xxx_device_state_handler(struct scsi_qla_host *ha)
 				 * reset handler */
 				dev_init_timeout = jiffies +
 					(ha->nx_dev_init_timeout * HZ);
+			} else {
+				qla4_8xxx_idc_unlock(ha);
+				msleep(1000);
+				qla4_8xxx_idc_lock(ha);
 			}
 			qla4_8xxx_idc_unlock(ha);
 			break;