From nobody Fri Dec 17 10:03:49 2021
X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
	by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3142518F75B1;
	Fri, 17 Dec 2021 10:03:51 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
	 client-signature RSA-PSS (4096 bits) client-digest SHA256)
	(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4JFl1f25dzz3smr;
	Fri, 17 Dec 2021 10:03:50 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(Client did not present a certificate)
	by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D64A219F1D;
	Fri, 17 Dec 2021 10:03:49 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
	by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BHA3nrI051963;
	Fri, 17 Dec 2021 10:03:49 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BHA3nUJ051962;
	Fri, 17 Dec 2021 10:03:49 GMT
	(envelope-from git)
Date: Fri, 17 Dec 2021 10:03:49 GMT
Message-Id: <202112171003.1BHA3nUJ051962@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
        dev-commits-src-branches@FreeBSD.org
From: Ram Kishore Vegesna <ram@FreeBSD.org>
Subject: git: 3a33ae233c9d - stable/12 - ocs_fc: Emulex Gen 7 HBA support.
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-all@freebsd.org
X-BeenThere: dev-commits-src-all@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: ram
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 3a33ae233c9d9b7650d88a7b9d9cbb6581b8009c
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1639735430;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding;
	bh=c3mfMXD7GgESh6/ZDZMTnsXsIvVuh8D9ZTtpqKQDreo=;
	b=nj7hAS0+sLp/jdyhE2tyadhqweLH6m9fteuB/k/tbEAf/THNPri3JJS33hvfKtpK3qDq5J
	3y7vUKeleOfZWm8+lpYcO8LHm4igXHMxZ4TZWfsVyQnDqUPMbhvwloskaZs5ndB0GswmTW
	FARzbEQu8kozmOrWQWPZ4GHfUcWU3D2vVPfYFGH52Er/L1bfaenU0C6884ATpKdYfll6oW
	Ochl4+njA1ALBsMkvfNo0wLIpVL727j0QUvoh7O8mC9LvfTSzr5h/+Cn4AwGHPnzvi5Cw7
	KaAfRYp2aJp/OTVjfHUTe2zrm+uy9pKqE/TJy2MBBtiFpF9bwZCw8Faogle2Rg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639735430; a=rsa-sha256; cv=none;
	b=dyUNE2sz5JYQwZHAw9ih6ziCYmXFZbZNZ/2Qz13Wsk3aOW/K1/1CrefaqOweJmVtPMe8/i
	mXez4qZ9yU3eIK4b1YL3HxcPX+sqDrxtKue8Fq0RMODj1k8NALEzOlWq6fIRAvTSAhFayB
	vQ28wEZHcxQCPTmZ7CX4RrbzqiKpDTERaUeUt0ZCGwEI/ET65bsc53UcztYa5C9m93L69d
	TLB+fm+ceafNfKaHuzUAD28c83IONEVCwUGK3BugM87HE+64NKBhaSRV2FZtj2+bhFR7T5
	Qsb0bEhK2+Df4FD2Sw1hAyoxYMnfPKccUwg/tzYI836v/3FaB35tOuk5FLUS9A==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
X-ThisMailContainsUnwantedMimeParts: N

The branch stable/12 has been updated by ram:

URL: https://cgit.FreeBSD.org/src/commit/?id=3a33ae233c9d9b7650d88a7b9d9cbb6581b8009c

commit 3a33ae233c9d9b7650d88a7b9d9cbb6581b8009c
Author:     Ram Kishore Vegesna <ram@FreeBSD.org>
AuthorDate: 2021-09-23 06:51:26 +0000
Commit:     Ram Kishore Vegesna <ram@FreeBSD.org>
CommitDate: 2021-12-17 09:57:49 +0000

    ocs_fc: Emulex Gen 7 HBA support.
    
    Emulex Gen7 adapter support in ocs_fc driver.
    
    Reviewed by: mav, ken
    
    (cherry picked from commit 3bf42363b02c9bd728c92b9d9c4a5d022982a21a)
---
 sys/dev/ocs_fc/ocs_hw.c  |  10 ++-
 sys/dev/ocs_fc/ocs_os.h  |  10 ++-
 sys/dev/ocs_fc/ocs_pci.c |  65 +++++++++++++--
 sys/dev/ocs_fc/sli4.c    | 200 +++++++++++++++++++++++++++++++++++++----------
 sys/dev/ocs_fc/sli4.h    |  81 ++++++++++++++++---
 5 files changed, 297 insertions(+), 69 deletions(-)

diff --git a/sys/dev/ocs_fc/ocs_hw.c b/sys/dev/ocs_fc/ocs_hw.c
index c77e17663836..d9e8713765a2 100644
--- a/sys/dev/ocs_fc/ocs_hw.c
+++ b/sys/dev/ocs_fc/ocs_hw.c
@@ -276,7 +276,8 @@ ocs_hw_read_max_dump_size(ocs_hw_t *hw)
 	int 	rc;
 
 	/* lancer only */
-	if (SLI4_IF_TYPE_LANCER_FC_ETH != sli_get_if_type(&hw->sli)) {
+	if ((SLI4_IF_TYPE_LANCER_FC_ETH != sli_get_if_type(&hw->sli)) &&
+	    (SLI4_IF_TYPE_LANCER_G7 != sli_get_if_type(&hw->sli))) {
 		ocs_log_debug(hw->os, "Function only supported for I/F type 2\n");
 		return OCS_HW_RTN_ERROR;
 	}
@@ -419,7 +420,9 @@ ocs_hw_setup(ocs_hw_t *hw, ocs_os_handle_t os, sli4_port_type_e port_type)
 	}
 
 	/* Must be done after the workaround setup */
-	if (SLI4_IF_TYPE_LANCER_FC_ETH == sli_get_if_type(&hw->sli)) {
+	if ((SLI4_IF_TYPE_LANCER_FC_ETH == sli_get_if_type(&hw->sli)) ||
+	    (SLI4_IF_TYPE_LANCER_G7 == sli_get_if_type(&hw->sli))) {
+
 		(void)ocs_hw_read_max_dump_size(hw);
 	}
 
@@ -6024,7 +6027,8 @@ ocs_hw_get_linkcfg(ocs_hw_t *hw, uint32_t opts, ocs_hw_port_control_cb_t cb, voi
 		return OCS_HW_RTN_ERROR;
 	}
 
-	if (SLI4_IF_TYPE_LANCER_FC_ETH == sli_get_if_type(&hw->sli)) {
+	if ((SLI4_IF_TYPE_LANCER_FC_ETH == sli_get_if_type(&hw->sli)) ||
+	    (SLI4_IF_TYPE_LANCER_G7 == sli_get_if_type(&hw->sli))){
 		return ocs_hw_get_linkcfg_lancer(hw, opts, cb, arg);
 	} else if ((SLI4_IF_TYPE_BE3_SKH_PF == sli_get_if_type(&hw->sli)) ||
 		   (SLI4_IF_TYPE_BE3_SKH_VF == sli_get_if_type(&hw->sli))) {
diff --git a/sys/dev/ocs_fc/ocs_os.h b/sys/dev/ocs_fc/ocs_os.h
index f4e6f3c54f3c..be35755924ef 100644
--- a/sys/dev/ocs_fc/ocs_os.h
+++ b/sys/dev/ocs_fc/ocs_os.h
@@ -1035,14 +1035,16 @@ typedef struct ocs_pci_reg_s {
 #define PCI_MAX_BAR				6
 #define PCI_64BIT_BAR0				0
 
-#define PCI_VENDOR_EMULEX       		0x10df		/* Emulex */
+#define PCI_VENDOR_EMULEX			0x10df	/* Emulex */
 
-#define PCI_PRODUCT_EMULEX_OCE16001		0xe200		/* OneCore 16Gb FC (lancer) */
-#define PCI_PRODUCT_EMULEX_OCE16002		0xe200		/* OneCore 16Gb FC (lancer) */
+#define PCI_PRODUCT_EMULEX_OCE16001		0xe200	/* OneCore 16Gb FC (lancer) */
+#define PCI_PRODUCT_EMULEX_OCE16002		0xe200	/* OneCore 16Gb FC (lancer) */
 #define PCI_PRODUCT_EMULEX_LPE31004		0xe300  /* LightPulse 16Gb x 4 FC (lancer-g6) */
 #define PCI_PRODUCT_EMULEX_LPE32002		0xe300  /* LightPulse 32Gb x 2 FC (lancer-g6) */
+#define PCI_PRODUCT_EMULEX_LANCER_G7		0xf400	/* LightPulse 32Gb x 4 FC (lancer-g7) */
+ 
 #define PCI_PRODUCT_EMULEX_OCE1600_VF		0xe208
-#define PCI_PRODUCT_EMULEX_OCE50102		0xe260		/* OneCore FCoE (lancer) */
+#define PCI_PRODUCT_EMULEX_OCE50102		0xe260	/* OneCore FCoE (lancer) */
 #define PCI_PRODUCT_EMULEX_OCE50102_VF		0xe268
 
 /**
diff --git a/sys/dev/ocs_fc/ocs_pci.c b/sys/dev/ocs_fc/ocs_pci.c
index 018c4e6da8f7..b38ec041b397 100644
--- a/sys/dev/ocs_fc/ocs_pci.c
+++ b/sys/dev/ocs_fc/ocs_pci.c
@@ -102,6 +102,9 @@ ocs_pci_probe(device_t dev)
 	case PCI_PRODUCT_EMULEX_OCE50102:
 		desc = "Emulex LightPulse 10GbE FCoE/NIC Adapter";
 		break;
+	case PCI_PRODUCT_EMULEX_LANCER_G7:
+		desc = "Emulex LightPulse G7 FC Adapter";
+		break;
 	default:
 		return ENXIO;
 	}
@@ -112,9 +115,50 @@ ocs_pci_probe(device_t dev)
 }
 
 static int
-ocs_map_bars(device_t dev, struct ocs_softc *ocs)
+ocs_map_g7_bars(device_t dev, struct ocs_softc *ocs)
 {
+	int i, r;
+	uint32_t  val = 0;
+
+	for (i = 0, r = 0; i < PCI_MAX_BAR; i++) {
+		val = pci_read_config(dev, PCIR_BAR(i), 4);
+		if (!PCI_BAR_MEM(val)) {
+			continue;
+                }
+                if (!(val & PCIM_BAR_MEM_BASE)) {
+			/* no address */
+			continue;
+		}
+		ocs->reg[r].rid = PCIR_BAR(i);
+		ocs->reg[r].res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+				&ocs->reg[r].rid, RF_ACTIVE);
+		if (ocs->reg[r].res) {
+			ocs->reg[r].btag = rman_get_bustag(ocs->reg[r].res);
+			ocs->reg[r].bhandle = rman_get_bushandle(ocs->reg[r].res);
+			r++;
+		} else {
+			device_printf(dev, "bus_alloc_resource failed rid=%#x\n",
+			ocs->reg[r].rid);
+			ocs_release_bus(ocs);
+			return ENXIO;
+		}
 
+		/*
+		 * If the 64-bit attribute is set, both this BAR and the
+		 * next form the complete address. Skip processing the
+		 * next BAR.
+		 */
+		if (val & PCIM_BAR_MEM_64) {
+			i++;
+		}
+	}
+
+	return 0;
+}
+
+static int
+ocs_map_bars(device_t dev, struct ocs_softc *ocs)
+{
 	/*
 	 * Map PCI BAR0 register into the CPU's space.
 	 */
@@ -404,7 +448,7 @@ ocs_device_attach(ocs_t *ocs)
 		goto fail_intr_setup;
 	}
 
-	if(ocs_cam_attach(ocs)) {
+	if (ocs_cam_attach(ocs)) {
 		device_printf(ocs->dev, "cam attach failed \n");
 		goto fail_intr_setup;
 	}
@@ -492,11 +536,18 @@ ocs_pci_attach(device_t dev)
 		pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev));
 
 	/* Map all memory BARs */
