From: Quinn Tran <qutran@marvell.com>

Date: Mon, 16 Aug 2021 22:13:10 -0700

Subject: scsi: qla2xxx: Fix NVMe | FCP personality change

Patch-mainline: v5.15-rc1

Git-commit: f6e327fc09e48271c103efb3b69fc4ccda3f408b

References: bsc#1190941

Currently driver saves the personality type (FCP|NVMe) at the start of

first discovery of the remote device. If the remote device personality do

change over time, then qla driver needs to present that to user to decide.

Link: https://lore.kernel.org/r/20210817051315.2477-8-njavali@marvell.com

Signed-off-by: Quinn Tran <qutran@marvell.com>

Signed-off-by: Nilesh Javali <njavali@marvell.com>

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

Acked-by: Daniel Wagner <dwagner@suse.de>

---

 drivers/scsi/qla2xxx/qla_gs.c   |    1 +

 drivers/scsi/qla2xxx/qla_init.c |    5 +++--

 2 files changed, 4 insertions(+), 2 deletions(-)

--- a/drivers/scsi/qla2xxx/qla_gs.c

+++ b/drivers/scsi/qla2xxx/qla_gs.c

@@ -3502,6 +3502,7 @@ void qla24xx_async_gnnft_done(scsi_qla_h

 				continue;

 			fcport->scan_state = QLA_FCPORT_FOUND;

 			fcport->last_rscn_gen = fcport->rscn_gen;

+			fcport->fc4_type = rp->fc4type;

 			found = true;

 			/*

 			 * If device was not a fabric device before.

--- a/drivers/scsi/qla2xxx/qla_init.c

+++ b/drivers/scsi/qla2xxx/qla_init.c

@@ -1610,11 +1610,12 @@ int qla24xx_fcport_handle_login(struct s

 	u16 sec;

 	ql_dbg(ql_dbg_disc, vha, 0x20d8,

-	    "%s %8phC DS %d LS %d P %d fl %x confl %p rscn %d|%d login %d lid %d scan %d\n",

+	    "%s %8phC DS %d LS %d P %d fl %x confl %p rscn %d|%d login %d lid %d scan %d fc4type %x\n",

 	    __func__, fcport->port_name, fcport->disc_state,

 	    fcport->fw_login_state, fcport->login_pause, fcport->flags,

 	    fcport->conflict, fcport->last_rscn_gen, fcport->rscn_gen,

-	    fcport->login_gen, fcport->loop_id, fcport->scan_state);

+	    fcport->login_gen, fcport->loop_id, fcport->scan_state,

+	    fcport->fc4_type);

 	if (fcport->scan_state != QLA_FCPORT_FOUND)

 		return 0;