diff options
| author | Giridhar Malavali <giridhar.malavali@qlogic.com> | 2011-08-16 14:31:54 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2011-08-29 03:14:57 -0400 |
| commit | 3173167f015b779e549e1be04707316cce1b57f1 (patch) | |
| tree | 36c87222aaa7d50b75edfdff3ba7a4904b871e31 /drivers/scsi/qla2xxx/qla_init.c | |
| parent | b668ae37f10e5cefe65303150867e3fa2e631b93 (diff) | |
[SCSI] qla2xxx: Issue mailbox command only when firmware hung bit is reset for ISP82xx.
Signed-off-by: Giridhar Malavali <giridhar.malavali@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/qla_init.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 2375e38964e9..f03e915f1877 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c | |||
| @@ -1480,13 +1480,19 @@ qla2x00_setup_chip(scsi_qla_host_t *vha) | |||
| 1480 | if (rval == QLA_SUCCESS) { | 1480 | if (rval == QLA_SUCCESS) { |
| 1481 | enable_82xx_npiv: | 1481 | enable_82xx_npiv: |
| 1482 | fw_major_version = ha->fw_major_version; | 1482 | fw_major_version = ha->fw_major_version; |
| 1483 | rval = qla2x00_get_fw_version(vha, | 1483 | if (IS_QLA82XX(ha)) |
| 1484 | &ha->fw_major_version, | 1484 | qla82xx_check_md_needed(vha); |
| 1485 | &ha->fw_minor_version, | 1485 | else { |
| 1486 | &ha->fw_subminor_version, | 1486 | rval = qla2x00_get_fw_version(vha, |
| 1487 | &ha->fw_attributes, &ha->fw_memory_size, | 1487 | &ha->fw_major_version, |
| 1488 | ha->mpi_version, &ha->mpi_capabilities, | 1488 | &ha->fw_minor_version, |
| 1489 | ha->phy_version); | 1489 | &ha->fw_subminor_version, |
| 1490 | &ha->fw_attributes, | ||
| 1491 | &ha->fw_memory_size, | ||
| 1492 | ha->mpi_version, | ||
| 1493 | &ha->mpi_capabilities, | ||
| 1494 | ha->phy_version); | ||
| 1495 | } | ||
| 1490 | if (rval != QLA_SUCCESS) | 1496 | if (rval != QLA_SUCCESS) |
| 1491 | goto failed; | 1497 | goto failed; |
| 1492 | ha->flags.npiv_supported = 0; | 1498 | ha->flags.npiv_supported = 0; |
| @@ -5441,11 +5447,7 @@ qla82xx_restart_isp(scsi_qla_host_t *vha) | |||
| 5441 | clear_bit(ISP_ABORT_RETRY, &vha->dpc_flags); | 5447 | clear_bit(ISP_ABORT_RETRY, &vha->dpc_flags); |
| 5442 | 5448 | ||
| 5443 | /* Update the firmware version */ | 5449 | /* Update the firmware version */ |
| 5444 | qla2x00_get_fw_version(vha, &ha->fw_major_version, | 5450 | status = qla82xx_check_md_needed(vha); |
| 5445 | &ha->fw_minor_version, &ha->fw_subminor_version, | ||
| 5446 | &ha->fw_attributes, &ha->fw_memory_size, | ||
| 5447 | ha->mpi_version, &ha->mpi_capabilities, | ||
| 5448 | ha->phy_version); | ||
| 5449 | 5451 | ||
| 5450 | if (ha->fce) { | 5452 | if (ha->fce) { |
| 5451 | ha->flags.fce_enabled = 1; | 5453 | ha->flags.fce_enabled = 1; |