scsi: qla2xxx: Fix n2n_ae flag to prevent dev_loss on PDB change

On a port db changes, this patch will set n2n_ae flag for N2N
connection when requesting for Report ID Acquition MBX, instead
of Loop Initialization or point to point asynchronous events.

Signed-off-by: Darren Trapp <darren.trapp@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

3 files changed, 3 insertions, 5 deletions

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 56f78dce4d3c..cba749d27154 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -4281,8 +4281,6 @@ typedef struct scsi_qla_host {
         struct          nvme_fc_local_port *nvme_local_port;
         struct completion nvme_del_done;
         struct list_head nvme_rport_list;
-        atomic_t        nvme_active_aen_cnt;
-        uint16_t        nvme_last_rptd_aen;
 
         uint16_t        fcoe_vlan_id;
         uint16_t        fcoe_fcf_idx;
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 93f2f1df7168..913cd6cf5907 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -767,7 +767,6 @@ skip_rio:
 
         case MBA_LIP_OCCURRED:          /* Loop Initialization Procedure */
                 ha->flags.lip_ae = 1;
-                ha->flags.n2n_ae = 0;
 
                 ql_dbg(ql_dbg_async, vha, 0x5009,
                     "LIP occurred (%x).\n", mb[1]);
@@ -811,7 +810,6 @@ skip_rio:
 
         case MBA_LOOP_DOWN:             /* Loop Down Event */
                 SAVE_TOPO(ha);
-                ha->flags.n2n_ae = 0;
                 ha->flags.lip_ae = 0;
                 ha->current_topology = 0;
 
@@ -885,7 +883,6 @@ skip_rio:
         /* case MBA_DCBX_COMPLETE: */
         case MBA_POINT_TO_POINT:        /* Point-to-Point */
                 ha->flags.lip_ae = 0;
-                ha->flags.n2n_ae = 1;
 
                 if (IS_QLA2100(ha))
                         break;
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 41b0ee47c6a1..735079ba691c 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -3747,6 +3747,7 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
         id.b.area   = rptid_entry->port_id[1];
         id.b.al_pa  = rptid_entry->port_id[0];
         id.b.rsvd_1 = 0;
+        ha->flags.n2n_ae = 0;
 
         if (rptid_entry->format == 0) {
                 /* loop */
@@ -3799,6 +3800,7 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
                         set_bit(N2N_LOGIN_NEEDED, &vha->dpc_flags);
                         set_bit(REGISTER_FC4_NEEDED, &vha->dpc_flags);
                         set_bit(REGISTER_FDMI_NEEDED, &vha->dpc_flags);
+                        ha->flags.n2n_ae = 1;
                         return;
                 }
 
@@ -3875,6 +3877,7 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
                 vha->d_id.b.area = rptid_entry->port_id[1];
                 vha->d_id.b.al_pa = rptid_entry->port_id[0];
 
+                ha->flags.n2n_ae = 1;
                 spin_lock_irqsave(&ha->vport_slock, flags);
                 qlt_update_vp_map(vha, SET_AL_PA);
                 spin_unlock_irqrestore(&ha->vport_slock, flags);