diff options
| author | Armen Baloyan | 2014-02-26 10:14:57 +0100 |
|---|---|---|
| committer | James Bottomley | 2014-03-15 18:17:48 +0100 |
| commit | 0f8cdff567357fe7280963bc90e17e97dad995cd (patch) | |
| tree | d966702e41ba90c8667149fe3246a48b4d908c83 /drivers/scsi | |
| parent | [SCSI] qla2xxx: Add mutex around optrom calls to serialize accesses. (diff) | |
| download | kernel-qcow2-linux-0f8cdff567357fe7280963bc90e17e97dad995cd.tar.gz kernel-qcow2-linux-0f8cdff567357fe7280963bc90e17e97dad995cd.tar.xz kernel-qcow2-linux-0f8cdff567357fe7280963bc90e17e97dad995cd.zip | |
[SCSI] qla2xxx: Add handling for boot indication progress AENs for ISPFX00.
Signed-off-by: Armen Baloyan <armen.baloyan@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_def.h | 2 | ||||
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_mr.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index 7c69729d832a..4c286eb3d45f 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h @@ -808,7 +808,7 @@ struct mbx_cmd_32 { Notification */ #define MBA_FW_POLL_STATE 0x8600 /* Firmware in poll diagnostic state */ #define MBA_FW_RESET_FCT 0x8502 /* Firmware reset factory defaults */ - +#define MBA_FW_INIT_INPROGRESS 0x8500 /* Firmware boot in progress */ /* 83XX FCoE specific */ #define MBA_IDC_AEN 0x8200 /* FCoE: NIC Core state change AEN */ diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c index ba6f8b139c98..6ca4807ffb92 100644 --- a/drivers/scsi/qla2xxx/qla_mr.c +++ b/drivers/scsi/qla2xxx/qla_mr.c @@ -997,6 +997,9 @@ qlafx00_init_fw_ready(scsi_qla_host_t *vha) break; default: + if ((aenmbx & 0xFF00) == MBA_FW_INIT_INPROGRESS) + break; + /* If fw is apparently not ready. In order to continue, * we might need to issue Mbox cmd, but the problem is * that the DoorBell vector values that come with the |