aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorArmen Baloyan <armen.baloyan@qlogic.com>2014-02-26 04:14:57 -0500
committerJames Bottomley <JBottomley@Parallels.com>2014-03-15 13:17:48 -0400
commit0f8cdff567357fe7280963bc90e17e97dad995cd (patch)
treed966702e41ba90c8667149fe3246a48b4d908c83 /drivers/scsi
parent7a8ab9c840b5dff9bb70328338a86444ed1c2415 (diff)
[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.h2
-rw-r--r--drivers/scsi/qla2xxx/qla_mr.c3
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 {
808 Notification */ 808 Notification */
809#define MBA_FW_POLL_STATE 0x8600 /* Firmware in poll diagnostic state */ 809#define MBA_FW_POLL_STATE 0x8600 /* Firmware in poll diagnostic state */
810#define MBA_FW_RESET_FCT 0x8502 /* Firmware reset factory defaults */ 810#define MBA_FW_RESET_FCT 0x8502 /* Firmware reset factory defaults */
811 811#define MBA_FW_INIT_INPROGRESS 0x8500 /* Firmware boot in progress */
812/* 83XX FCoE specific */ 812/* 83XX FCoE specific */
813#define MBA_IDC_AEN 0x8200 /* FCoE: NIC Core state change AEN */ 813#define MBA_IDC_AEN 0x8200 /* FCoE: NIC Core state change AEN */
814 814
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)
997 break; 997 break;
998 998
999 default: 999 default:
1000 if ((aenmbx & 0xFF00) == MBA_FW_INIT_INPROGRESS)
1001 break;
1002
1000 /* If fw is apparently not ready. In order to continue, 1003 /* If fw is apparently not ready. In order to continue,
1001 * we might need to issue Mbox cmd, but the problem is 1004 * we might need to issue Mbox cmd, but the problem is
1002 * that the DoorBell vector values that come with the 1005 * that the DoorBell vector values that come with the