Commit f6e84790 authored by James Smart's avatar James Smart Committed by Martin K. Petersen
Browse files

scsi: lpfc: Fix default driver parameter collision for allowing NPIV support 



The conversion to enable SCSI and NVME fc4 support ran into an issue with
NPIV support. With NVME, NPIV is not currently supported, but with SCSI it
was. The driver reverted to its lowest setting meaning NPIV with SCSI was
not allowed.

Convert the NPIV checks and implementation so that SCSI can continue to
allow NPIV support.

Signed-off-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarJames Smart <jsmart2021@gmail.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c2017260

drivers/scsi/lpfc/lpfc.h

+2 −1
Original line number Diff line number Diff line
@@ -462,6 +462,7 @@ struct lpfc_vport { 
	uint32_t cfg_use_adisc;

	uint32_t cfg_discovery_threads;

	uint32_t cfg_log_verbose;

	uint32_t cfg_enable_fc4_type;

	uint32_t cfg_max_luns;

	uint32_t cfg_enable_da_id;

	uint32_t cfg_max_scsicmpl_time;
@@ -860,6 +861,7 @@ struct lpfc_hba { 
	uint32_t cfg_prot_guard;

	uint32_t cfg_hostmem_hgp;

	uint32_t cfg_log_verbose;

	uint32_t cfg_enable_fc4_type;

	uint32_t cfg_aer_support;

	uint32_t cfg_sriov_nr_virtfn;

	uint32_t cfg_request_firmware_upgrade;
@@ -880,7 +882,6 @@ struct lpfc_hba { 
	uint32_t cfg_ras_fwlog_level;

	uint32_t cfg_ras_fwlog_buffsize;

	uint32_t cfg_ras_fwlog_func;

	uint32_t cfg_enable_fc4_type;

	uint32_t cfg_enable_bbcr;	/* Enable BB Credit Recovery */

	uint32_t cfg_enable_dpp;	/* Enable Direct Packet Push */

#define LPFC_ENABLE_FCP  1

drivers/scsi/lpfc/lpfc_attr.c

+2 −2
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ lpfc_nvme_info_show(struct device *dev, struct device_attribute *attr, 
	int len = 0;

	char tmp[LPFC_MAX_NVME_INFO_TMP_LEN] = {0};



	if (!(phba->cfg_enable_fc4_type & LPFC_ENABLE_NVME)) {

	if (!(vport->cfg_enable_fc4_type & LPFC_ENABLE_NVME)) {

		len = scnprintf(buf, PAGE_SIZE, "NVME Disabled\n");

		return len;

	}
@@ -519,7 +519,7 @@ lpfc_scsi_stat_show(struct device *dev, struct device_attribute *attr, 
	int i;

	char tmp[LPFC_MAX_SCSI_INFO_TMP_LEN] = {0};



	if (!(phba->cfg_enable_fc4_type & LPFC_ENABLE_FCP) ||

	if (!(vport->cfg_enable_fc4_type & LPFC_ENABLE_FCP) ||

	    (phba->sli_rev != LPFC_SLI_REV4))

		return 0;

drivers/scsi/lpfc/lpfc_ct.c

+8 −8
Original line number Diff line number Diff line
@@ -1656,16 +1656,16 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode, 
		CtReq->un.rft.PortId = cpu_to_be32(vport->fc_myDID);



		/* Register FC4 FCP type if enabled.  */

		if ((phba->cfg_enable_fc4_type == LPFC_ENABLE_BOTH) ||

		    (phba->cfg_enable_fc4_type == LPFC_ENABLE_FCP))

		if (vport->cfg_enable_fc4_type == LPFC_ENABLE_BOTH ||

		    vport->cfg_enable_fc4_type == LPFC_ENABLE_FCP)

			CtReq->un.rft.fcpReg = 1;



		/* Register NVME type if enabled.  Defined LE and swapped.

		 * rsvd[0] is used as word1 because of the hard-coded

		 * word0 usage in the ct_request data structure.

		 */

		if ((phba->cfg_enable_fc4_type == LPFC_ENABLE_BOTH) ||

		    (phba->cfg_enable_fc4_type == LPFC_ENABLE_NVME))

		if (vport->cfg_enable_fc4_type == LPFC_ENABLE_BOTH ||

		    vport->cfg_enable_fc4_type == LPFC_ENABLE_NVME)

			CtReq->un.rft.rsvd[0] =

				cpu_to_be32(LPFC_FC4_TYPE_BITMASK);
@@ -1732,8 +1732,8 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode, 
		 * caller can specify NVME (type x28) as well.  But only

		 * these that FC4 type is supported.

		 */

		if (((phba->cfg_enable_fc4_type == LPFC_ENABLE_BOTH) ||

		     (phba->cfg_enable_fc4_type == LPFC_ENABLE_NVME)) &&

		if (((vport->cfg_enable_fc4_type == LPFC_ENABLE_BOTH) ||

		     (vport->cfg_enable_fc4_type == LPFC_ENABLE_NVME)) &&

		    (context == FC_TYPE_NVME)) {

			if ((vport == phba->pport) && phba->nvmet_support) {

				CtReq->un.rff.fbits = (FC4_FEATURE_TARGET |
@@ -1744,8 +1744,8 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode, 
			}

			CtReq->un.rff.type_code = context;



		} else if (((phba->cfg_enable_fc4_type == LPFC_ENABLE_BOTH) ||

			    (phba->cfg_enable_fc4_type == LPFC_ENABLE_FCP)) &&

		} else if (((vport->cfg_enable_fc4_type == LPFC_ENABLE_BOTH) ||

			    (vport->cfg_enable_fc4_type == LPFC_ENABLE_FCP)) &&

			   (context == FC_TYPE_FCP))

			CtReq->un.rff.type_code = context;

drivers/scsi/lpfc/lpfc_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -1166,7 +1166,7 @@ lpfc_debugfs_nvmestat_data(struct lpfc_vport *vport, char *buf, int size) 
				phba->sli4_hba.nvmet_io_wait_total,

				tot);

	} else {

		if (!(phba->cfg_enable_fc4_type & LPFC_ENABLE_NVME))

		if (!(vport->cfg_enable_fc4_type & LPFC_ENABLE_NVME))

			return len;



		localport = vport->localport;
@@ -1264,7 +1264,7 @@ lpfc_debugfs_scsistat_data(struct lpfc_vport *vport, char *buf, int size) 
	int i;

	char tmp[LPFC_MAX_SCSI_INFO_TMP_LEN] = {0};



	if (!(phba->cfg_enable_fc4_type & LPFC_ENABLE_FCP) ||

	if (!(vport->cfg_enable_fc4_type & LPFC_ENABLE_FCP) ||

	    (phba->sli_rev != LPFC_SLI_REV4))

		return 0;

drivers/scsi/lpfc/lpfc_els.c

+2 −2
Original line number Diff line number Diff line
@@ -2827,8 +2827,8 @@ out: 
		!(vport->fc_flag & FC_PT2PT_PLOGI)) {

		phba->pport->fc_myDID = 0;



		if ((phba->cfg_enable_fc4_type == LPFC_ENABLE_BOTH) ||

		    (phba->cfg_enable_fc4_type == LPFC_ENABLE_NVME)) {

		if ((vport->cfg_enable_fc4_type == LPFC_ENABLE_BOTH) ||

		    (vport->cfg_enable_fc4_type == LPFC_ENABLE_NVME)) {

			if (phba->nvmet_support)

				lpfc_nvmet_update_targetport(phba);

			else

CRA Git | Maintained and supported by SUSTech CRA and CCSE