From f705e9236b22df5bc170d449f4100368f7e5915d Mon Sep 17 00:00:00 2001

From: Himanshu Madhani <hmadhani@redhat.com>

Date: Thu, 21 Nov 2019 16:36:47 -0500

Subject: [PATCH 137/155] [scsi] scsi: qla2xxx: Dual FCP-NVMe target port

 support

Message-id: <20191121163701.43688-13-hmadhani@redhat.com>

Patchwork-id: 287851

O-Subject: [RHLE 7.8 e-stor PATCH v3 12/26] scsi: qla2xxx: Dual FCP-NVMe target port support

Bugzilla: 1731581

RH-Acked-by: Jarod Wilson <jarod@redhat.com>

RH-Acked-by: Ewan Milne <emilne@redhat.com>

RH-Acked-by: Tony Camuso <tcamuso@redhat.com>

From: Michael Hernandez <mhernandez@marvell.com>

Bugzilla 1731581

Some storage arrays advertise FCP LUNs and NVMe namespaces behind the same

WWN.  The driver now offers a user option by way of NVRAM parameter to

allow users to choose, on a per port basis, the kind of FC-4 type they

would like to prioritize for login.

Link: https://lore.kernel.org/r/20190912180918.6436-9-hmadhani@marvell.com

Signed-off-by: Michael Hernandez <mhernandez@marvell.com>

Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>

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

(cherry picked from commit 84ed362ac40ca44dbbbebf767301463aa72bc797)

Signed-off-by: Himanshu Madhani <hmadhani@redhat.com>

Signed-off-by: Jan Stancek <jstancek@redhat.com>

---

 drivers/scsi/qla2xxx/qla_def.h    | 26 ++++++++++++++--

 drivers/scsi/qla2xxx/qla_fw.h     |  2 ++

 drivers/scsi/qla2xxx/qla_gs.c     | 42 ++++++++++++++-----------

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

 drivers/scsi/qla2xxx/qla_inline.h | 12 ++++++++

 drivers/scsi/qla2xxx/qla_mbx.c    | 11 ++++---

 drivers/scsi/qla2xxx/qla_os.c     | 17 +++++------

 7 files changed, 114 insertions(+), 60 deletions(-)

Index: src/drivers/scsi/qla2xxx/qla_def.h

===================================================================

--- src.orig/drivers/scsi/qla2xxx/qla_def.h	2019-12-20 19:04:14.604251603 +0100

+++ src/drivers/scsi/qla2xxx/qla_def.h	2019-12-20 19:04:41.787008568 +0100

@@ -2244,7 +2244,7 @@

 	uint8_t fabric_port_name[WWN_SIZE];

 	uint16_t fp_speed;

 	uint8_t fc4_type;

-	uint8_t fc4f_nvme;	/* nvme fc4 feature bits */

+	uint8_t fc4_features;

 } sw_info_t;

 /* FCP-4 types */

@@ -2425,7 +2425,7 @@

 	u32 supported_classes;

 	uint8_t fc4_type;

-	uint8_t	fc4f_nvme;

+	uint8_t fc4_features;

 	uint8_t scan_state;

 	unsigned long last_queue_full;

@@ -2456,6 +2456,9 @@

 	u16 n2n_chip_reset;

 } fc_port_t;

+#define FC4_PRIORITY_NVME	0

+#define FC4_PRIORITY_FCP	1

+

 #define QLA_FCPORT_SCAN		1

 #define QLA_FCPORT_FOUND	2

@@ -4269,6 +4272,8 @@

 	atomic_t        nvme_active_aen_cnt;

 	uint16_t        nvme_last_rptd_aen;             /* Last recorded aen count */

+	uint8_t fc4_type_priority;

+

 	atomic_t zio_threshold;

 	uint16_t last_zio_threshold;

 #define DEFAULT_ZIO_THRESHOLD 5

@@ -4787,6 +4792,23 @@

 	 ha->current_topology == ISP_CFG_N || \

 	 !ha->current_topology)

