diff options
| author | Andrew Vasquez <andrew.vasquez@qlogic.com> | 2009-03-24 19:08:00 +0300 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-04-03 18:22:45 +0400 |
| commit | dda772e8e3b9832d3368f84df3a3b7ec7dfbd9f0 (patch) | |
| tree | e07e620bd47677918a0aa703193b89f04d5ed269 | |
| parent | 6315a5f810d8cf622ac9b28ace565fb2d1add911 (diff) | |
| download | linux-dda772e8e3b9832d3368f84df3a3b7ec7dfbd9f0.tar.xz | |
[SCSI] qla2xxx: Always (re)read firmware version/capabilities information.
With recent ISPs loading firmware from flash, a flash-update to
the firmware-image region with a follow-on reset will reload the
new image.
Original caching of data only made sense when firmware was bound
with the driver.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 1d28b5335648..a8a0f138bc26 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -963,6 +963,7 @@ qla2x00_setup_chip(scsi_qla_host_t *vha) struct qla_hw_data *ha = vha->hw; struct device_reg_2xxx __iomem *reg = &ha->iobase->isp; unsigned long flags; + uint16_t fw_major_version; if (!IS_FWI2_CAPABLE(ha) && !IS_QLA2100(ha) && !IS_QLA2200(ha)) { /* Disable SRAM, Instruction RAM and GP RAM parity. */ @@ -986,7 +987,8 @@ qla2x00_setup_chip(scsi_qla_host_t *vha) rval = qla2x00_execute_fw(vha, srisc_address); /* Retrieve firmware information. */ - if (rval == QLA_SUCCESS && ha->fw_major_version == 0) { + if (rval == QLA_SUCCESS) { + fw_major_version = ha->fw_major_version; qla2x00_get_fw_version(vha, &ha->fw_major_version, &ha->fw_minor_version, @@ -1003,10 +1005,11 @@ qla2x00_setup_chip(scsi_qla_host_t *vha) ha->max_npiv_vports = MIN_MULTI_ID_FABRIC - 1; } - qla2x00_resize_request_q(vha); - - if (ql2xallocfwdump) - qla2x00_alloc_fw_dump(vha); + if (!fw_major_version) { + qla2x00_resize_request_q(vha); + if (ql2xallocfwdump) + qla2x00_alloc_fw_dump(vha); + } } } else { DEBUG2(printk(KERN_INFO |