diff options
| author | Saurav Kashyap <saurav.kashyap@qlogic.com> | 2012-08-22 20:21:15 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-09-24 10:10:50 +0200 |
| commit | 711aa7f722821405125b2a3c6a3e6a3f275952bd (patch) | |
| tree | 5c86c39e2d8a338c025ad2209851c7e78ef4b9c2 /drivers/scsi/qla2xxx | |
| parent | [SCSI] qla2xxx: Wrong PCIe(2.5Gb/s x8) speed in the kerenel message for ISP82xx. (diff) | |
| download | linux-711aa7f722821405125b2a3c6a3e6a3f275952bd.tar.xz linux-711aa7f722821405125b2a3c6a3e6a3f275952bd.zip | |
[SCSI] qla2xxx: Dont call nic restart firmware if it is already active and running.
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/qla2xxx')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 117338da6053..9b5e392a1e82 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -435,6 +435,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); @@ -486,6 +487,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: |