+#define NVME_TYPE(fcport) \

+	(fcport->fc4_type & FS_FC4TYPE_NVME) \

+

+#define FCP_TYPE(fcport) \

+	(fcport->fc4_type & FS_FC4TYPE_FCP) \

+

+#define NVME_ONLY_TARGET(fcport) \

+	(NVME_TYPE(fcport) && !FCP_TYPE(fcport))  \

+

+#define NVME_FCP_TARGET(fcport) \

+	(FCP_TYPE(fcport) && NVME_TYPE(fcport)) \

+

+#define NVME_TARGET(ha, fcport) \

+	((NVME_FCP_TARGET(fcport) && \

+	(ha->fc4_type_priority == FC4_PRIORITY_NVME)) || \

+	NVME_ONLY_TARGET(fcport)) \

+

 #include "qla_target.h"

 #include "qla_gbl.h"

 #include "qla_dbg.h"

Index: src/drivers/scsi/qla2xxx/qla_fw.h

===================================================================

--- src.orig/drivers/scsi/qla2xxx/qla_fw.h	2019-12-20 19:04:14.604251603 +0100

+++ src/drivers/scsi/qla2xxx/qla_fw.h	2019-12-20 19:04:41.787008568 +0100

@@ -2106,4 +2106,6 @@

 #define FA_FLASH_LAYOUT_ADDR_83	(0x3F1000/4)

 #define FA_FLASH_LAYOUT_ADDR_28	(0x11000/4)

+#define NVRAM_DUAL_FCP_NVME_FLAG_OFFSET	0x196

+

 #endif

Index: src/drivers/scsi/qla2xxx/qla_gs.c

===================================================================

--- src.orig/drivers/scsi/qla2xxx/qla_gs.c	2019-12-20 19:04:14.605251594 +0100

+++ src/drivers/scsi/qla2xxx/qla_gs.c	2019-12-20 19:04:41.788008559 +0100

@@ -256,7 +256,7 @@

 		    WWN_SIZE);

 		fcport->fc4_type = (ct_rsp->rsp.ga_nxt.fc4_types[2] & BIT_0) ?

-		    FC4_TYPE_FCP_SCSI : FC4_TYPE_OTHER;

+		    FS_FC4TYPE_FCP : FC4_TYPE_OTHER;

 		if (ct_rsp->rsp.ga_nxt.port_type != NS_N_PORT_TYPE &&

 		    ct_rsp->rsp.ga_nxt.port_type != NS_NL_PORT_TYPE)

@@ -2917,7 +2917,7 @@

 	struct ct_sns_req	*ct_req;

 	struct ct_sns_rsp	*ct_rsp;

 	struct qla_hw_data *ha = vha->hw;

-	uint8_t fcp_scsi_features = 0;

+	uint8_t fcp_scsi_features = 0, nvme_features = 0;

 	struct ct_arg arg;

 	for (i = 0; i < ha->max_fibre_devices; i++) {

@@ -2965,14 +2965,19 @@

 			   ct_rsp->rsp.gff_id.fc4_features[GFF_FCP_SCSI_OFFSET];

 			fcp_scsi_features &= 0x0f;

-			if (fcp_scsi_features)

-				list[i].fc4_type = FC4_TYPE_FCP_SCSI;

-			else

-				list[i].fc4_type = FC4_TYPE_OTHER;

+			if (fcp_scsi_features) {

+				list[i].fc4_type = FS_FC4TYPE_FCP;

+				list[i].fc4_features = fcp_scsi_features;

+			}

-			list[i].fc4f_nvme =

+			nvme_features =

 			    ct_rsp->rsp.gff_id.fc4_features[GFF_NVME_OFFSET];

-			list[i].fc4f_nvme &= 0xf;

+			nvme_features &= 0xf;

+

+			if (nvme_features) {

+				list[i].fc4_type |= FS_FC4TYPE_NVME;

+				list[i].fc4_features = nvme_features;

+			}

 		}

 		/* Last device exit. */