-        if (ocs_map_bars(dev, ocs)) {
-		device_printf(dev, "Failed to map pci bars\n");
-		goto release_bus;
-        }
-	
+	if (ocs->pci_device == PCI_PRODUCT_EMULEX_LANCER_G7) {
+		if(ocs_map_g7_bars(dev,ocs)) {
+			device_printf(dev, "Failed to map pci bars\n");
+			goto release_bus;
+		}
+	} else {
+		if (ocs_map_bars(dev, ocs)) {
+			device_printf(dev, "Failed to map pci bars\n");
+			goto release_bus;
+		}
+	}
+
 	/* create a root DMA tag for the device */
 	if (bus_dma_tag_create(bus_get_dma_tag(dev),
 				1,		/* byte alignment */
diff --git a/sys/dev/ocs_fc/sli4.c b/sys/dev/ocs_fc/sli4.c
index c5e7a74203a9..861a5c9b7d56 100644
--- a/sys/dev/ocs_fc/sli4.c
+++ b/sys/dev/ocs_fc/sli4.c
@@ -91,7 +91,8 @@ sli4_asic_entry_t sli4_asic_table[] = {
 	{	0x0,	0x0c,	SLI4_ASIC_TYPE_LANCERG6,SLI4_ASIC_REV_A0},
 	{	0x1,	0x0c,	SLI4_ASIC_TYPE_LANCERG6,SLI4_ASIC_REV_A1},
 	{	0x3,	0x0c,	SLI4_ASIC_TYPE_LANCERG6,SLI4_ASIC_REV_A3},
-
+	{	0x1,	0x0d,   SLI4_ASIC_TYPE_LANCERG7,SLI4_ASIC_REV_A1}, 
+	{	0x10,   0x0d,   SLI4_ASIC_TYPE_LANCERG7,SLI4_ASIC_REV_B0}, 
 	{	0x00,	0x05,	SLI4_ASIC_TYPE_CORSAIR,	SLI4_ASIC_REV_A0},
 };
 
@@ -124,74 +125,126 @@ const sli4_reg_t regmap[SLI4_REG_MAX][SLI4_MAX_IF_TYPES] = {
 	/* SLI4_REG_BMBX */
 	{
 		{ 2, SLI4_BMBX_REG }, { 0, SLI4_BMBX_REG }, { 0, SLI4_BMBX_REG }, { 0, SLI4_BMBX_REG },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX } , { 0, SLI4_BMBX_REG },
 	},
 	/* SLI4_REG_EQCQ_DOORBELL */
 	{
 		{ 2, SLI4_EQCQ_DOORBELL_REG }, { 0, SLI4_EQCQ_DOORBELL_REG },
 		{ 0, SLI4_EQCQ_DOORBELL_REG }, { 0, SLI4_EQCQ_DOORBELL_REG },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ 1, SLI4_IF6_EQ_DOORBELL_REG }
+	},
+	// SLI4_REG_CQ_DOORBELL
+	{
+		{ 2, SLI4_EQCQ_DOORBELL_REG }, { 0, SLI4_EQCQ_DOORBELL_REG },
+		{ 0, SLI4_EQCQ_DOORBELL_REG }, { 0, SLI4_EQCQ_DOORBELL_REG },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ 1, SLI4_IF6_CQ_DOORBELL_REG }
 	},
 	/* SLI4_REG_FCOE_RQ_DOORBELL */
 	{
 		{ 2, SLI4_RQ_DOORBELL_REG }, { 0, SLI4_RQ_DOORBELL_REG },
 		{ 0, SLI4_RQ_DOORBELL_REG }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ 1, SLI4_IF6_RQ_DOORBELL_REG }
 	},
 	/* SLI4_REG_IO_WQ_DOORBELL */
 	{
-		{ 2, SLI4_IO_WQ_DOORBELL_REG }, { 0, SLI4_IO_WQ_DOORBELL_REG }, { 0, SLI4_IO_WQ_DOORBELL_REG }, { UINT32_MAX, UINT32_MAX },
-	},
+		{ 2, SLI4_IO_WQ_DOORBELL_REG }, { 0, SLI4_IO_WQ_DOORBELL_REG },
+		{ 0, SLI4_IO_WQ_DOORBELL_REG }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ 1, SLI4_IF6_WQ_DOORBELL_REG }
+ 	},
 	/* SLI4_REG_MQ_DOORBELL */
 	{
 		{ 2, SLI4_MQ_DOORBELL_REG }, { 0, SLI4_MQ_DOORBELL_REG },
 		{ 0, SLI4_MQ_DOORBELL_REG }, { 0, SLI4_MQ_DOORBELL_REG },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ 1, SLI4_IF6_MQ_DOORBELL_REG }
 	},
 	/* SLI4_REG_PHYSDEV_CONTROL */
 	{
-		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX }, { 0, SLI4_PHSDEV_CONTROL_REG_23 }, { 0, SLI4_PHSDEV_CONTROL_REG_23 },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ 0, SLI4_PHSDEV_CONTROL_REG_236 }, { 0, SLI4_PHSDEV_CONTROL_REG_236 },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ 0, SLI4_PHSDEV_CONTROL_REG_236 }
 	},
 	/* SLI4_REG_SLIPORT_CONTROL */
 	{
-		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX }, { 0, SLI4_SLIPORT_CONTROL_REG }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ 0, SLI4_SLIPORT_CONTROL_REG }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ 0, SLI4_SLIPORT_CONTROL_REG },
 	},
 	/* SLI4_REG_SLIPORT_ERROR1 */
 	{
-		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX }, { 0, SLI4_SLIPORT_ERROR1 }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ 0, SLI4_SLIPORT_ERROR1 }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ 0, SLI4_SLIPORT_ERROR1 },
 	},
 	/* SLI4_REG_SLIPORT_ERROR2 */
 	{
-		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX }, { 0, SLI4_SLIPORT_ERROR2 }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ 0, SLI4_SLIPORT_ERROR2 }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ 0, SLI4_SLIPORT_ERROR2 },
 	},
 	/* SLI4_REG_SLIPORT_SEMAPHORE */
 	{
 		{ 1, SLI4_PORT_SEMAPHORE_REG_0 },  { 0, SLI4_PORT_SEMAPHORE_REG_1 },
-		{ 0, SLI4_PORT_SEMAPHORE_REG_23 }, { 0, SLI4_PORT_SEMAPHORE_REG_23 },
+		{ 0, SLI4_PORT_SEMAPHORE_REG_236 }, { 0, SLI4_PORT_SEMAPHORE_REG_236 },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX }, 
+		{ 0, SLI4_PORT_SEMAPHORE_REG_236 },
 	},
 	/* SLI4_REG_SLIPORT_STATUS */
 	{
-		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX }, { 0, SLI4_PORT_STATUS_REG_23 }, { 0, SLI4_PORT_STATUS_REG_23 },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ 0, SLI4_PORT_STATUS_REG_236 }, { 0, SLI4_PORT_STATUS_REG_236 },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ 0, SLI4_PORT_STATUS_REG_236 },
 	},
 	/* SLI4_REG_UERR_MASK_HI */
 	{
-		{ 0, SLI4_UERR_MASK_HIGH_REG }, { UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ 0, SLI4_UERR_MASK_HIGH_REG }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }
 	},
 	/* SLI4_REG_UERR_MASK_LO */
 	{
-		{ 0, SLI4_UERR_MASK_LOW_REG }, { UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ 0, SLI4_UERR_MASK_LOW_REG }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }
 	},
 	/* SLI4_REG_UERR_STATUS_HI */
 	{
-		{ 0, SLI4_UERR_STATUS_HIGH_REG }, { UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ 0, SLI4_UERR_STATUS_HIGH_REG }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }
 	},
 	/* SLI4_REG_UERR_STATUS_LO */
 	{
-		{ 0, SLI4_UERR_STATUS_LOW_REG }, { UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ 0, SLI4_UERR_STATUS_LOW_REG }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }
 	},
 	/* SLI4_REG_SW_UE_CSR1 */
 	{
-		{ 1, SLI4_SW_UE_CSR1}, { UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ 1, SLI4_SW_UE_CSR1}, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }
 	},
 	/* SLI4_REG_SW_UE_CSR2 */
 	{
-		{ 1, SLI4_SW_UE_CSR2}, { UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ 1, SLI4_SW_UE_CSR2}, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }, { UINT32_MAX, UINT32_MAX },
+		{ UINT32_MAX, UINT32_MAX }
 	},
 };
 
