scsi: qla2xxx: Allow target mode to accept PRLI in dual mode

For Dual Mode, Initiator side of the driver finish login,
target side receive PRLI, but driver terminates PRLI.
This patch allows target side to go ahead and accept PRLI.

Signed-off-by: Quinn Tran <quinn.tran@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 4e6d3eb4caa4cea110051584bdf18228c5b3a3f2..34ee8c75565521854139d1227e12ba77780fa184 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1537,6 +1537,7 @@ qla24xx_handle_plogi_done_event(struct scsi_qla_host *vha, struct event_arg *ea)
        port_id_t cid;  /* conflict Nport id */
        u16 lid;
        struct fc_port *conflict_fcport;
+       unsigned long flags;
 
        switch (ea->data[0]) {
        case MBS_COMMAND_COMPLETE:
@@ -1557,10 +1558,14 @@ qla24xx_handle_plogi_done_event(struct scsi_qla_host *vha, struct event_arg *ea)
                            ea->fcport->loop_id, ea->fcport->d_id.b24);
 
                        set_bit(ea->fcport->loop_id, vha->hw->loop_id_map);
+                       spin_lock_irqsave(&vha->hw->tgt.sess_lock, flags);
                        ea->fcport->loop_id = FC_NO_LOOP_ID;
                        ea->fcport->chip_reset = vha->hw->base_qpair->chip_reset;
                        ea->fcport->logout_on_delete = 1;
                        ea->fcport->send_els_logo = 0;
+                       ea->fcport->fw_login_state = DSC_LS_PRLI_COMP;
+                       spin_unlock_irqrestore(&vha->hw->tgt.sess_lock, flags);
+
                        qla24xx_post_gpdb_work(vha, ea->fcport, 0);
                }
                break;

diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index db6fd3b747edcae886dd234b9376c7280ea2a444..52a412132abbda65cba625c49e49394d009b1fcf 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -4682,7 +4682,7 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,
        uint16_t wd3_lo;
        int res = 0;
        struct qlt_plogi_ack_t *pla;
-       unsigned long flags;
+       unsigned long flags = 0;
 
        wwn = wwn_to_u64(iocb->u.isp24.port_name);
 
@@ -4818,8 +4818,14 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,
                }
 
                if (sess != NULL) {
-                       if (sess->fw_login_state != DSC_LS_PLOGI_PEND &&
-                           sess->fw_login_state != DSC_LS_PLOGI_COMP) {
+                       spin_lock_irqsave(&tgt->ha->tgt.sess_lock, flags);
+                       switch (sess->fw_login_state) {
+                       case DSC_LS_PLOGI_COMP:
+                       case DSC_LS_PRLI_COMP:
+                               break;
+                       default:
+                               spin_unlock_irqrestore(&tgt->ha->tgt.sess_lock,
+                                   flags);
                                /*
                                 * Impatient initiator sent PRLI before last
                                 * PLOGI could finish. Will force him to re-try,
@@ -4830,6 +4836,8 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,
                                    sess);
                                qlt_send_term_imm_notif(vha, iocb, 1);
                                res = 0;
+                               spin_lock_irqsave(&tgt->ha->tgt.sess_lock,
+                                   flags);
                                break;
                        }
 
@@ -4853,6 +4861,8 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,
                                sess->port_type = FCT_INITIATOR;
                        else
                                sess->port_type = FCT_TARGET;
+
+                       spin_unlock_irqrestore(&tgt->ha->tgt.sess_lock, flags);
                }
                res = 1; /* send notify ack */