Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1763c1fd authored by Darren Trapp's avatar Darren Trapp Committed by Martin K. Petersen
Browse files

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: default avatarDarren Trapp <darren.trapp@cavium.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent e473b307

drivers/scsi/qla2xxx/qla_def.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

drivers/scsi/qla2xxx/qla_isr.c

+0 −3
Original line number Diff line number Diff line
@@ -767,7 +767,6 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb) 


	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 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb) 


	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 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb) 
	/* 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;

drivers/scsi/qla2xxx/qla_mbx.c

+3 −0
Original line number Diff line number Diff line
@@ -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);