@@ -1742,6 +1795,7 @@ sli_cmd_common_create_cq(sli4_t *sli4, void *buf, size_t size,
 		cmd_size = sizeof(sli4_req_common_create_cq_v0_t) + (8 * num_pages);
 		break;
 	case SLI4_IF_TYPE_LANCER_FC_ETH:
+	case SLI4_IF_TYPE_LANCER_G7:
 		n_cqe = qmem->size / SLI4_CQE_BYTES;
 		switch (n_cqe) {
 		case 256:
@@ -1818,6 +1872,7 @@ sli_cmd_common_create_cq(sli4_t *sli4, void *buf, size_t size,
 
 		break;
 	case SLI4_IF_TYPE_LANCER_FC_ETH:
+	case SLI4_IF_TYPE_LANCER_G7:
 	{
 		cqv2 = (sli4_req_common_create_cq_v2_t *)((uint8_t *)buf + sli_config_off);
 		cqv2->hdr.opcode = SLI4_OPC_COMMON_CREATE_CQ;
@@ -1825,6 +1880,9 @@ sli_cmd_common_create_cq(sli4_t *sli4, void *buf, size_t size,
 		cqv2->hdr.version = 2;
 		cqv2->hdr.request_length = cmd_size - sizeof(sli4_req_hdr_t);
 
+		if (if_type == SLI4_IF_TYPE_LANCER_G7)
+			cqv2->autovalid = TRUE;
+
 		cqv2->page_size = page_size;
 
 		/* valid values for number of pages: 1, 2, 4, 8 (sec 4.4.3) */
@@ -2000,6 +2058,10 @@ sli_cmd_common_create_eq(sli4_t *sli4, void *buf, size_t size, ocs_dma_t *qmem,
 	eq->hdr.subsystem = SLI4_SUBSYSTEM_COMMON;
 	eq->hdr.request_length = sizeof(sli4_req_common_create_eq_t) -
 					sizeof(sli4_req_hdr_t);
+	if (sli4->if_type == SLI4_IF_TYPE_LANCER_G7) {
+		eq->hdr.version = 2;
+		eq->autovalid = TRUE;
+	}
 	/* valid values for number of pages: 1, 2, 4 (sec 4.4.3) */
 	eq->num_pages = qmem->size / SLI_PAGE_SIZE;
 	switch (eq->num_pages) {
@@ -2453,6 +2515,7 @@ sli_cmd_common_get_port_name(sli4_t *sli4, void *buf, size_t size)
 		break;
 	case SLI4_IF_TYPE_LANCER_FC_ETH:
 	case SLI4_IF_TYPE_LANCER_RDMA:
+	case SLI4_IF_TYPE_LANCER_G7:
 		version = 1;
 		break;
 	default:
@@ -3324,6 +3387,7 @@ sli_fw_init(sli4_t *sli4)
 		}
 		break;
 	case SLI4_IF_TYPE_LANCER_FC_ETH:
+	case SLI4_IF_TYPE_LANCER_G7:
 #if BYTE_ORDER == LITTLE_ENDIAN
 		endian = SLI4_SLIPORT_CONTROL_LITTLE_ENDIAN;
 #else
@@ -3402,11 +3466,17 @@ sli_queue_doorbell(sli4_t *sli4, sli4_queue_t *q)
 
 	switch (q->type) {
 	case SLI_QTYPE_EQ:
-		val = sli_eq_doorbell(q->n_posted, q->id, FALSE);
+		if (sli4->if_type == SLI4_IF_TYPE_LANCER_G7)
+			val = sli_iftype6_eq_doorbell(q->n_posted, q->id, FALSE);
+		else
+			val = sli_eq_doorbell(q->n_posted, q->id, FALSE);
 		ocs_reg_write32(sli4->os, q->doorbell_rset, q->doorbell_offset, val);
 		break;
 	case SLI_QTYPE_CQ:
-		val = sli_cq_doorbell(q->n_posted, q->id, FALSE);
+		if (sli4->if_type == SLI4_IF_TYPE_LANCER_G7)
+			val = sli_iftype6_cq_doorbell(q->n_posted, q->id, FALSE);
+		else
+			val = sli_cq_doorbell(q->n_posted, q->id, FALSE);
 		ocs_reg_write32(sli4->os, q->doorbell_rset, q->doorbell_offset, val);
 		break;
 	case SLI_QTYPE_MQ:
@@ -3450,7 +3520,13 @@ sli_queue_doorbell(sli4_t *sli4, sli4_queue_t *q)
 		break;
 	}
 	case SLI_QTYPE_WQ:
-		val = SLI4_WQ_DOORBELL(q->n_posted, q->index, q->id);
+		if (sli4->if_type == SLI4_IF_TYPE_LANCER_G7) {
+			val = SLI4_WQ_DOORBELL(q->n_posted, 0, q->id);
+		} else {
+			/* For iftype = 2 and 3, q->index value is ignored */
+			val = SLI4_WQ_DOORBELL(q->n_posted, q->index, q->id);
+		}
+
 		ocs_reg_write32(sli4->os, q->doorbell_rset, q->doorbell_offset, val);
 		break;
 	default:
@@ -3643,7 +3719,7 @@ sli_get_config(sli4_t *sli4)
 			sli4->config.extent[SLI_RSRC_FCOE_RPI].size = read_config->rpi_count;
 
 			sli4->config.extent[SLI_RSRC_FCOE_XRI].base[0] = read_config->xri_base;
-			sli4->config.extent[SLI_RSRC_FCOE_XRI].size = read_config->xri_count;
+			sli4->config.extent[SLI_RSRC_FCOE_XRI].size = OCS_MIN(255,read_config->xri_count);
 
 			sli4->config.extent[SLI_RSRC_FCOE_FCFI].base[0] = 0;
 			sli4->config.extent[SLI_RSRC_FCOE_FCFI].size = read_config->fcfi_count;
@@ -4004,7 +4080,8 @@ sli_setup(sli4_t *sli4, ocs_os_handle_t os, sli4_port_type_e port_type)
 
 	sli4->if_type = sli_intf_if_type(sli_intf);
 
-	if (SLI4_IF_TYPE_LANCER_FC_ETH == sli4->if_type) {
+	if ((SLI4_IF_TYPE_LANCER_FC_ETH == sli4->if_type) ||
+	   (SLI4_IF_TYPE_LANCER_G7 == sli4->if_type)) {
 		ocs_log_debug(os, "status=%#x error1=%#x error2=%#x\n",
 				sli_reg_read(sli4, SLI4_REG_SLIPORT_STATUS),
 				sli_reg_read(sli4, SLI4_REG_SLIPORT_ERROR1),
@@ -4336,6 +4413,11 @@ __sli_queue_init(sli4_t *sli4, sli4_queue_t *q, uint32_t qtype,
 		/* Limit to hwf the queue size per interrupt */
 		q->proc_limit = n_entries / 2;
 
+		if ( (q->type == SLI_QTYPE_EQ) || (q->type == SLI_QTYPE_CQ) ) {
+		/* For prism, phase will be flipped after a sweep through eq and cq */
+			q->phase = 1;
+		}
+
 		switch(q->type) {
 		case SLI_QTYPE_EQ:
 			q->posted_limit = q->length / 2;
@@ -4397,13 +4479,13 @@ __sli_create_queue(sli4_t *sli4, sli4_queue_t *q)
 		switch (q->type) {
 		case SLI_QTYPE_EQ:
 			/* No doorbell information in response for EQs */
-			q->doorbell_offset = regmap[SLI4_REG_EQCQ_DOORBELL][sli4->if_type].off;
-			q->doorbell_rset = regmap[SLI4_REG_EQCQ_DOORBELL][sli4->if_type].rset;
+			q->doorbell_offset = regmap[SLI4_REG_EQ_DOORBELL][sli4->if_type].off;
+			q->doorbell_rset   = regmap[SLI4_REG_EQ_DOORBELL][sli4->if_type].rset;
 			break;
 		case SLI_QTYPE_CQ:
 			/* No doorbell information in response for CQs */
-			q->doorbell_offset = regmap[SLI4_REG_EQCQ_DOORBELL][sli4->if_type].off;
-			q->doorbell_rset = regmap[SLI4_REG_EQCQ_DOORBELL][sli4->if_type].rset;
+			q->doorbell_offset = regmap[SLI4_REG_CQ_DOORBELL][sli4->if_type].off;
+			q->doorbell_rset = regmap[SLI4_REG_CQ_DOORBELL][sli4->if_type].rset;
 			break;
 		case SLI_QTYPE_MQ:
 			/* No doorbell information in response for MQs */
@@ -4711,6 +4793,9 @@ sli_cq_alloc_set(sli4_t *sli4, sli4_queue_t *qs[], uint32_t num_cqs,
 	req->arm = FALSE;
 	req->num_cq_req = num_cqs;
 
+	if (sli4->if_type == SLI4_IF_TYPE_LANCER_G7)
+		req->autovalid = TRUE;
+
 	/* Fill page addresses of all the CQs. */
 	for (i = 0; i < num_cqs; i++) {
 		req->eq_id[i] = eqs[i]->id;
@@ -4741,8 +4826,8 @@ sli_cq_alloc_set(sli4_t *sli4, sli4_queue_t *qs[], uint32_t num_cqs,
 		/* Fill the resp cq ids. */
 		for (i = 0; i < num_cqs; i++) {
 			qs[i]->id = res->q_id + i;
-			qs[i]->doorbell_offset = regmap[SLI4_REG_EQCQ_DOORBELL][sli4->if_type].off;
-			qs[i]->doorbell_rset   = regmap[SLI4_REG_EQCQ_DOORBELL][sli4->if_type].rset;
+			qs[i]->doorbell_offset = regmap[SLI4_REG_CQ_DOORBELL][sli4->if_type].off;
+			qs[i]->doorbell_rset   = regmap[SLI4_REG_CQ_DOORBELL][sli4->if_type].rset;
 		}
 	}
 
@@ -4941,9 +5026,13 @@ sli_queue_eq_arm(sli4_t *sli4, sli4_queue_t *q, uint8_t arm)
 	uint32_t	val = 0;
 
 	ocs_lock(&q->lock);
+	if (sli4->if_type == SLI4_IF_TYPE_LANCER_G7)
+		val = sli_iftype6_eq_doorbell(q->n_posted, q->id, arm);
+	else
 		val = sli_eq_doorbell(q->n_posted, q->id, arm);
-		ocs_reg_write32(sli4->os, q->doorbell_rset, q->doorbell_offset, val);
-		q->n_posted = 0;
+
+	ocs_reg_write32(sli4->os, q->doorbell_rset, q->doorbell_offset, val);
+	q->n_posted = 0;
 	ocs_unlock(&q->lock);
 
 	return 0;
@@ -4968,12 +5057,18 @@ sli_queue_arm(sli4_t *sli4, sli4_queue_t *q, uint8_t arm)
 
 	switch (q->type) {
 	case SLI_QTYPE_EQ:
-		val = sli_eq_doorbell(q->n_posted, q->id, arm);
+		if (sli4->if_type == SLI4_IF_TYPE_LANCER_G7)
+			val = sli_iftype6_eq_doorbell(q->n_posted, q->id, arm);
+		else
+			val = sli_eq_doorbell(q->n_posted, q->id, arm);
 		ocs_reg_write32(sli4->os, q->doorbell_rset, q->doorbell_offset, val);
 		q->n_posted = 0;
 		break;
 	case SLI_QTYPE_CQ:
-		val = sli_cq_doorbell(q->n_posted, q->id, arm);
+		if (sli4->if_type == SLI4_IF_TYPE_LANCER_G7)
+			val = sli_iftype6_cq_doorbell(q->n_posted, q->id, arm);
+		else
+			val = sli_cq_doorbell(q->n_posted, q->id, arm);
 		ocs_reg_write32(sli4->os, q->doorbell_rset, q->doorbell_offset, val);
 		q->n_posted = 0;
 		break;
@@ -5089,10 +5184,11 @@ static uint8_t
 sli_queue_entry_is_valid(sli4_queue_t *q, uint8_t *qe, uint8_t clear)
 {
 	uint8_t		valid = FALSE;
+	uint8_t		valid_bit_set = 0;
 
 	switch (q->type) {
 	case SLI_QTYPE_EQ:
-		valid = ((sli4_eqe_t *)qe)->vld;
+		valid = (((sli4_eqe_t *)qe)->vld == q->phase) ? 1 : 0;
 		if (valid && clear) {
 			((sli4_eqe_t *)qe)->vld = 0;
 		}
@@ -5102,7 +5198,10 @@ sli_queue_entry_is_valid(sli4_queue_t *q, uint8_t *qe, uint8_t clear)
 		 * For both MCQE and WCQE/RCQE, the valid bit
 		 * is bit 31 of dword 3 (0 based)
 		 */
-		valid = (qe[15] & 0x80) != 0;
+		valid_bit_set = (qe[15] & 0x80) != 0;
+		if (valid_bit_set == q->phase)
+			valid = 1;
+
 		if (valid & clear) {
 			qe[15] &= ~0x80;
 		}
@@ -5119,6 +5218,7 @@ sli_queue_entry_is_valid(sli4_queue_t *q, uint8_t *qe, uint8_t clear)
 	}
 
 	if (clear) {
+
 		ocs_dma_sync(&q->dma, OCS_DMASYNC_PREWRITE);
 	}
 
@@ -5142,6 +5242,7 @@ sli_queue_read(sli4_t *sli4, sli4_queue_t *q, uint8_t *entry)
 	uint8_t		*qe = q->dma.virt;
 	uint32_t	*qindex = NULL;
 
+	uint8_t 	clear = (SLI4_IF_TYPE_LANCER_G7 == sli_get_if_type(sli4)) ?  FALSE : TRUE;
 	if (SLI_QTYPE_MQ == q->type) {
 		qindex = &q->u.r_idx;
 	} else {
@@ -5154,7 +5255,7 @@ sli_queue_read(sli4_t *sli4, sli4_queue_t *q, uint8_t *entry)
 
 	qe += *qindex * q->size;
 
-	if (!sli_queue_entry_is_valid(q, qe, TRUE)) {
+	if (!sli_queue_entry_is_valid(q, qe, clear)) {
 		ocs_unlock(&q->lock);
 		return -1;
 	}
@@ -5185,6 +5286,13 @@ sli_queue_read(sli4_t *sli4, sli4_queue_t *q, uint8_t *entry)
 			*qindex = (*qindex + 1) & (q->length - 1);
 			if (SLI_QTYPE_MQ != q->type) {
 				q->n_posted++;
+				/*
+				 * For prism, the phase value will be used to check the validity of eq/cq entries.
+				 * The value toggles after a complete sweep through the queue.
+				 */
+				if ((SLI4_IF_TYPE_LANCER_G7 == sli_get_if_type(sli4)) && (*qindex == 0)) {
+					q->phase ^= (uint16_t) 0x1;
+				}
 			}
 			break;
 		default:
@@ -5507,8 +5615,9 @@ int32_t sli_raise_ue(sli4_t *sli4, uint8_t dump)
 			ocs_log_test(sli4->os, "invalid asic type %d\n", sli_get_asic_type(sli4));
 			return -1;
 		}
-	} else if (SLI4_IF_TYPE_LANCER_FC_ETH == sli_get_if_type(sli4)) {	
-		if (dump == FDD) {
+	} else if ((SLI4_IF_TYPE_LANCER_FC_ETH == sli_get_if_type(sli4)) ||
+		   (SLI4_IF_TYPE_LANCER_G7 == sli_get_if_type(sli4))) {
+		if (FDD == dump) {
 			sli_reg_write(sli4, SLI4_REG_SLIPORT_CONTROL, SLI4_SLIPORT_CONTROL_FDD | SLI4_SLIPORT_CONTROL_IP);
 		} else {
 			uint32_t value = SLI4_PHYDEV_CONTROL_FRST;
@@ -5552,7 +5661,8 @@ int32_t sli_dump_is_ready(sli4_t *sli4)
 			rc = 1;
 		}
 
-	} else if (SLI4_IF_TYPE_LANCER_FC_ETH == sli_get_if_type(sli4)) {
+	} else if ((SLI4_IF_TYPE_LANCER_FC_ETH == sli_get_if_type(sli4)) ||
+		   (SLI4_IF_TYPE_LANCER_G7 == sli_get_if_type(sli4))) {
 		/*
 		 * Ensure that the port is ready AND the mailbox is
 		 * ready before signaling that the dump is ready to go.
@@ -5562,7 +5672,7 @@ int32_t sli_dump_is_ready(sli4_t *sli4)
 
 		if ((bmbx_val & SLI4_BMBX_RDY) &&
 		    SLI4_PORT_STATUS_READY(port_val)) { 
-		    	if(SLI4_PORT_STATUS_DUMP_PRESENT(port_val)) {
+			if(SLI4_PORT_STATUS_DUMP_PRESENT(port_val)) {
 				rc = 1;
 			}else if( SLI4_PORT_STATUS_FDP_PRESENT(port_val)) {
 				rc = 2;
@@ -5591,7 +5701,8 @@ int32_t sli_dump_is_present(sli4_t *sli4)
 	uint32_t val;
 	uint32_t ready;
 
-	if (SLI4_IF_TYPE_LANCER_FC_ETH != sli_get_if_type(sli4)) {
+	if ((SLI4_IF_TYPE_LANCER_FC_ETH != sli_get_if_type(sli4)) &&
+	    (SLI4_IF_TYPE_LANCER_G7 != sli_get_if_type(sli4))) {
 		ocs_log_test(sli4->os, "Function only supported for I/F type 2");
 		return -1;
 	}
@@ -5678,7 +5789,8 @@ int32_t sli_fw_error_status(sli4_t *sli4)
 			    (uerr_mask_hi & uerr_status_hi) != 0) {
 				rc = 1;
 			}
-		} else if ((SLI4_IF_TYPE_LANCER_FC_ETH == sli4->if_type)) {
+		} else if (SLI4_IF_TYPE_LANCER_FC_ETH == sli4->if_type ||
+	           SLI4_IF_TYPE_LANCER_G7 == sli4->if_type) {
 			uint32_t sliport_status;
 
 			sliport_status = sli_reg_read(sli4, SLI4_REG_SLIPORT_STATUS);
@@ -5712,9 +5824,10 @@ sli_fw_ready(sli4_t *sli4)
 	    SLI4_IF_TYPE_BE3_SKH_VF == sli4->if_type) {
 		val = sli_reg_read(sli4, SLI4_REG_SLIPORT_SEMAPHORE);
 		rc = ((SLI4_PORT_SEMAPHORE_STATUS_POST_READY ==
-		       SLI4_PORT_SEMAPHORE_PORT(val)) &&
-		      (!SLI4_PORT_SEMAPHORE_IN_ERR(val)) ? 1 : 0);
-	} else if (SLI4_IF_TYPE_LANCER_FC_ETH == sli4->if_type) {
+		    SLI4_PORT_SEMAPHORE_PORT(val)) &&
+		    (!SLI4_PORT_SEMAPHORE_IN_ERR(val)) ? 1 : 0);
+	} else if (SLI4_IF_TYPE_LANCER_FC_ETH == sli4->if_type ||
+		   SLI4_IF_TYPE_LANCER_G7 == sli4->if_type) {
 		val = sli_reg_read(sli4, SLI4_REG_SLIPORT_STATUS);
 		rc = (SLI4_PORT_STATUS_READY(val) ? 1 : 0);
 	}
@@ -5746,6 +5859,7 @@ int32_t sli_link_is_configurable(sli4_t *sli)
 		rc = 1;
 		break;
 	case SLI4_ASIC_TYPE_LANCERG6:
+	case SLI4_ASIC_TYPE_LANCERG7:
 	case SLI4_ASIC_TYPE_BE3:
 	default:
 		rc = 0;
@@ -5775,7 +5889,7 @@ int32_t sli_link_is_configurable(sli4_t *sli)
  */
 int32_t
 sli_cmd_fcoe_wq_create(sli4_t *sli4, void *buf, size_t size,
-		       ocs_dma_t *qmem, uint16_t cq_id, uint16_t ulp)
+			ocs_dma_t *qmem, uint16_t cq_id, uint16_t ulp)
 {
 	sli4_req_fcoe_wq_create_t	*wq = NULL;
 	uint32_t	sli_config_off = 0;
diff --git a/sys/dev/ocs_fc/sli4.h b/sys/dev/ocs_fc/sli4.h
index 04d50353dd51..93dd2ca89393 100644
--- a/sys/dev/ocs_fc/sli4.h
+++ b/sys/dev/ocs_fc/sli4.h
@@ -114,7 +114,8 @@ sli_page_count(size_t bytes, uint32_t page_size)
 #define SLI4_IF_TYPE_BE3_SKH_VF		1
 #define SLI4_IF_TYPE_LANCER_FC_ETH	2
 #define SLI4_IF_TYPE_LANCER_RDMA	3
-#define SLI4_MAX_IF_TYPES		4
+#define SLI4_IF_TYPE_LANCER_G7		6
+#define SLI4_MAX_IF_TYPES		7
 
 /**
  * @brief ASIC_ID - SLI ASIC Type and Revision Register
@@ -152,7 +153,7 @@ sli_page_count(size_t bytes, uint32_t page_size)
 /**
  * @brief EQCQ_DOORBELL - EQ and CQ Doorbell Register
  */
-#define SLI4_EQCQ_DOORBELL_REG		0x120
+#define SLI4_EQCQ_DOORBELL_REG			0x120
 #define SLI4_EQCQ_DOORBELL_CI			BIT(9)
 #define SLI4_EQCQ_DOORBELL_QT			BIT(10)
 #define SLI4_EQCQ_DOORBELL_ARM			BIT(29)
@@ -164,6 +165,8 @@ sli_page_count(size_t bytes, uint32_t page_size)
 #define SLI4_EQCQ_EQ_ID_MASK_LO			0x01ff
 #define SLI4_EQCQ_CQ_ID_MASK_LO			0x03ff
 #define SLI4_EQCQ_EQCQ_ID_MASK_HI		0xf800
+#define SLI4_IF6_EQ_DOORBELL_REG		0x120
+#define SLI4_IF6_CQ_DOORBELL_REG		0xC0
 
 /**
  * @brief SLIPORT_CONTROL - SLI Port Control Register
@@ -259,10 +262,56 @@ static inline uint32_t sli_cq_doorbell(uint16_t n_popped, uint16_t id, uint8_t a
 	return reg;
 }
 
+static inline uint32_t sli_iftype6_eq_doorbell(uint16_t n_popped, uint16_t id, uint8_t arm)
+{
+	uint32_t	reg = 0;
+#if BYTE_ORDER == LITTLE_ENDIAN
+	struct {
+		uint32_t	eq_id:12,
+				:4,			/* clear interrupt */
+				number_popped:13,
+				arm:1,
+				:1,
+				io:1;
+	} * eq_doorbell = (void *)&reg;
+#else
+#error big endian version not defined
+#endif
+
+	eq_doorbell->eq_id = id;
+	eq_doorbell->number_popped = n_popped;
+	eq_doorbell->arm = arm;
+
+	return reg;
+}
+
+static inline uint32_t sli_iftype6_cq_doorbell(uint16_t n_popped, uint16_t id, uint8_t arm)
+{
+	uint32_t	reg = 0;
+#if BYTE_ORDER == LITTLE_ENDIAN
+	struct {
+		uint32_t	cq_id:16,
+				number_popped:13,
+				arm:1,
+				:1,
+				se:1;
+	} * cq_doorbell = (void *)&reg;
+#else
+#error big endian version not defined
+#endif
+
+	cq_doorbell->cq_id = id;
+	cq_doorbell->number_popped = n_popped;
+	cq_doorbell->arm = arm;
+
+	return reg;
+}
+
 /**
  * @brief MQ_DOORBELL - MQ Doorbell Register
  */
-#define SLI4_MQ_DOORBELL_REG		0x0140	/* register offset */
+#define SLI4_MQ_DOORBELL_REG			0x0140	/* register offset */
+#define SLI4_IF6_MQ_DOORBELL_REG		0x0160	/* register offset if_type = 6 */
 #define SLI4_MQ_DOORBELL_NUM_SHIFT		16
 #define SLI4_MQ_DOORBELL_NUM_MASK		0x3fff
 #define SLI4_MQ_DOORBELL_ID_MASK		0xffff
@@ -272,7 +321,8 @@ static inline uint32_t sli_cq_doorbell(uint16_t n_popped, uint16_t id, uint8_t a
 /**
  * @brief RQ_DOORBELL - RQ Doorbell Register
  */
-#define SLI4_RQ_DOORBELL_REG		0x0a0	/* register offset */
+#define SLI4_RQ_DOORBELL_REG			0x0a0	/* register offset */
+#define SLI4_IF6_RQ_DOORBELL_REG	0x0080	/* register offset of if_type = 6 */
 #define SLI4_RQ_DOORBELL_NUM_SHIFT		16
 #define SLI4_RQ_DOORBELL_NUM_MASK		0x3fff
 #define SLI4_RQ_DOORBELL_ID_MASK		0xffff
@@ -282,7 +332,8 @@ static inline uint32_t sli_cq_doorbell(uint16_t n_popped, uint16_t id, uint8_t a
 /**
  * @brief WQ_DOORBELL - WQ Doorbell Register
  */
-#define SLI4_IO_WQ_DOORBELL_REG		0x040	/* register offset */
+#define SLI4_IO_WQ_DOORBELL_REG			0x040	/* register offset */
+#define SLI4_IF6_WQ_DOORBELL_REG		0x040	/* register offset for if_type = 6 */
 #define SLI4_WQ_DOORBELL_IDX_SHIFT		16
 #define SLI4_WQ_DOORBELL_IDX_MASK		0x00ff
 #define SLI4_WQ_DOORBELL_NUM_SHIFT		24
@@ -297,7 +348,7 @@ static inline uint32_t sli_cq_doorbell(uint16_t n_popped, uint16_t id, uint8_t a
  */
 #define SLI4_PORT_SEMAPHORE_REG_0	0x00ac	/** register offset Interface Type 0 + 1 */
 #define SLI4_PORT_SEMAPHORE_REG_1	0x0180	/** register offset Interface Type 0 + 1 */
-#define SLI4_PORT_SEMAPHORE_REG_23	0x0400	/** register offset Interface Type 2 + 3 */
+#define SLI4_PORT_SEMAPHORE_REG_236	0x0400	/** register offset Interface Type 2 + 3 + 6*/
 #define SLI4_PORT_SEMAPHORE_PORT_MASK		0x0000ffff
 #define SLI4_PORT_SEMAPHORE_PORT(r)		((r) & SLI4_PORT_SEMAPHORE_PORT_MASK)
 #define SLI4_PORT_SEMAPHORE_HOST_MASK		0x00ff0000
@@ -321,7 +372,7 @@ static inline uint32_t sli_cq_doorbell(uint16_t n_popped, uint16_t id, uint8_t a
  * @brief SLIPORT_STATUS - SLI Port Status Register
  */
 
-#define SLI4_PORT_STATUS_REG_23		0x0404	/** register offset Interface Type 2 + 3 */
+#define SLI4_PORT_STATUS_REG_236	0x0404	/** register offset Interface Type 2 + 3 + 6*/
 #define SLI4_PORT_STATUS_FDP			BIT(21)	/** function specific dump present */
 #define SLI4_PORT_STATUS_RDY			BIT(23)	/** ready */
 #define SLI4_PORT_STATUS_RN			BIT(24)	/** reset needed */
@@ -334,8 +385,7 @@ static inline uint32_t sli_cq_doorbell(uint16_t n_popped, uint16_t id, uint8_t a
 #define SLI4_PORT_STATUS_DUMP_PRESENT(r)	((r) & SLI4_PORT_STATUS_DIP)
 #define SLI4_PORT_STATUS_FDP_PRESENT(r)		((r) & SLI4_PORT_STATUS_FDP)
 
-
-#define SLI4_PHSDEV_CONTROL_REG_23		0x0414	/** register offset Interface Type 2 + 3 */
+#define SLI4_PHSDEV_CONTROL_REG_236		0x0414	/** register offset Interface Type 2 + 3 + 6*/
 #define SLI4_PHYDEV_CONTROL_DRST		BIT(0)	/** physical device reset */
 #define SLI4_PHYDEV_CONTROL_FRST		BIT(1)	/** firmware reset */
 #define SLI4_PHYDEV_CONTROL_DD			BIT(2)	/** diagnostic dump */
@@ -1565,7 +1615,8 @@ typedef struct sli4_req_common_create_cq_v2_s {
 			clswm:2,
 			nodelay:1,
 			autovalid:1,
-			:11,
+			:9,
+			cqe_size:2,
 			cqecnt:2,
 			valid:1,
 			:1,
@@ -1703,7 +1754,8 @@ typedef struct sli4_req_common_create_eq_s {
 #if BYTE_ORDER == LITTLE_ENDIAN
 	uint32_t	num_pages:16,
 			:16;
-	uint32_t	:29,
+	uint32_t	:28,
+			autovalid:1,
 			valid:1,
 			:1,
 			eqesz:1;
@@ -2979,7 +3031,8 @@ typedef struct sli4_acqe_s {
  */
 typedef enum {
 	SLI4_REG_BMBX,
-	SLI4_REG_EQCQ_DOORBELL,
+	SLI4_REG_EQ_DOORBELL,
+	SLI4_REG_CQ_DOORBELL,
 	SLI4_REG_FCOE_RQ_DOORBELL,
 	SLI4_REG_IO_WQ_DOORBELL,
 	SLI4_REG_MQ_DOORBELL,
@@ -3046,6 +3099,9 @@ typedef struct sli4_queue_s {
 	uint32_t	max_num_processed;
 	time_t		max_process_time;
 
+	uint16_t 	phase;		/** For if_type = 6, this value toggle for each iteration
+					    of the queue, a queue entry is valid when a cqe valid
+					    bit matches this value */
 	/* Type specific gunk */
 	union {
 		uint32_t	r_idx;	/** "read" index (MQ only) */
@@ -3151,6 +3207,7 @@ typedef enum {
 	SLI4_ASIC_TYPE_LANCER,
 	SLI4_ASIC_TYPE_CORSAIR,
 	SLI4_ASIC_TYPE_LANCERG6,
+	SLI4_ASIC_TYPE_LANCERG7
 } sli4_asic_type_e;
 
 typedef enum {