@@ -3488,6 +3493,8 @@

 	fc_port_t *fcport = sp->fcport;

 	struct ct_sns_rsp *ct_rsp;

 	struct event_arg ea;

+	uint8_t fc4_scsi_feat;

+	uint8_t fc4_nvme_feat;

 	ql_dbg(ql_dbg_disc, vha, 0x2133,

 	       "Async done-%s res %x ID %x. %8phC\n",

@@ -3495,24 +3502,25 @@

 	fcport->flags &= ~FCF_ASYNC_SENT;

 	ct_rsp = &fcport->ct_desc.ct_sns->p.rsp;

+	fc4_scsi_feat = ct_rsp->rsp.gff_id.fc4_features[GFF_FCP_SCSI_OFFSET];

+	fc4_nvme_feat = ct_rsp->rsp.gff_id.fc4_features[GFF_NVME_OFFSET];

+

 	/*

 	 * FC-GS-7, 5.2.3.12 FC-4 Features - format

 	 * The format of the FC-4 Features object, as defined by the FC-4,

 	 * Shall be an array of 4-bit values, one for each type code value

 	 */

 	if (!res) {

-		if (ct_rsp->rsp.gff_id.fc4_features[GFF_FCP_SCSI_OFFSET] & 0xf) {

+		if (fc4_scsi_feat & 0xf) {

 			/* w1 b00:03 */

-			fcport->fc4_type =

-			    ct_rsp->rsp.gff_id.fc4_features[GFF_FCP_SCSI_OFFSET];

-			fcport->fc4_type &= 0xf;

-	       }

+			fcport->fc4_type = FS_FC4TYPE_FCP;

+			fcport->fc4_features = fc4_scsi_feat & 0xf;

+		}

-		if (ct_rsp->rsp.gff_id.fc4_features[GFF_NVME_OFFSET] & 0xf) {

+		if (fc4_nvme_feat & 0xf) {

 			/* w5 [00:03]/28h */

-			fcport->fc4f_nvme =

-			    ct_rsp->rsp.gff_id.fc4_features[GFF_NVME_OFFSET];

-			fcport->fc4f_nvme &= 0xf;

+			fcport->fc4_type |= FS_FC4TYPE_NVME;

+			fcport->fc4_features = fc4_nvme_feat & 0xf;

 		}

 	}

Index: src/drivers/scsi/qla2xxx/qla_init.c

===================================================================

--- src.orig/drivers/scsi/qla2xxx/qla_init.c	2019-12-20 19:04:14.610251550 +0100

+++ src/drivers/scsi/qla2xxx/qla_init.c	2019-12-20 19:04:41.789008550 +0100

@@ -334,7 +334,7 @@

 	else

 		lio->u.logio.flags |= SRB_LOGIN_COND_PLOGI;

-	if (fcport->fc4f_nvme)

+	if (NVME_TARGET(vha->hw, fcport))

 		lio->u.logio.flags |= SRB_LOGIN_SKIP_PRLI;

 	ql_dbg(ql_dbg_disc, vha, 0x2072,

@@ -737,19 +737,17 @@

 		loop_id = le16_to_cpu(e->nport_handle);

 		loop_id = (loop_id & 0x7fff);

-		if  (fcport->fc4f_nvme)

+		if (NVME_TARGET(vha->hw, fcport))

 			current_login_state = e->current_login_state >> 4;

 		else

 			current_login_state = e->current_login_state & 0xf;

-

 		ql_dbg(ql_dbg_disc, vha, 0x20e2,

-		    "%s found %8phC CLS [%x|%x] nvme %d ID[%02x%02x%02x|%02x%02x%02x] lid[%d|%d]\n",

+		    "%s found %8phC CLS [%x|%x] fc4_type %d ID[%06x|%06x] lid[%d|%d]\n",

 		    __func__, fcport->port_name,

 		    e->current_login_state, fcport->fw_login_state,

-		    fcport->fc4f_nvme, id.b.domain, id.b.area, id.b.al_pa,

-		    fcport->d_id.b.domain, fcport->d_id.b.area,

-		    fcport->d_id.b.al_pa, loop_id, fcport->loop_id);

+		    fcport->fc4_type, id.b24, fcport->d_id.b24,

+		    loop_id, fcport->loop_id);

 		switch (fcport->disc_state) {

 		case DSC_DELETE_PEND:

@@ -1245,13 +1243,13 @@

 	sp->done = qla2x00_async_prli_sp_done;

 	lio->u.logio.flags = 0;

-	if  (fcport->fc4f_nvme)

+	if (NVME_TARGET(vha->hw, fcport))

 		lio->u.logio.flags |= SRB_LOGIN_NVME_PRLI;

 	ql_dbg(ql_dbg_disc, vha, 0x211b,

 	    "Async-prli - %8phC hdl=%x, loopid=%x portid=%06x retries=%d %s.\n",

 	    fcport->port_name, sp->handle, fcport->loop_id, fcport->d_id.b24,

-	    fcport->login_retry, fcport->fc4f_nvme ? "nvme" : "fc");

+	    fcport->login_retry, NVME_TARGET(vha->hw, fcport) ? "nvme" : "fc");

 	rval = qla2x00_start_sp(sp);

 	if (rval != QLA_SUCCESS) {

@@ -1402,14 +1400,14 @@

 	fcport->flags &= ~FCF_ASYNC_SENT;

 	ql_dbg(ql_dbg_disc, vha, 0x20d2,

-	    "%s %8phC DS %d LS %d nvme %x rc %d\n", __func__, fcport->port_name,

-	    fcport->disc_state, pd->current_login_state, fcport->fc4f_nvme,

-	    ea->rc);

+	    "%s %8phC DS %d LS %d fc4_type %x rc %d\n", __func__,

+	    fcport->port_name, fcport->disc_state, pd->current_login_state,

+	    fcport->fc4_type, ea->rc);

 	if (fcport->disc_state == DSC_DELETE_PEND)

 		return;

-	if (fcport->fc4f_nvme)

+	if (NVME_TARGET(vha->hw, fcport))

 		ls = pd->current_login_state >> 4;

 	else

 		ls = pd->current_login_state & 0xf;

@@ -1598,7 +1596,8 @@

 				ql_dbg(ql_dbg_disc, vha, 0x2118,

 				    "%s %d %8phC post %s PRLI\n",

 				    __func__, __LINE__, fcport->port_name,

-				    fcport->fc4f_nvme ? "NVME" : "FC");

+				    NVME_TARGET(vha->hw, fcport) ? "NVME" :

+				    "FC");

 				qla24xx_post_prli_work(vha, fcport);

 			}

 			break;

@@ -1941,13 +1940,22 @@

 			break;

 		}

-		if (ea->fcport->fc4f_nvme) {

+		/*

+		 * Retry PRLI with other FC-4 type if failure occurred on dual

+		 * FCP/NVMe port

+		 */

+		if (NVME_FCP_TARGET(ea->fcport)) {

+			if (vha->hw->fc4_type_priority == FC4_PRIORITY_NVME)

+				ea->fcport->fc4_type &= ~FS_FC4TYPE_NVME;

+			else

+				ea->fcport->fc4_type &= ~FS_FC4TYPE_FCP;

 			ql_dbg(ql_dbg_disc, vha, 0x2118,

-				"%s %d %8phC post fc4 prli\n",

-				__func__, __LINE__, ea->fcport->port_name);

-			ea->fcport->fc4f_nvme = 0;

+				"%s %d %8phC post %s prli\n",

+				__func__, __LINE__, ea->fcport->port_name,

+				(ea->fcport->fc4_type & FS_FC4TYPE_NVME) ?

+				"NVMe" : "FCP");

 			qla24xx_post_prli_work(vha, ea->fcport);

-			return;

+			break;

 		}

 		/* at this point both PRLI NVME & PRLI FCP failed */

@@ -2030,7 +2038,7 @@

 		 * force a relogin attempt via implicit LOGO, PLOGI, and PRLI

 		 * requests.

 		 */

-		if (ea->fcport->fc4f_nvme) {

+		if (NVME_TARGET(vha->hw, ea->fcport)) {

 			ql_dbg(ql_dbg_disc, vha, 0x2117,

 				"%s %d %8phC post prli\n",

 				__func__, __LINE__, ea->fcport->port_name);

@@ -5486,7 +5494,7 @@

 	qla2x00_iidma_fcport(vha, fcport);

-	if (fcport->fc4f_nvme) {

+	if (NVME_TARGET(vha->hw, fcport)) {

 		qla_nvme_register_remote(vha, fcport);

 		fcport->disc_state = DSC_LOGIN_COMPLETE;

 		qla2x00_set_fcport_state(fcport, FCS_ONLINE);

@@ -5814,11 +5822,8 @@

 				new_fcport->fc4_type = swl[swl_idx].fc4_type;

 				new_fcport->nvme_flag = 0;

-				new_fcport->fc4f_nvme = 0;

 				if (vha->flags.nvme_enabled &&

-				    swl[swl_idx].fc4f_nvme) {

-					new_fcport->fc4f_nvme =

-					    swl[swl_idx].fc4f_nvme;

+				    swl[swl_idx].fc4_type & FS_FC4TYPE_NVME) {

 					ql_log(ql_log_info, vha, 0x2131,

 					    "FOUND: NVME port %8phC as FC Type 28h\n",

 					    new_fcport->port_name);

@@ -5874,7 +5879,7 @@

 		/* Bypass ports whose FCP-4 type is not FCP_SCSI */

 		if (ql2xgffidenable &&

-		    (new_fcport->fc4_type != FC4_TYPE_FCP_SCSI &&

+		    (!(new_fcport->fc4_type & FS_FC4TYPE_FCP) &&

 		    new_fcport->fc4_type != FC4_TYPE_UNKNOWN))

 			continue;

@@ -5943,7 +5948,7 @@

 			break;

 		}

-		if (fcport->fc4f_nvme) {

+		if (NVME_TARGET(vha->hw, fcport)) {

 			if (fcport->disc_state == DSC_DELETE_PEND) {

 				fcport->disc_state = DSC_GNL;

 				vha->fcport_count--;

@@ -8613,6 +8618,11 @@

 	/* N2N: driver will initiate Login instead of FW */

 	icb->firmware_options_3 |= BIT_8;

+	/* Determine NVMe/FCP priority for target ports */

+	ha->fc4_type_priority = qla2xxx_get_fc4_priority(vha);

+	ql_log(ql_log_info, vha, 0xffff, "FC4 priority set to %s\n",

+	    ha->fc4_type_priority & BIT_0 ? "FCP" : "NVMe");

+

 	if (rval) {

 		ql_log(ql_log_warn, vha, 0x0076,

 		    "NVRAM configuration failed.\n");

Index: src/drivers/scsi/qla2xxx/qla_inline.h

===================================================================

--- src.orig/drivers/scsi/qla2xxx/qla_inline.h	2019-12-20 19:04:14.610251550 +0100

+++ src/drivers/scsi/qla2xxx/qla_inline.h	2019-12-20 19:04:41.789008550 +0100

@@ -320,3 +320,15 @@

 	WRT_REG_DWORD(req->req_q_in, req->ring_index);

 }

+

+static inline int

+qla2xxx_get_fc4_priority(struct scsi_qla_host *vha)

+{

+	uint32_t data;

+

+	data =

+	    ((uint8_t *)vha->hw->nvram)[NVRAM_DUAL_FCP_NVME_FLAG_OFFSET];

+

+

+	return ((data >> 6) & BIT_0);

+}

Index: src/drivers/scsi/qla2xxx/qla_mbx.c

===================================================================

--- src.orig/drivers/scsi/qla2xxx/qla_mbx.c	2019-12-20 19:04:14.611251541 +0100

+++ src/drivers/scsi/qla2xxx/qla_mbx.c	2019-12-20 19:07:11.648678207 +0100

@@ -1930,7 +1930,7 @@

 		pd24 = (struct port_database_24xx *) pd;

 		/* Check for logged in state. */

-		if (fcport->fc4f_nvme) {

+		if (NVME_TARGET(ha, fcport)) {

 			current_login_state = pd24->current_login_state >> 4;

 			last_login_state = pd24->last_login_state >> 4;

 		} else {

@@ -3897,8 +3897,9 @@

 				fcport->scan_state = QLA_FCPORT_FOUND;

 				fcport->n2n_flag = 1;

 				fcport->keep_nport_handle = 1;

+				fcport->fc4_type = FS_FC4TYPE_FCP;

 				if (vha->flags.nvme_enabled)

-					fcport->fc4f_nvme = 1;

+					fcport->fc4_type |= FS_FC4TYPE_NVME;

 				switch (fcport->disc_state) {

 				case DSC_DELETED:

@@ -6362,7 +6363,7 @@

 	uint64_t zero = 0;

 	u8 current_login_state, last_login_state;

-	if (fcport->fc4f_nvme) {

+	if (NVME_TARGET(vha->hw, fcport)) {

 		current_login_state = pd->current_login_state >> 4;

 		last_login_state = pd->last_login_state >> 4;

 	} else {

@@ -6397,7 +6398,7 @@

 	fcport->d_id.b.al_pa = pd->port_id[2];

 	fcport->d_id.b.rsvd_1 = 0;

-	if (fcport->fc4f_nvme) {

+	if (NVME_TARGET(vha->hw, fcport)) {

 		fcport->port_type = FCT_NVME;

 	} else {

 		/* If not target must be initiator or unknown type. */

Index: src/drivers/scsi/qla2xxx/qla_os.c

===================================================================

--- src.orig/drivers/scsi/qla2xxx/qla_os.c	2019-12-20 19:04:14.613251523 +0100

+++ src/drivers/scsi/qla2xxx/qla_os.c	2019-12-20 19:04:41.791008533 +0100

@@ -5125,19 +5125,17 @@

 			fcport->d_id = e->u.new_sess.id;

 			fcport->flags |= FCF_FABRIC_DEVICE;

 			fcport->fw_login_state = DSC_LS_PLOGI_PEND;

-			if (e->u.new_sess.fc4_type == FS_FC4TYPE_FCP)

-				fcport->fc4_type = FC4_TYPE_FCP_SCSI;

-

-			if (e->u.new_sess.fc4_type == FS_FC4TYPE_NVME) {

-				fcport->fc4_type = FC4_TYPE_OTHER;

-				fcport->fc4f_nvme = FC4_TYPE_NVME;

-			}

 			memcpy(fcport->port_name, e->u.new_sess.port_name,

 			    WWN_SIZE);

-			if (e->u.new_sess.fc4_type & FS_FCP_IS_N2N)

+			fcport->fc4_type = e->u.new_sess.fc4_type;

+			if (e->u.new_sess.fc4_type & FS_FCP_IS_N2N) {

+				fcport->fc4_type = FS_FC4TYPE_FCP;

 				fcport->n2n_flag = 1;

+				if (vha->flags.nvme_enabled)

+					fcport->fc4_type |= FS_FC4TYPE_NVME;

+			}

 		} else {

 			ql_dbg(ql_dbg_disc, vha, 0xffff,

@@ -5239,7 +5237,8 @@

 				fcport->flags &= ~FCF_FABRIC_DEVICE;

 				fcport->keep_nport_handle = 1;

 				if (vha->flags.nvme_enabled) {

-					fcport->fc4f_nvme = 1;

+					fcport->fc4_type =

+					    (FS_FC4TYPE_NVME | FS_FC4TYPE_FCP);

 					fcport->n2n_flag = 1;

 				}

 				fcport->fw_login_state = 0;