Commit b90da76b authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley

[PATCH] [11/18] qla2xxx: Misc. fixes

  Small fixes:

  o Remove incorrect and unused ISP2100 #define
    SS_RESIDUAL_LEN_VALID.

  o Fix problem where an incorrect status would be returned
    for qla2x00_configure_fabric() if the driver was unable to
    log into a fabric's SNS.

  o Check for the additional WAIT_FOR_AL_PA state in
    qla2x00_fw_ready() since switch vendors may push NOS/OLS
    primitives during a 'port disabled' state.
Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 5f4fde24
...@@ -1303,8 +1303,7 @@ typedef struct { ...@@ -1303,8 +1303,7 @@ typedef struct {
#define SS_RESIDUAL_UNDER BIT_11 #define SS_RESIDUAL_UNDER BIT_11
#define SS_RESIDUAL_OVER BIT_10 #define SS_RESIDUAL_OVER BIT_10
#define SS_SENSE_LEN_VALID BIT_9 #define SS_SENSE_LEN_VALID BIT_9
#define SS_RESIDUAL_LEN_VALID BIT_8 /* ISP2100 only */ #define SS_RESPONSE_INFO_LEN_VALID BIT_8
#define SS_RESPONSE_INFO_LEN_VALID BIT_8 /* ISP2200 and 23xx */
#define SS_RESERVE_CONFLICT (BIT_4 | BIT_3) #define SS_RESERVE_CONFLICT (BIT_4 | BIT_3)
#define SS_BUSY_CONDITION BIT_3 #define SS_BUSY_CONDITION BIT_3
......
...@@ -941,7 +941,8 @@ qla2x00_fw_ready(scsi_qla_host_t *ha) ...@@ -941,7 +941,8 @@ qla2x00_fw_ready(scsi_qla_host_t *ha)
rval = QLA_FUNCTION_FAILED; rval = QLA_FUNCTION_FAILED;
if (atomic_read(&ha->loop_down_timer) && if (atomic_read(&ha->loop_down_timer) &&
fw_state >= FSTATE_LOSS_OF_SYNC) { (fw_state >= FSTATE_LOSS_OF_SYNC ||
fw_state == FSTATE_WAIT_AL_PA)) {
/* Loop down. Timeout on min_wait for states /* Loop down. Timeout on min_wait for states
* other than Wait for Login. * other than Wait for Login.
*/ */
...@@ -2339,11 +2340,11 @@ qla2x00_configure_fabric(scsi_qla_host_t *ha) ...@@ -2339,11 +2340,11 @@ qla2x00_configure_fabric(scsi_qla_host_t *ha)
qla2x00_login_fabric(ha, SIMPLE_NAME_SERVER, 0xff, 0xff, 0xfc, qla2x00_login_fabric(ha, SIMPLE_NAME_SERVER, 0xff, 0xff, 0xfc,
mb, BIT_1 | BIT_0); mb, BIT_1 | BIT_0);
if (mb[0] != MBS_COMMAND_COMPLETE) { if (mb[0] != MBS_COMMAND_COMPLETE) {
qla_printk(KERN_INFO, ha, DEBUG2(qla_printk(KERN_INFO, ha,
"Failed SNS login: loop_id=%x mb[0]=%x mb[1]=%x " "Failed SNS login: loop_id=%x mb[0]=%x mb[1]=%x "
"mb[2]=%x mb[6]=%x mb[7]=%x\n", SIMPLE_NAME_SERVER, "mb[2]=%x mb[6]=%x mb[7]=%x\n", SIMPLE_NAME_SERVER,
mb[0], mb[1], mb[2], mb[6], mb[7]); mb[0], mb[1], mb[2], mb[6], mb[7]));
return (QLA_FUNCTION_FAILED); return (QLA_SUCCESS);
} }
if (test_and_clear_bit(REGISTER_FC4_NEEDED, &ha->dpc_flags)) { if (test_and_clear_bit(REGISTER_FC4_NEEDED, &ha->dpc_flags)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment