From: Saurav Kashyap <saurav.kashyap@qlogic.com>
Date: Tue, 3 Jul 2012 18:13:58 +0000 (-0700)
Subject: qla2xxx: Dont call nic restart firmware if it is already active and running.
X-Git-Tag: v2.6.39-400.9.0~442
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c5326b2902856e025737c625add202cad8d0c6c0;p=users%2Fjedix%2Flinux-maple.git

qla2xxx: Dont call nic restart firmware if it is already active and running.

JIRA Key: V2632FC-230
---

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 7d020d619e93..5b22e488df23 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -431,6 +431,7 @@ qla83xx_nic_core_fw_load(scsi_qla_host_t *vha)
 	int rval = QLA_SUCCESS;
 	struct qla_hw_data *ha = vha->hw;
 	uint32_t idc_major_ver, idc_minor_ver;
+	uint16_t config[4];
 
 	qla83xx_idc_lock(vha, 0);
 
@@ -482,6 +483,13 @@ qla83xx_nic_core_fw_load(scsi_qla_host_t *vha)
 	idc_minor_ver |= (QLA83XX_SUPP_IDC_MINOR_VERSION << (ha->portnum * 2));
 	qla83xx_wr_reg(vha, QLA83XX_IDC_MINOR_VERSION, idc_minor_ver);
 
+	if (ha->flags.nic_core_reset_owner) {
+		memset(config, 0, sizeof(config));
+		if (!qla81xx_get_port_config(vha, config))
+			qla83xx_wr_reg(vha, QLA83XX_IDC_DEV_STATE,
+			    QLA8XXX_DEV_READY);
+	}
+
 	rval = qla83xx_idc_state_handler(vha);
 
 exit: