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

Commit 7d236480 authored by Duane Grigsby's avatar Duane Grigsby Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Use FC-NVMe FC4 type for FDMI registration 



[mkp: fixed typo]

Signed-off-by: default avatarDuane Grigsby <duane.grigsby@cavium.com>
Signed-off-by: default avatarDarren Trapp <darren.trapp@cavium.com>
Signed-off-by: default avatarAnil Gurumurthy <anil.gurumurhty@cavium.com>
Signed-off-by: default avatarGiridhar Malavali <giridhar.malavali@cavium.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarJames Smart <james.smart@broadcom.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 d3bae931

drivers/scsi/qla2xxx/qla_gs.c

+16 −0
Original line number Diff line number Diff line
@@ -2166,6 +2166,13 @@ qla2x00_fdmiv2_rpa(scsi_qla_host_t *vha) 
	    eiter->a.fc4_types[2],

	    eiter->a.fc4_types[1]);



	if (vha->flags.nvme_enabled) {

		eiter->a.fc4_types[6] = 1;	/* NVMe type 28h */

		ql_dbg(ql_dbg_disc, vha, 0x211f,

		    "NVME FC4 Type = %02x 0x0 0x0 0x0 0x0 0x0.\n",

		    eiter->a.fc4_types[6]);

	}



	/* Supported speed. */

	eiter = entries + size;

	eiter->type = cpu_to_be16(FDMI_PORT_SUPPORT_SPEED);
@@ -2363,6 +2370,15 @@ qla2x00_fdmiv2_rpa(scsi_qla_host_t *vha) 
	    "Port Active FC4 Type = %02x %02x.\n",

	    eiter->a.port_fc4_type[2], eiter->a.port_fc4_type[1]);



	if (vha->flags.nvme_enabled) {

		eiter->a.port_fc4_type[4] = 0;

		eiter->a.port_fc4_type[5] = 0;

		eiter->a.port_fc4_type[6] = 1;	/* NVMe type 28h */

		ql_dbg(ql_dbg_disc, vha, 0x2120,

		    "NVME Port Active FC4 Type = %02x 0x0 0x0 0x0 0x0 0x0.\n",

		    eiter->a.port_fc4_type[6]);

	}



	/* Port State */

	eiter = entries + size;

	eiter->type = cpu_to_be16(FDMI_PORT_STATE);