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

scsi: lpfc: correct port registrations with nvme_fc 



The driver currently registers any remote port that has NVME support.
It should only be registering target ports.

Register only target ports.

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

drivers/scsi/lpfc/lpfc_hbadisc.c

+12 −8
Original line number Diff line number Diff line
@@ -4176,14 +4176,16 @@ lpfc_nlp_state_cleanup(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 


		if (ndlp->nlp_fc4_type & NLP_FC4_NVME) {

			vport->phba->nport_event_cnt++;

			if (vport->phba->nvmet_support == 0)

				/* Start devloss */

			if (vport->phba->nvmet_support == 0) {

				/* Start devloss if target. */

				if (ndlp->nlp_type & NLP_NVME_TARGET)

					lpfc_nvme_unregister_port(vport, ndlp);

			else

			} else {

				/* NVMET has no upcall. */

				lpfc_nlp_put(ndlp);

			}

		}

	}



	/* FCP and NVME Transport interfaces */
@@ -4205,11 +4207,13 @@ lpfc_nlp_state_cleanup(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
		    ndlp->nlp_fc4_type & NLP_FC4_NVME) {

			if (vport->phba->nvmet_support == 0) {

				/* Register this rport with the transport.

				 * Initiators take the NDLP ref count in

				 * the register.

				 * Only NVME Target Rports are registered with

				 * the transport.

				 */

				if (ndlp->nlp_type & NLP_NVME_TARGET) {

					vport->phba->nport_event_cnt++;

					lpfc_nvme_register_port(vport, ndlp);

				}

			} else {

				/* Just take an NDLP ref count since the

				 * target does not register rports.

drivers/scsi/lpfc/lpfc_nvme.c

+2 −1
Original line number Diff line number Diff line
@@ -2473,7 +2473,8 @@ lpfc_nvme_unregister_port(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) 
	/* Sanity check ndlp type.  Only call for NVME ports. Don't

	 * clear any rport state until the transport calls back.

	 */

	if (ndlp->nlp_type & (NLP_NVME_TARGET | NLP_NVME_INITIATOR)) {



	if (ndlp->nlp_type & NLP_NVME_TARGET) {

		init_completion(&rport->rport_unreg_done);



		/* No concern about the role change on the nvme remoteport.

CRA Git | Maintained and supported by SUSTech CRA and CCSE