Skip to contentSkip to conversation

net/qede: add support for new HW

PATCH In review Rasesh Mody 1 participant 8 messages Feb 19, 2021 Network drivers

lore
Share & tools
lore
#0 lore raw

cover net/qede: add support for new HW

Hi,

This patch series adds support for new HW while modifying existing driver to continue supporting previous HWs. Highlights of changes:
- Registers, HW specific and initialization updates for new HW
- FW upgrade
- Base driver upgrade, other optimizations and cleanup

The new 50xxx family of Marvell QLogic fastlinq adapters will bring in support for higher speeds, will increase max PPS rates significantly. This family will eventually support flexible flow steering and various in-device switching modes.

At the same time, that’s the same architecture and design, as with previous QEDE driver. Thus, a lot of fast path and slow path code is expected to be the same.

Please note for checkpatch 100 character max_line_length was used.

Thanks,
Rasesh

Rasesh Mody (7):
net/qede/base: update and add register definitions net/qede/base: changes for HSI to support new HW net/qede/base: add OS abstracted changes net/qede/base: update base driver to 8.62.4.0 net/qede: changes for DMA page chain allocation and free net/qede: add support for new HW
net/qede/base: clean unnecessary ifdef and comments

 drivers/net/qede/base/bcm_osal.c              |      1 -
 drivers/net/qede/base/bcm_osal.h              |     42 +-
 drivers/net/qede/base/common_hsi.h            |   1752 +-
 drivers/net/qede/base/ecore.h                 |    575 +-
 drivers/net/qede/base/ecore_attn_values.h     |      3 +-
 drivers/net/qede/base/ecore_chain.h           |    242 +-
 drivers/net/qede/base/ecore_cxt.c             |   1234 +-
 drivers/net/qede/base/ecore_cxt.h             |    149 +-
 drivers/net/qede/base/ecore_cxt_api.h         |     31 +-
 drivers/net/qede/base/ecore_dcbx.c            |    526 +-
 drivers/net/qede/base/ecore_dcbx.h            |     16 +-
 drivers/net/qede/base/ecore_dcbx_api.h        |     41 +-
 drivers/net/qede/base/ecore_dev.c             |   4083 +-
 drivers/net/qede/base/ecore_dev_api.h         |    367 +-
 drivers/net/qede/base/ecore_gtt_reg_addr.h    |     93 +-
 drivers/net/qede/base/ecore_gtt_values.h      |      4 +-
 drivers/net/qede/base/ecore_hsi_common.h      |   2722 +-
 drivers/net/qede/base/ecore_hsi_debug_tools.h |    426 +-
 drivers/net/qede/base/ecore_hsi_eth.h         |   4541 +-
 drivers/net/qede/base/ecore_hsi_func_common.h |      5 +-
 drivers/net/qede/base/ecore_hsi_init_func.h   |    707 +-
 drivers/net/qede/base/ecore_hsi_init_tool.h   |    254 +-
 drivers/net/qede/base/ecore_hw.c              |    386 +-
 drivers/net/qede/base/ecore_hw.h              |     55 +-
 drivers/net/qede/base/ecore_hw_defs.h         |     45 +-
 drivers/net/qede/base/ecore_init_fw_funcs.c   |   1365 +-
 drivers/net/qede/base/ecore_init_fw_funcs.h   |    457 +-
 drivers/net/qede/base/ecore_init_ops.c        |    159 +-
 drivers/net/qede/base/ecore_init_ops.h        |     19 +-
 drivers/net/qede/base/ecore_int.c             |   1363 +-
 drivers/net/qede/base/ecore_int.h             |     65 +-
 drivers/net/qede/base/ecore_int_api.h         |    127 +-
 drivers/net/qede/base/ecore_iov_api.h         |    118 +-
 drivers/net/qede/base/ecore_iro.h             |    427 +-
 drivers/net/qede/base/ecore_iro_values.h      |    463 +-
 drivers/net/qede/base/ecore_l2.c              |    497 +-
 drivers/net/qede/base/ecore_l2.h              |     18 +-
 drivers/net/qede/base/ecore_l2_api.h          |    148 +-
 drivers/net/qede/base/ecore_mcp.c             |   2631 +-
 drivers/net/qede/base/ecore_mcp.h             |    125 +-
 drivers/net/qede/base/ecore_mcp_api.h         |    471 +-
 drivers/net/qede/base/ecore_mng_tlv.c         |    910 +-
 drivers/net/qede/base/ecore_proto_if.h        |     69 +-
 drivers/net/qede/base/ecore_rt_defs.h         |    895 +-
 drivers/net/qede/base/ecore_sp_api.h          |      6 +-
 drivers/net/qede/base/ecore_sp_commands.c     |    141 +-
 drivers/net/qede/base/ecore_sp_commands.h     |     18 +-
 drivers/net/qede/base/ecore_spq.c             |    431 +-
 drivers/net/qede/base/ecore_spq.h             |     65 +-
 drivers/net/qede/base/ecore_sriov.c           |   1700 +-
 drivers/net/qede/base/ecore_sriov.h           |    147 +-
 drivers/net/qede/base/ecore_status.h          |      4 +-
 drivers/net/qede/base/ecore_utils.h           |     18 +-
 drivers/net/qede/base/ecore_vf.c              |    550 +-
 drivers/net/qede/base/ecore_vf.h              |     57 +-
 drivers/net/qede/base/ecore_vf_api.h          |     74 +-
 drivers/net/qede/base/ecore_vfpf_if.h         |    122 +-
 drivers/net/qede/base/eth_common.h            |    300 +-
 drivers/net/qede/base/mcp_public.h            |   2343 +-
 drivers/net/qede/base/nvm_cfg.h               |   5059 +-
 drivers/net/qede/base/reg_addr.h              | 190590 ++++++++++++++-
 drivers/net/qede/qede_debug.c                 |    117 +-
 drivers/net/qede/qede_ethdev.c                |     11 +-
 drivers/net/qede/qede_ethdev.h                |     11 +-
 drivers/net/qede/qede_if.h                    |     20 +-
 drivers/net/qede/qede_main.c                  |      4 +-
 drivers/net/qede/qede_rxtx.c                  |     89 +-
 drivers/net/qede/qede_sriov.c                 |      4 -
 lib/librte_eal/include/rte_bitops.h           |     54 +-
 69 files changed, 215373 insertions(+), 15189 deletions(-)
Signature · 1 line
2.18.0
#1 lore raw

PATCH 2/7 net/qede/base: changes for HSI to support new HW

The changes introduced in this patch are related to hardware software interface primarily to support the new hardware while still maintaining the support for existing hardware.

The code architecture and design are same as with previous QEDE driver. Thus, a lot of fastpath and slow path code is expected to be the same. The registers, structure, functions, etc. for 4xxxx family of Marvell fastlinq adapters and newly supported 50xxx family of Marvell fastlinq adapters are mainly differentiated by using E4 and E5 suffixes respectively.

This patch adds PMD support for using new firmware 8.62.0.0.

---
 drivers/net/qede/base/common_hsi.h            | 1752 ++++---
 drivers/net/qede/base/ecore.h                 |   22 +-
 drivers/net/qede/base/ecore_cxt.c             |   53 +-
 drivers/net/qede/base/ecore_cxt.h             |   12 -
 drivers/net/qede/base/ecore_dev.c             |   49 +-
 drivers/net/qede/base/ecore_hsi_common.h      | 2719 ++++++----
 drivers/net/qede/base/ecore_hsi_debug_tools.h |  426 +-
 drivers/net/qede/base/ecore_hsi_eth.h         | 4541 ++++++++++++-----
 drivers/net/qede/base/ecore_hsi_func_common.h |    5 +-
 drivers/net/qede/base/ecore_hsi_init_func.h   |  705 ++-
 drivers/net/qede/base/ecore_hsi_init_tool.h   |  254 +-
 drivers/net/qede/base/ecore_init_fw_funcs.c   |  153 +-
 drivers/net/qede/base/ecore_init_ops.c        |   16 +-
 drivers/net/qede/base/ecore_int.c             |   39 +-
 drivers/net/qede/base/ecore_int.h             |    4 +-
 drivers/net/qede/base/ecore_int_api.h         |    2 +-
 drivers/net/qede/base/ecore_l2.c              |    6 +-
 drivers/net/qede/base/ecore_spq.c             |   39 +-
 drivers/net/qede/base/ecore_spq.h             |    2 +-
 drivers/net/qede/base/ecore_sriov.c           |    5 +-
 drivers/net/qede/base/ecore_vf.c              |    2 +-
 drivers/net/qede/base/eth_common.h            |    6 +-
 drivers/net/qede/qede_debug.c                 |   24 +-
 drivers/net/qede/qede_main.c                  |    2 +-
 drivers/net/qede/qede_rxtx.c                  |   15 +-
 25 files changed, 7358 insertions(+), 3495 deletions(-)
drivers/net/qede/base/common_hsi.h +1093 -659
index 1a02d460b..523876014 100644
@@ -1,67 +1,81 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (c) 2016 - 2018 Cavium Inc.
+ * Copyright (c) 2018 - 2020 Marvell Semiconductor Inc.
  * All rights reserved.
- * www.cavium.com
+ * www.marvell.com
  */
-
 #ifndef __COMMON_HSI__
 #define __COMMON_HSI__
 /********************************/
 /* PROTOCOL COMMON FW CONSTANTS */
 /********************************/
 
-/* Temporarily here should be added to HSI automatically by resource allocation
- * tool.
- */
-#define T_TEST_AGG_INT_TEMP  6
-#define M_TEST_AGG_INT_TEMP  8
-#define U_TEST_AGG_INT_TEMP  6
-#define X_TEST_AGG_INT_TEMP  14
-#define Y_TEST_AGG_INT_TEMP  4
-#define P_TEST_AGG_INT_TEMP  4
+/* Temporarily here should be added to HSI automatically by resource allocation tool. */
+#define T_TEST_AGG_INT_TEMP_E4  6
+#define M_TEST_AGG_INT_TEMP_E4  8
+#define U_TEST_AGG_INT_TEMP_E4  6
+#define X_TEST_AGG_INT_TEMP_E4  14
+#define Y_TEST_AGG_INT_TEMP_E4  4
+#define P_TEST_AGG_INT_TEMP_E4  4
+
+
+#define T_TEST_AGG_INT_TEMP_E5  3
+#define M_TEST_AGG_INT_TEMP_E5  3
+#define U_TEST_AGG_INT_TEMP_E5  3
+#define X_TEST_AGG_INT_TEMP_E5  7
+#define Y_TEST_AGG_INT_TEMP_E5  3
+#define P_TEST_AGG_INT_TEMP_E5  3
 
 #define X_FINAL_CLEANUP_AGG_INT  1
 
 #define EVENT_RING_PAGE_SIZE_BYTES          4096
 
 #define NUM_OF_GLOBAL_QUEUES				128
-#define COMMON_QUEUE_ENTRY_MAX_BYTE_SIZE	64
+#define COMMON_QUEUE_ENTRY_MAX_BYTE_SIZE	128
 
 #define ISCSI_CDU_TASK_SEG_TYPE       0
 #define FCOE_CDU_TASK_SEG_TYPE        0
 #define RDMA_CDU_TASK_SEG_TYPE        1
-#define ETH_CDU_TASK_SEG_TYPE         2
+#define ETH_CDU_TASK_SEG_TYPE         1
+
+#define ISCSI_CDU_TASK_SEG_ID           0
+#define FCOE_CDU_TASK_SEG_ID            1
+#define ROCE_CDU_TASK_SEG_ID            2
+#define PREROCE_CDU_TASK_SEG_ID         2
+#define ETH_CDU_TASK_SEG_ID             3
 
 #define FW_ASSERT_GENERAL_ATTN_IDX    32
 
-#define EAGLE_ENG1_WORKAROUND_NIG_FLOWCTRL_MODE	3
+#define EAGLE_ENG1_WORKAROUND_NIG_FLOWCTRL_MODE 3
 
 /* Queue Zone sizes in bytes */
-#define TSTORM_QZONE_SIZE    8   /*tstorm_queue_zone*/
-/*mstorm_eth_queue_zone. Used only for RX producer of VFs in backward
- * compatibility mode.
- */
-#define MSTORM_QZONE_SIZE    16
-#define USTORM_QZONE_SIZE    8   /*ustorm_queue_zone*/
-#define XSTORM_QZONE_SIZE    8   /*xstorm_eth_queue_zone*/
-#define YSTORM_QZONE_SIZE    0
-#define PSTORM_QZONE_SIZE    0
-
-/*Log of mstorm default VF zone size.*/
-#define MSTORM_VF_ZONE_DEFAULT_SIZE_LOG       7
-/*Maximum number of RX queues that can be allocated to VF by default*/
+#define TSTORM_QZONE_SIZE_E4    8   /*tstorm_queue_zone*/
+/* mstorm_eth_queue_zone. Used only for RX producer of VFs in backward compatibility mode. */
+#define MSTORM_QZONE_SIZE_E4    16
+#define USTORM_QZONE_SIZE_E4    8   /*ustorm_queue_zone*/
+#define XSTORM_QZONE_SIZE_E4    8   /*xstorm_eth_queue_zone*/
+#define YSTORM_QZONE_SIZE_E4    0
+#define PSTORM_QZONE_SIZE_E4    0
+
+#define TSTORM_QZONE_SIZE_E5    0
+/* mstorm_eth_queue_zone. Used only for RX producer of VFs in backward compatibility mode. */
+#define MSTORM_QZONE_SIZE_E5    16
+#define USTORM_QZONE_SIZE_E5    8   /*ustorm_queue_zone*/
+#define XSTORM_QZONE_SIZE_E5    8   /*xstorm_eth_queue_zone*/
+#define YSTORM_QZONE_SIZE_E5    0
+#define PSTORM_QZONE_SIZE_E5    0
+
+#define MSTORM_VF_ZONE_DEFAULT_SIZE_LOG       7     /*Log of mstorm default VF zone size.*/
+/* Maximum number of RX queues that can be allocated to VF by default */
 #define ETH_MAX_NUM_RX_QUEUES_PER_VF_DEFAULT  16
-/*Maximum number of RX queues that can be allocated to VF with doubled VF zone
- * size. Up to 96 VF supported in this mode
+/* Maximum number of RX queues that can be allocated to VF with doubled VF zone size. Up to 96 VF
+ * supported in this mode
  */
 #define ETH_MAX_NUM_RX_QUEUES_PER_VF_DOUBLE   48
-/*Maximum number of RX queues that can be allocated to VF with 4 VF zone size.
- * Up to 48 VF supported in this mode
+/* Maximum number of RX queues that can be allocated to VF with 4 VF zone size. Up to 48 VF
+ * supported in this mode
  */
 #define ETH_MAX_NUM_RX_QUEUES_PER_VF_QUAD     112
-
-#define ETH_RGSRC_CTX_SIZE                6 /*Size in QREGS*/
-#define ETH_TGSRC_CTX_SIZE                6 /*Size in QREGS*/
 /********************************/
 /* CORE (LIGHT L2) FW CONSTANTS */
 /********************************/
@@ -74,27 +88,29 @@
 
 #define CORE_LL2_TX_MAX_BDS_PER_PACKET				12
 
-#define CORE_SPQE_PAGE_SIZE_BYTES                       4096
+#define CORE_SPQE_PAGE_SIZE_BYTES			4096
 
 /* Number of LL2 RAM based (RX producers and statistics) queues */
-#define MAX_NUM_LL2_RX_RAM_QUEUES               32
+#define MAX_NUM_LL2_RX_QUEUES                   48
+/* Number of LL2 RAM based (RX producers and statistics) queues */
+#define MAX_NUM_LL2_RX_RAM_QUEUES               MAX_NUM_LL2_RX_QUEUES
 /* Number of LL2 context based (RX producers and statistics) queues */
-#define MAX_NUM_LL2_RX_CTX_QUEUES               208
-#define MAX_NUM_LL2_RX_QUEUES (MAX_NUM_LL2_RX_RAM_QUEUES + \
-			       MAX_NUM_LL2_RX_CTX_QUEUES)
+#define MAX_NUM_LL2_RX_CTX_QUEUES               64
+/*Total number of LL2 queue. rename to MAX_NUM_LL2_RX_QUEUES*/
+#define MAX_NUM_LL2_RX_QUEUES_TOTAL             \
+	(MAX_NUM_LL2_RX_RAM_QUEUES + MAX_NUM_LL2_RX_CTX_QUEUES)
 
 #define MAX_NUM_LL2_TX_STATS_COUNTERS			48
 
 
-/****************************************************************************/
-/* Include firmware version number only- do not add constants here to avoid */
-/* redundunt compilations                                                   */
-/****************************************************************************/
+/*///////////////////////////////////////////////////////////////////////////////////////////////*/
+/*Include firmware version number only- do not add constants here to avoid redundant compilations*/
+/*///////////////////////////////////////////////////////////////////////////////////////////////*/
 
 
 #define FW_MAJOR_VERSION		8
-#define FW_MINOR_VERSION		40
-#define FW_REVISION_VERSION		33
+#define FW_MINOR_VERSION		62
+#define FW_REVISION_VERSION		0
 #define FW_ENGINEERING_VERSION	0
 
 /***********************/
@@ -104,48 +120,68 @@
 /* PCI functions */
 #define MAX_NUM_PORTS_BB        (2)
 #define MAX_NUM_PORTS_K2        (4)
-#define MAX_NUM_PORTS           (MAX_NUM_PORTS_K2)
+#define MAX_NUM_PORTS_E5        (4)
+#define MAX_NUM_PORTS			(MAX_NUM_PORTS_E5)
 
 #define MAX_NUM_PFS_BB          (8)
 #define MAX_NUM_PFS_K2          (16)
-#define MAX_NUM_PFS             (MAX_NUM_PFS_K2)
+#define MAX_NUM_PFS_E5          (16)
+#define MAX_NUM_PFS             (MAX_NUM_PFS_E5)
 #define MAX_NUM_OF_PFS_IN_CHIP  (16) /* On both engines */
 
 #define MAX_NUM_VFS_BB          (120)
 #define MAX_NUM_VFS_K2          (192)
-#define COMMON_MAX_NUM_VFS      (MAX_NUM_VFS_K2)
+#define MAX_NUM_VFS_E4          (MAX_NUM_VFS_K2)
+#define MAX_NUM_VFS_E5          (240)
+#define MAX_NUM_VFS		(MAX_NUM_VFS_E5) /* @DPDK */
 
 #define MAX_NUM_FUNCTIONS_BB    (MAX_NUM_PFS_BB + MAX_NUM_VFS_BB)
 #define MAX_NUM_FUNCTIONS_K2    (MAX_NUM_PFS_K2 + MAX_NUM_VFS_K2)
 
-/* in both BB and K2, the VF number starts from 16. so for arrays containing all
- * possible PFs and VFs - we need a constant for this size
- */
+/* in both BB and K2, the VF number starts from 16. so for arrays containing all */
+/* possible PFs and VFs - we need a constant for this size */
 #define MAX_FUNCTION_NUMBER_BB      (MAX_NUM_PFS + MAX_NUM_VFS_BB)
 #define MAX_FUNCTION_NUMBER_K2      (MAX_NUM_PFS + MAX_NUM_VFS_K2)
-#define COMMON_MAX_FUNCTION_NUMBER  (MAX_NUM_PFS + MAX_NUM_VFS_K2)
+#define MAX_FUNCTION_NUMBER_E4      (MAX_NUM_PFS + MAX_NUM_VFS_E4)
+#define MAX_FUNCTION_NUMBER_E5      (MAX_NUM_PFS + MAX_NUM_VFS_E5)
+#define COMMON_MAX_FUNCTION_NUMBER  (MAX_NUM_PFS + MAX_NUM_VFS_E5)
 
 #define MAX_NUM_VPORTS_K2       (208)
 #define MAX_NUM_VPORTS_BB       (160)
-#define COMMON_MAX_NUM_VPORTS   (MAX_NUM_VPORTS_K2)
+#define MAX_NUM_VPORTS_E4       (MAX_NUM_VPORTS_K2)
+#define MAX_NUM_VPORTS_E5       (256)
+#define COMMON_MAX_NUM_VPORTS   (MAX_NUM_VPORTS_E5)
 
-#define MAX_NUM_L2_QUEUES_BB	(256)
-#define MAX_NUM_L2_QUEUES_K2    (320)
+#define MAX_NUM_L2_QUEUES_BB			(256)
+#define MAX_NUM_L2_QUEUES_K2			(320)
+#define MAX_NUM_L2_QUEUES_E5			(512)
+#define COMMON_MAX_NUM_L2_QUEUES		(MAX_NUM_L2_QUEUES_E5)
 
-#define FW_LOWEST_CONSUMEDDMAE_CHANNEL   (26)
+#define FW_LOWEST_CONSUMEDDMAE_CHANNEL_E4   (26)
+#define FW_LOWEST_CONSUMEDDMAE_CHANNEL_E5   (32) /* Not used in E5 */
 
 /* Traffic classes in network-facing blocks (PBF, BTB, NIG, BRB, PRS and QM) */
 #define NUM_PHYS_TCS_4PORT_K2     4
+#define NUM_PHYS_TCS_4PORT_TX_E5  6
+#define NUM_PHYS_TCS_4PORT_RX_E5  4
 #define NUM_OF_PHYS_TCS           8
 #define PURE_LB_TC                NUM_OF_PHYS_TCS
 #define NUM_TCS_4PORT_K2          (NUM_PHYS_TCS_4PORT_K2 + 1)
+#define NUM_TCS_4PORT_TX_E5       (NUM_PHYS_TCS_4PORT_TX_E5 + 1)
+#define NUM_TCS_4PORT_RX_E5       (NUM_PHYS_TCS_4PORT_RX_E5 + 1)
 #define NUM_OF_TCS                (NUM_OF_PHYS_TCS + 1)
+#define PBF_TGFS_PURE_LB_TC_E5    5
 
 /* CIDs */
-#define NUM_OF_CONNECTION_TYPES (8)
+#define NUM_OF_CONNECTION_TYPES_E4			(8)
+#define NUM_OF_CONNECTION_TYPES_E5			(16)
+#define COMMON_NUM_OF_CONNECTION_TYPES		(NUM_OF_CONNECTION_TYPES_E5)
+
 #define NUM_OF_TASK_TYPES       (8)
 #define NUM_OF_LCIDS            (320)
-#define NUM_OF_LTIDS            (320)
+#define NUM_OF_LTIDS_E4         (320)
+#define NUM_OF_LTIDS_E5         (384)
+#define COMMON_NUM_OF_LTIDS		(NUM_OF_LTIDS_E5)
 
 /* Global PXP windows (GTT) */
 #define NUM_OF_GTT          19
@@ -154,33 +190,33 @@
 #define GTT_DWORD_SIZE      (1 << GTT_DWORD_SIZE_BITS)
 
 /* Tools Version */
-#define TOOLS_VERSION 10
+#define TOOLS_VERSION 11
 /*****************/
 /* CDU CONSTANTS */
 /*****************/
 
-#define CDU_SEG_TYPE_OFFSET_REG_TYPE_SHIFT              (17)
-#define CDU_SEG_TYPE_OFFSET_REG_OFFSET_MASK             (0x1ffff)
+#define CDU_SEG_TYPE_OFFSET_REG_TYPE_SHIFT		(17)
+#define CDU_SEG_TYPE_OFFSET_REG_OFFSET_MASK		(0x1ffff)
 
 #define CDU_VF_FL_SEG_TYPE_OFFSET_REG_TYPE_SHIFT	(12)
 #define CDU_VF_FL_SEG_TYPE_OFFSET_REG_OFFSET_MASK	(0xfff)
 
 #define	CDU_CONTEXT_VALIDATION_CFG_ENABLE_SHIFT				(0)
 #define	CDU_CONTEXT_VALIDATION_CFG_VALIDATION_TYPE_SHIFT	(1)
-#define	CDU_CONTEXT_VALIDATION_CFG_USE_TYPE				(2)
+#define	CDU_CONTEXT_VALIDATION_CFG_USE_TYPE					(2)
 #define	CDU_CONTEXT_VALIDATION_CFG_USE_REGION				(3)
-#define	CDU_CONTEXT_VALIDATION_CFG_USE_CID				(4)
+#define	CDU_CONTEXT_VALIDATION_CFG_USE_CID					(4)
 #define	CDU_CONTEXT_VALIDATION_CFG_USE_ACTIVE				(5)
 
 /*enabled, type A, use all */
-#define	CDU_CONTEXT_VALIDATION_DEFAULT_CFG				(0x3D)
+#define	CDU_CONTEXT_VALIDATION_DEFAULT_CFG					(0x3D)
 
 /*****************/
 /* DQ CONSTANTS  */
 /*****************/
 
 /* DEMS */
-#define DQ_DEMS_LEGACY			0
+#define	DQ_DEMS_LEGACY						0
 #define DQ_DEMS_TOE_MORE_TO_SEND			3
 #define DQ_DEMS_TOE_LOCAL_ADV_WND			4
 #define DQ_DEMS_ROCE_CQ_CONS				7
@@ -196,19 +232,13 @@
 #define DQ_XCM_AGG_VAL_SEL_REG6   7
 
 /* XCM agg val selection (FW) */
-#define DQ_XCM_ETH_EDPM_NUM_BDS_CMD \
-	DQ_XCM_AGG_VAL_SEL_WORD2
-#define DQ_XCM_ETH_TX_BD_CONS_CMD \
-	DQ_XCM_AGG_VAL_SEL_WORD3
-#define DQ_XCM_CORE_TX_BD_CONS_CMD \
-	DQ_XCM_AGG_VAL_SEL_WORD3
-#define DQ_XCM_ETH_TX_BD_PROD_CMD \
-	DQ_XCM_AGG_VAL_SEL_WORD4
-#define DQ_XCM_CORE_TX_BD_PROD_CMD \
-	DQ_XCM_AGG_VAL_SEL_WORD4
-#define DQ_XCM_CORE_SPQ_PROD_CMD \
-	DQ_XCM_AGG_VAL_SEL_WORD4
-#define DQ_XCM_ETH_GO_TO_BD_CONS_CMD            DQ_XCM_AGG_VAL_SEL_WORD5
+#define DQ_XCM_CORE_TX_BD_CONS_CMD          DQ_XCM_AGG_VAL_SEL_WORD3
+#define DQ_XCM_CORE_TX_BD_PROD_CMD          DQ_XCM_AGG_VAL_SEL_WORD4
+#define DQ_XCM_CORE_SPQ_PROD_CMD            DQ_XCM_AGG_VAL_SEL_WORD4
+#define DQ_XCM_ETH_EDPM_NUM_BDS_CMD         DQ_XCM_AGG_VAL_SEL_WORD2
+#define DQ_XCM_ETH_TX_BD_CONS_CMD           DQ_XCM_AGG_VAL_SEL_WORD3
+#define DQ_XCM_ETH_TX_BD_PROD_CMD           DQ_XCM_AGG_VAL_SEL_WORD4
+#define DQ_XCM_ETH_GO_TO_BD_CONS_CMD        DQ_XCM_AGG_VAL_SEL_WORD5
 #define DQ_XCM_FCOE_SQ_CONS_CMD             DQ_XCM_AGG_VAL_SEL_WORD3
 #define DQ_XCM_FCOE_SQ_PROD_CMD             DQ_XCM_AGG_VAL_SEL_WORD4
 #define DQ_XCM_FCOE_X_FERQ_PROD_CMD         DQ_XCM_AGG_VAL_SEL_WORD5
@@ -263,20 +293,13 @@
 #define DQ_XCM_AGG_FLG_SHIFT_CF23   7
 
 /* XCM agg counter flag selection (FW) */
-#define DQ_XCM_ETH_DQ_CF_CMD		(1 << \
-					DQ_XCM_AGG_FLG_SHIFT_CF18)
-#define DQ_XCM_CORE_DQ_CF_CMD		(1 << \
-					DQ_XCM_AGG_FLG_SHIFT_CF18)
-#define DQ_XCM_ETH_TERMINATE_CMD	(1 << \
-					DQ_XCM_AGG_FLG_SHIFT_CF19)
-#define DQ_XCM_CORE_TERMINATE_CMD	(1 << \
-					DQ_XCM_AGG_FLG_SHIFT_CF19)
-#define DQ_XCM_ETH_SLOW_PATH_CMD	(1 << \
-					DQ_XCM_AGG_FLG_SHIFT_CF22)
-#define DQ_XCM_CORE_SLOW_PATH_CMD	(1 << \
-					DQ_XCM_AGG_FLG_SHIFT_CF22)
-#define DQ_XCM_ETH_TPH_EN_CMD		(1 << \
-					DQ_XCM_AGG_FLG_SHIFT_CF23)
+#define DQ_XCM_CORE_DQ_CF_CMD               (1 << DQ_XCM_AGG_FLG_SHIFT_CF18)
+#define DQ_XCM_CORE_TERMINATE_CMD           (1 << DQ_XCM_AGG_FLG_SHIFT_CF19)
+#define DQ_XCM_CORE_SLOW_PATH_CMD           (1 << DQ_XCM_AGG_FLG_SHIFT_CF22)
+#define DQ_XCM_ETH_DQ_CF_CMD                (1 << DQ_XCM_AGG_FLG_SHIFT_CF18)
+#define DQ_XCM_ETH_TERMINATE_CMD            (1 << DQ_XCM_AGG_FLG_SHIFT_CF19)
+#define DQ_XCM_ETH_SLOW_PATH_CMD            (1 << DQ_XCM_AGG_FLG_SHIFT_CF22)
+#define DQ_XCM_ETH_TPH_EN_CMD               (1 << DQ_XCM_AGG_FLG_SHIFT_CF23)
 #define DQ_XCM_FCOE_SLOW_PATH_CMD           (1 << DQ_XCM_AGG_FLG_SHIFT_CF22)
 #define DQ_XCM_ISCSI_DQ_FLUSH_CMD           (1 << DQ_XCM_AGG_FLG_SHIFT_CF19)
 #define DQ_XCM_ISCSI_SLOW_PATH_CMD          (1 << DQ_XCM_AGG_FLG_SHIFT_CF22)
@@ -341,19 +364,21 @@
 #define DQ_PWM_OFFSET_UCM_FLAGS				0x69
 #define DQ_PWM_OFFSET_TCM_FLAGS				0x6B
 
-#define DQ_PWM_OFFSET_XCM_RDMA_SQ_PROD		(DQ_PWM_OFFSET_XCM16_BASE + 2)
+#define DQ_PWM_OFFSET_XCM_RDMA_SQ_PROD			(DQ_PWM_OFFSET_XCM16_BASE + 2)
 #define DQ_PWM_OFFSET_UCM_RDMA_CQ_CONS_32BIT	(DQ_PWM_OFFSET_UCM32_BASE)
 #define DQ_PWM_OFFSET_UCM_RDMA_CQ_CONS_16BIT	(DQ_PWM_OFFSET_UCM16_4)
-#define DQ_PWM_OFFSET_UCM_RDMA_INT_TIMEOUT	(DQ_PWM_OFFSET_UCM16_BASE + 2)
-#define DQ_PWM_OFFSET_UCM_RDMA_ARM_FLAGS	(DQ_PWM_OFFSET_UCM_FLAGS)
-#define DQ_PWM_OFFSET_TCM_ROCE_RQ_PROD		(DQ_PWM_OFFSET_TCM16_BASE + 1)
-#define DQ_PWM_OFFSET_TCM_IWARP_RQ_PROD		(DQ_PWM_OFFSET_TCM16_BASE + 3)
-
-#define DQ_PWM_OFFSET_XCM_RDMA_24B_ICID_SQ_PROD \
+#define DQ_PWM_OFFSET_UCM_RDMA_INT_TIMEOUT		(DQ_PWM_OFFSET_UCM16_BASE + 2)
+#define DQ_PWM_OFFSET_UCM_RDMA_ARM_FLAGS		(DQ_PWM_OFFSET_UCM_FLAGS)
+#define DQ_PWM_OFFSET_TCM_ROCE_RQ_PROD			(DQ_PWM_OFFSET_TCM16_BASE + 1)
+#define DQ_PWM_OFFSET_TCM_IWARP_RQ_PROD			(DQ_PWM_OFFSET_TCM16_BASE + 3)
+/* DQ_DEMS_AGG_VAL_BASE**/
+#define DQ_PWM_OFFSET_TCM_LL2_PROD_UPDATE	\
+	(DQ_PWM_OFFSET_TCM32_BASE + DQ_TCM_AGG_VAL_SEL_REG9 - 4)
+
+#define DQ_PWM_OFFSET_XCM_RDMA_24B_ICID_SQ_PROD			\
 	(DQ_PWM_OFFSET_XCM32_24ICID_BASE + 2)
-#define DQ_PWM_OFFSET_UCM_RDMA_24B_ICID_CQ_CONS_32BIT \
-	(DQ_PWM_OFFSET_UCM32_24ICID_BASE + 4)
-#define DQ_PWM_OFFSET_TCM_ROCE_24B_ICID_RQ_PROD	\
+#define DQ_PWM_OFFSET_UCM_RDMA_24B_ICID_CQ_CONS_32BIT	(DQ_PWM_OFFSET_UCM32_24ICID_BASE + 4)
+#define DQ_PWM_OFFSET_TCM_ROCE_24B_ICID_RQ_PROD			\
 	(DQ_PWM_OFFSET_TCM32_24ICID_BASE + 1)
 
 #define DQ_REGION_SHIFT				        (12)
@@ -369,17 +394,19 @@
 /*****************/
 
 /* number of TX queues in the QM */
-#define MAX_QM_TX_QUEUES_K2	512
-#define MAX_QM_TX_QUEUES_BB	448
-#define MAX_QM_TX_QUEUES	MAX_QM_TX_QUEUES_K2
+#define MAX_QM_TX_QUEUES_K2			512
+#define MAX_QM_TX_QUEUES_BB			448
+#define MAX_QM_TX_QUEUES_E5			MAX_QM_TX_QUEUES_K2
+#define MAX_QM_TX_QUEUES			MAX_QM_TX_QUEUES_K2
 
 /* number of Other queues in the QM */
-#define MAX_QM_OTHER_QUEUES_BB	64
-#define MAX_QM_OTHER_QUEUES_K2	128
-#define MAX_QM_OTHER_QUEUES	MAX_QM_OTHER_QUEUES_K2
+#define MAX_QM_OTHER_QUEUES_BB		64
+#define MAX_QM_OTHER_QUEUES_K2		128
+#define MAX_QM_OTHER_QUEUES_E5		MAX_QM_OTHER_QUEUES_K2
+#define MAX_QM_OTHER_QUEUES			MAX_QM_OTHER_QUEUES_K2
 
 /* number of queues in a PF queue group */
-#define QM_PF_QUEUE_GROUP_SIZE	8
+#define QM_PF_QUEUE_GROUP_SIZE		8
 
 /* the size of a single queue element in bytes */
 #define QM_PQ_ELEMENT_SIZE			4
@@ -387,14 +414,12 @@
 /* base number of Tx PQs in the CM PQ representation.
  * should be used when storing PQ IDs in CM PQ registers and context
  */
-#define CM_TX_PQ_BASE	0x200
-
-/* number of global Vport/QCN rate limiters */
-#define MAX_QM_GLOBAL_RLS			256
+#define CM_TX_PQ_BASE               0x200
 
 /* number of global rate limiters */
-#define MAX_QM_GLOBAL_RLS		256
-#define COMMON_MAX_QM_GLOBAL_RLS	(MAX_QM_GLOBAL_RLS)
+#define MAX_QM_GLOBAL_RLS_E4		256
+#define MAX_QM_GLOBAL_RLS_E5		512
+#define COMMON_MAX_QM_GLOBAL_RLS	(MAX_QM_GLOBAL_RLS_E5)
 
 /* QM registers data */
 #define QM_LINE_CRD_REG_WIDTH		16
@@ -402,9 +427,9 @@
 #define QM_BYTE_CRD_REG_WIDTH		24
 #define QM_BYTE_CRD_REG_SIGN_BIT	(1 << (QM_BYTE_CRD_REG_WIDTH - 1))
 #define QM_WFQ_CRD_REG_WIDTH		32
-#define QM_WFQ_CRD_REG_SIGN_BIT		(1U << (QM_WFQ_CRD_REG_WIDTH - 1))
-#define QM_RL_CRD_REG_WIDTH		32
-#define QM_RL_CRD_REG_SIGN_BIT		(1U << (QM_RL_CRD_REG_WIDTH - 1))
+#define QM_WFQ_CRD_REG_SIGN_BIT		(1U << (QM_WFQ_CRD_REG_WIDTH - 1)) /* @DPDK */
+#define QM_RL_CRD_REG_WIDTH			32
+#define QM_RL_CRD_REG_SIGN_BIT		(1U << (QM_RL_CRD_REG_WIDTH - 1)) /* @DPDK */
 
 /*****************/
 /* CAU CONSTANTS */
@@ -414,14 +439,18 @@
 #define CAU_FSM_ETH_TX  1
 
 /* Number of Protocol Indices per Status Block */
-#define PIS_PER_SB    12
-#define MAX_PIS_PER_SB	 PIS_PER_SB
+#define PIS_PER_SB_E4			12
+#define PIS_PER_SB_E5			10
+
+#define PIS_PER_SB_PADDING_E5	2
+#define MAX_PIS_PER_SB	 PIS_PER_SB_E4
+
 
 /* fsm is stopped or not valid for this sb */
 #define CAU_HC_STOPPED_STATE		3
-/* fsm is working without interrupt coalescing for this sb*/
+/* fsm is working without interrupt coalescing for this sb */
 #define CAU_HC_DISABLE_STATE		4
-/* fsm is working with interrupt coalescing for this sb*/
+/* fsm is working with interrupt coalescing for this sb */
 #define CAU_HC_ENABLE_STATE			0
 
 
@@ -429,40 +458,47 @@
 /* IGU CONSTANTS */
 /*****************/
 
-#define MAX_SB_PER_PATH_K2			(368)
-#define MAX_SB_PER_PATH_BB			(288)
-#define MAX_TOT_SB_PER_PATH			MAX_SB_PER_PATH_K2
+#define MAX_SB_PER_PATH_K2					(368)
+#define MAX_SB_PER_PATH_BB					(288)
+#define MAX_SB_PER_PATH_E5_BC_MODE			(496)
+#define MAX_SB_PER_PATH_E5					(512)
+#define MAX_TOT_SB_PER_PATH					MAX_SB_PER_PATH_E5
 
-#define MAX_SB_PER_PF_MIMD			129
-#define MAX_SB_PER_PF_SIMD			64
-#define MAX_SB_PER_VF				64
+#define MAX_SB_PER_PF_MIMD					129
+#define MAX_SB_PER_PF_SIMD					64
+#define MAX_SB_PER_VF						64
 
 /* Memory addresses on the BAR for the IGU Sub Block */
-#define IGU_MEM_BASE				0x0000
+#define IGU_MEM_BASE						0x0000
 
-#define IGU_MEM_MSIX_BASE			0x0000
-#define IGU_MEM_MSIX_UPPER			0x0101
-#define IGU_MEM_MSIX_RESERVED_UPPER		0x01ff
+#define IGU_MEM_MSIX_BASE					0x0000
+#define IGU_MEM_MSIX_UPPER					0x0101
+#define IGU_MEM_MSIX_RESERVED_UPPER			0x01ff
 
-#define IGU_MEM_PBA_MSIX_BASE			0x0200
-#define IGU_MEM_PBA_MSIX_UPPER			0x0202
+#define IGU_MEM_PBA_MSIX_BASE				0x0200
+#define IGU_MEM_PBA_MSIX_UPPER				0x0202
 #define IGU_MEM_PBA_MSIX_RESERVED_UPPER		0x03ff
 
-#define IGU_CMD_INT_ACK_BASE			0x0400
+#define IGU_CMD_INT_ACK_BASE				0x0400
 #define IGU_CMD_INT_ACK_RESERVED_UPPER		0x05ff
 
-#define IGU_CMD_ATTN_BIT_UPD_UPPER		0x05f0
-#define IGU_CMD_ATTN_BIT_SET_UPPER		0x05f1
-#define IGU_CMD_ATTN_BIT_CLR_UPPER		0x05f2
+#define IGU_CMD_ATTN_BIT_UPD_UPPER			0x05f0
+#define IGU_CMD_ATTN_BIT_SET_UPPER			0x05f1
+#define IGU_CMD_ATTN_BIT_CLR_UPPER			0x05f2
 
 #define IGU_REG_SISR_MDPC_WMASK_UPPER		0x05f3
 #define IGU_REG_SISR_MDPC_WMASK_LSB_UPPER	0x05f4
 #define IGU_REG_SISR_MDPC_WMASK_MSB_UPPER	0x05f5
 #define IGU_REG_SISR_MDPC_WOMASK_UPPER		0x05f6
 
-#define IGU_CMD_PROD_UPD_BASE			0x0600
+#define IGU_CMD_PROD_UPD_BASE				0x0600
 #define IGU_CMD_PROD_UPD_RESERVED_UPPER		0x07ff
 
+#define IGU_CMD_INT_ACK_E5_BASE				0x1000
+#define IGU_CMD_INT_ACK_RESERVED_E5_UPPER	0x17FF
+
+#define IGU_CMD_PROD_UPD_E5_BASE			0x1800
+#define IGU_CMD_PROD_UPD_RESERVED_E5_UPPER	0x1FFF
 /*****************/
 /* PXP CONSTANTS */
 /*****************/
@@ -479,110 +515,92 @@
 #define PXP_BAR_DQ                                          1
 
 /* PTT and GTT */
-#define PXP_PER_PF_ENTRY_SIZE		8
-#define PXP_NUM_GLOBAL_WINDOWS		243
-#define PXP_GLOBAL_ENTRY_SIZE		4
-#define PXP_ADMIN_WINDOW_ALLOWED_LENGTH		4
-#define PXP_PF_WINDOW_ADMIN_START	0
-#define PXP_PF_WINDOW_ADMIN_LENGTH	0x1000
-#define PXP_PF_WINDOW_ADMIN_END		(PXP_PF_WINDOW_ADMIN_START + \
-				PXP_PF_WINDOW_ADMIN_LENGTH - 1)
-#define PXP_PF_WINDOW_ADMIN_PER_PF_START	0
-#define PXP_PF_WINDOW_ADMIN_PER_PF_LENGTH	(PXP_NUM_PF_WINDOWS * \
-						 PXP_PER_PF_ENTRY_SIZE)
-#define PXP_PF_WINDOW_ADMIN_PER_PF_END (PXP_PF_WINDOW_ADMIN_PER_PF_START + \
-					PXP_PF_WINDOW_ADMIN_PER_PF_LENGTH - 1)
-#define PXP_PF_WINDOW_ADMIN_GLOBAL_START	0x200
-#define PXP_PF_WINDOW_ADMIN_GLOBAL_LENGTH	(PXP_NUM_GLOBAL_WINDOWS * \
-						 PXP_GLOBAL_ENTRY_SIZE)
-#define PXP_PF_WINDOW_ADMIN_GLOBAL_END \
-		(PXP_PF_WINDOW_ADMIN_GLOBAL_START + \
-		 PXP_PF_WINDOW_ADMIN_GLOBAL_LENGTH - 1)
-#define PXP_PF_GLOBAL_PRETEND_ADDR	0x1f0
-#define PXP_PF_ME_OPAQUE_MASK_ADDR	0xf4
-#define PXP_PF_ME_OPAQUE_ADDR		0x1f8
-#define PXP_PF_ME_CONCRETE_ADDR		0x1fc
-
-#define PXP_NUM_PF_WINDOWS		12
-
-#define PXP_EXTERNAL_BAR_PF_WINDOW_START	0x1000
-#define PXP_EXTERNAL_BAR_PF_WINDOW_NUM		PXP_NUM_PF_WINDOWS
-#define PXP_EXTERNAL_BAR_PF_WINDOW_SINGLE_SIZE	0x1000
-#define PXP_EXTERNAL_BAR_PF_WINDOW_LENGTH \
-	(PXP_EXTERNAL_BAR_PF_WINDOW_NUM * \
-	 PXP_EXTERNAL_BAR_PF_WINDOW_SINGLE_SIZE)
-#define PXP_EXTERNAL_BAR_PF_WINDOW_END \
-	(PXP_EXTERNAL_BAR_PF_WINDOW_START + \
-	 PXP_EXTERNAL_BAR_PF_WINDOW_LENGTH - 1)
-
-#define PXP_EXTERNAL_BAR_GLOBAL_WINDOW_START \
-	(PXP_EXTERNAL_BAR_PF_WINDOW_END + 1)
-#define PXP_EXTERNAL_BAR_GLOBAL_WINDOW_NUM		PXP_NUM_GLOBAL_WINDOWS
-#define PXP_EXTERNAL_BAR_GLOBAL_WINDOW_SINGLE_SIZE	0x1000
-#define PXP_EXTERNAL_BAR_GLOBAL_WINDOW_LENGTH \
-	(PXP_EXTERNAL_BAR_GLOBAL_WINDOW_NUM * \
-	 PXP_EXTERNAL_BAR_GLOBAL_WINDOW_SINGLE_SIZE)
-#define PXP_EXTERNAL_BAR_GLOBAL_WINDOW_END \
-	(PXP_EXTERNAL_BAR_GLOBAL_WINDOW_START + \
-	 PXP_EXTERNAL_BAR_GLOBAL_WINDOW_LENGTH - 1)
+#define PXP_PER_PF_ENTRY_SIZE                               8
+#define PXP_NUM_GLOBAL_WINDOWS                              243
+#define PXP_GLOBAL_ENTRY_SIZE                               4
+#define PXP_ADMIN_WINDOW_ALLOWED_LENGTH                     4
+#define PXP_PF_WINDOW_ADMIN_START                           0
+#define PXP_PF_WINDOW_ADMIN_LENGTH                          0x1000
+#define PXP_PF_WINDOW_ADMIN_END                             \
+	(PXP_PF_WINDOW_ADMIN_START + PXP_PF_WINDOW_ADMIN_LENGTH - 1)
+#define PXP_PF_WINDOW_ADMIN_PER_PF_START                    0
+#define PXP_PF_WINDOW_ADMIN_PER_PF_LENGTH                   \
+	(PXP_NUM_PF_WINDOWS * PXP_PER_PF_ENTRY_SIZE)
+#define PXP_PF_WINDOW_ADMIN_PER_PF_END                      \
+	(PXP_PF_WINDOW_ADMIN_PER_PF_START + PXP_PF_WINDOW_ADMIN_PER_PF_LENGTH - 1)
+#define PXP_PF_WINDOW_ADMIN_GLOBAL_START                    0x200
+#define PXP_PF_WINDOW_ADMIN_GLOBAL_LENGTH                   \
+	(PXP_NUM_GLOBAL_WINDOWS * PXP_GLOBAL_ENTRY_SIZE)
+#define PXP_PF_WINDOW_ADMIN_GLOBAL_END                      \
+	(PXP_PF_WINDOW_ADMIN_GLOBAL_START + PXP_PF_WINDOW_ADMIN_GLOBAL_LENGTH - 1)
+#define PXP_PF_GLOBAL_PRETEND_ADDR                          0x1f0
+#define PXP_PF_ME_OPAQUE_MASK_ADDR                          0xf4
+#define PXP_PF_ME_OPAQUE_ADDR                               0x1f8
+#define PXP_PF_ME_CONCRETE_ADDR                             0x1fc
+
+#define PXP_NUM_PF_WINDOWS                                  12
+
+#define PXP_EXTERNAL_BAR_PF_WINDOW_START                    0x1000
+#define PXP_EXTERNAL_BAR_PF_WINDOW_NUM                      PXP_NUM_PF_WINDOWS
+#define PXP_EXTERNAL_BAR_PF_WINDOW_SINGLE_SIZE              0x1000
+#define PXP_EXTERNAL_BAR_PF_WINDOW_LENGTH                   \
+	(PXP_EXTERNAL_BAR_PF_WINDOW_NUM * PXP_EXTERNAL_BAR_PF_WINDOW_SINGLE_SIZE)
+#define PXP_EXTERNAL_BAR_PF_WINDOW_END                      \
+	(PXP_EXTERNAL_BAR_PF_WINDOW_START + PXP_EXTERNAL_BAR_PF_WINDOW_LENGTH - 1)
+
+#define PXP_EXTERNAL_BAR_GLOBAL_WINDOW_START                (PXP_EXTERNAL_BAR_PF_WINDOW_END + 1)
+#define PXP_EXTERNAL_BAR_GLOBAL_WINDOW_NUM                  PXP_NUM_GLOBAL_WINDOWS
+#define PXP_EXTERNAL_BAR_GLOBAL_WINDOW_SINGLE_SIZE          0x1000
+#define PXP_EXTERNAL_BAR_GLOBAL_WINDOW_LENGTH               \
+	(PXP_EXTERNAL_BAR_GLOBAL_WINDOW_NUM * PXP_EXTERNAL_BAR_GLOBAL_WINDOW_SINGLE_SIZE)
+#define PXP_EXTERNAL_BAR_GLOBAL_WINDOW_END                  \
+	(PXP_EXTERNAL_BAR_GLOBAL_WINDOW_START + PXP_EXTERNAL_BAR_GLOBAL_WINDOW_LENGTH - 1)
 
 /* PF BAR */
 #define PXP_BAR0_START_GRC                      0x0000
 #define PXP_BAR0_GRC_LENGTH                     0x1C00000
-#define PXP_BAR0_END_GRC                        \
-	(PXP_BAR0_START_GRC + PXP_BAR0_GRC_LENGTH - 1)
+#define PXP_BAR0_END_GRC                        (PXP_BAR0_START_GRC + PXP_BAR0_GRC_LENGTH - 1)
 
 #define PXP_BAR0_START_IGU                      0x1C00000
 #define PXP_BAR0_IGU_LENGTH                     0x10000
-#define PXP_BAR0_END_IGU                        \
-	(PXP_BAR0_START_IGU + PXP_BAR0_IGU_LENGTH - 1)
+#define PXP_BAR0_END_IGU                        (PXP_BAR0_START_IGU + PXP_BAR0_IGU_LENGTH - 1)
 
 #define PXP_BAR0_START_TSDM                     0x1C80000
 #define PXP_BAR0_SDM_LENGTH                     0x40000
 #define PXP_BAR0_SDM_RESERVED_LENGTH            0x40000
-#define PXP_BAR0_END_TSDM                       \
-	(PXP_BAR0_START_TSDM + PXP_BAR0_SDM_LENGTH - 1)
+#define PXP_BAR0_END_TSDM                       (PXP_BAR0_START_TSDM + PXP_BAR0_SDM_LENGTH - 1)
 
 #define PXP_BAR0_START_MSDM                     0x1D00000
-#define PXP_BAR0_END_MSDM                       \
-	(PXP_BAR0_START_MSDM + PXP_BAR0_SDM_LENGTH - 1)
+#define PXP_BAR0_END_MSDM                       (PXP_BAR0_START_MSDM + PXP_BAR0_SDM_LENGTH - 1)
 
 #define PXP_BAR0_START_USDM                     0x1D80000
-#define PXP_BAR0_END_USDM                       \
-	(PXP_BAR0_START_USDM + PXP_BAR0_SDM_LENGTH - 1)
+#define PXP_BAR0_END_USDM                       (PXP_BAR0_START_USDM + PXP_BAR0_SDM_LENGTH - 1)
 
 #define PXP_BAR0_START_XSDM                     0x1E00000
-#define PXP_BAR0_END_XSDM                       \
-	(PXP_BAR0_START_XSDM + PXP_BAR0_SDM_LENGTH - 1)
+#define PXP_BAR0_END_XSDM                       (PXP_BAR0_START_XSDM + PXP_BAR0_SDM_LENGTH - 1)
 
 #define PXP_BAR0_START_YSDM                     0x1E80000
-#define PXP_BAR0_END_YSDM                       \
-	(PXP_BAR0_START_YSDM + PXP_BAR0_SDM_LENGTH - 1)
+#define PXP_BAR0_END_YSDM                       (PXP_BAR0_START_YSDM + PXP_BAR0_SDM_LENGTH - 1)
 
 #define PXP_BAR0_START_PSDM                     0x1F00000
-#define PXP_BAR0_END_PSDM                       \
-	(PXP_BAR0_START_PSDM + PXP_BAR0_SDM_LENGTH - 1)
+#define PXP_BAR0_END_PSDM                       (PXP_BAR0_START_PSDM + PXP_BAR0_SDM_LENGTH - 1)
 
-#define PXP_BAR0_FIRST_INVALID_ADDRESS          \
-	(PXP_BAR0_END_PSDM + 1)
+#define PXP_BAR0_FIRST_INVALID_ADDRESS          (PXP_BAR0_END_PSDM + 1)
 
 /* VF BAR */
 #define PXP_VF_BAR0                             0
 
 #define PXP_VF_BAR0_START_IGU                   0
 #define PXP_VF_BAR0_IGU_LENGTH                  0x3000
-#define PXP_VF_BAR0_END_IGU                     \
-	(PXP_VF_BAR0_START_IGU + PXP_VF_BAR0_IGU_LENGTH - 1)
+#define PXP_VF_BAR0_END_IGU                     (PXP_VF_BAR0_START_IGU + PXP_VF_BAR0_IGU_LENGTH - 1)
 
 #define PXP_VF_BAR0_START_DQ                    0x3000
 #define PXP_VF_BAR0_DQ_LENGTH                   0x200
 #define PXP_VF_BAR0_DQ_OPAQUE_OFFSET            0
 #define PXP_VF_BAR0_ME_OPAQUE_ADDRESS           \
 	(PXP_VF_BAR0_START_DQ + PXP_VF_BAR0_DQ_OPAQUE_OFFSET)
-#define PXP_VF_BAR0_ME_CONCRETE_ADDRESS         \
-	(PXP_VF_BAR0_ME_OPAQUE_ADDRESS + 4)
-#define PXP_VF_BAR0_END_DQ                      \
-	(PXP_VF_BAR0_START_DQ + PXP_VF_BAR0_DQ_LENGTH - 1)
+#define PXP_VF_BAR0_ME_CONCRETE_ADDRESS         (PXP_VF_BAR0_ME_OPAQUE_ADDRESS + 4)
+#define PXP_VF_BAR0_END_DQ                      (PXP_VF_BAR0_START_DQ + PXP_VF_BAR0_DQ_LENGTH - 1)
 
 #define PXP_VF_BAR0_START_TSDM_ZONE_B           0x3200
 #define PXP_VF_BAR0_SDM_LENGTH_ZONE_B           0x200
@@ -611,8 +629,7 @@
 
 #define PXP_VF_BAR0_START_GRC                   0x3E00
 #define PXP_VF_BAR0_GRC_LENGTH                  0x200
-#define PXP_VF_BAR0_END_GRC                     \
-	(PXP_VF_BAR0_START_GRC + PXP_VF_BAR0_GRC_LENGTH - 1)
+#define PXP_VF_BAR0_END_GRC                     (PXP_VF_BAR0_START_GRC + PXP_VF_BAR0_GRC_LENGTH - 1)
 
 #define PXP_VF_BAR0_START_SDM_ZONE_A            0x4000
 #define PXP_VF_BAR0_END_SDM_ZONE_A              0x10000
@@ -627,14 +644,18 @@
 #define PXP_ILT_PAGE_SIZE_NUM_BITS_MIN          12
 #define PXP_ILT_BLOCK_FACTOR_MULTIPLIER         1024
 
-// ILT Records
+/* ILT Records */
 #define PXP_NUM_ILT_RECORDS_BB 7600
 #define PXP_NUM_ILT_RECORDS_K2 11000
-#define MAX_NUM_ILT_RECORDS \
-	OSAL_MAX_T(PXP_NUM_ILT_RECORDS_BB, PXP_NUM_ILT_RECORDS_K2)
+#define MAX_NUM_ILT_RECORDS_E4 OSAL_MAX_T(PXP_NUM_ILT_RECORDS_BB, PXP_NUM_ILT_RECORDS_K2)
 
-// Host Interface
-#define PXP_QUEUES_ZONE_MAX_NUM	320
+#define PXP_NUM_ILT_RECORDS_E5 13664
+#define MAX_NUM_ILT_RECORDS_E5 PXP_NUM_ILT_RECORDS_E5
+
+
+/* Host Interface */
+#define PXP_QUEUES_ZONE_MAX_NUM_E4	320
+#define PXP_QUEUES_ZONE_MAX_NUM_E5	512
 
 
 /*****************/
@@ -653,47 +674,56 @@
 #define SDM_OP_GEN_TRIG_INDICATE_ERROR	6
 #define SDM_OP_GEN_TRIG_INC_ORDER_CNT	9
 
-/***********************************************************/
-/* Completion types                                        */
-/***********************************************************/
-
-#define SDM_COMP_TYPE_NONE		0
-#define SDM_COMP_TYPE_WAKE_THREAD	1
-#define SDM_COMP_TYPE_AGG_INT		2
-/* Send direct message to local CM and/or remote CMs. Destinations are defined
- * by vector in CompParams.
- */
-#define SDM_COMP_TYPE_CM		3
-#define SDM_COMP_TYPE_LOADER		4
-/* Send direct message to PXP (like "internal write" command) to write to remote
- * Storm RAM via remote SDM
- */
-#define SDM_COMP_TYPE_PXP		5
-/* Indicate error per thread */
-#define SDM_COMP_TYPE_INDICATE_ERROR	6
-#define SDM_COMP_TYPE_RELEASE_THREAD	7
-/* Write to local RAM as a completion */
-#define SDM_COMP_TYPE_RAM		8
-#define SDM_COMP_TYPE_INC_ORDER_CNT	9 /* Applicable only for E4 */
+/*////////////////////////////////////////////////////////////*/
+/* Completion types */
+/*////////////////////////////////////////////////////////////*/
 
+#define SDM_COMP_TYPE_NONE				0
+#define SDM_COMP_TYPE_WAKE_THREAD		1
+#define SDM_COMP_TYPE_AGG_INT			2
+/* Send direct message to local CM and/or remote CMs. Destinations are defined by vector in
+ * CompParams.
+ */
+#define SDM_COMP_TYPE_CM				3
+#define SDM_COMP_TYPE_LOADER			4
+/* Send direct message to PXP (like "internal write" command) to write to remote Storm RAM via
+ * remote SDM
+ */
+#define SDM_COMP_TYPE_PXP				5
+#define SDM_COMP_TYPE_INDICATE_ERROR	6		/* Indicate error per thread */
+#define SDM_COMP_TYPE_RELEASE_THREAD	7		/* Obsolete in E5 */
+/* Write to local RAM as a completion */
+#define SDM_COMP_TYPE_RAM				8
+#define SDM_COMP_TYPE_INC_ORDER_CNT		9		/* Applicable only for E5 */
 
 /******************/
 /* PBF CONSTANTS  */
 /******************/
 
 /* Number of PBF command queue lines. */
-#define PBF_MAX_CMD_LINES 3328 /* Each line is 256b */
+#define PBF_MAX_CMD_LINES_E4 3328 /* Each line is 256b */
+#define PBF_MAX_CMD_LINES_E5 5280 /* Each line is 512b */
 
 /* Number of BTB blocks. Each block is 256B. */
 #define BTB_MAX_BLOCKS_BB 1440 /* 2880 blocks of 128B */
 #define BTB_MAX_BLOCKS_K2 1840 /* 3680 blocks of 128B */
-#define BTB_MAX_BLOCKS 1440
+#define BTB_MAX_BLOCKS_E5 2640
 
 /*****************/
 /* PRS CONSTANTS */
 /*****************/
 
 #define PRS_GFT_CAM_LINES_NO_MATCH  31
+/*****************/
+/* GFS CONSTANTS */
+/*****************/
+
+
+#define SRC_HEADER_MAGIC_NUMBER		        0x600DFEED
+#define GFS_HASH_SIZE_IN_BYTES          16
+#define GFS_PROFILE_MAX_ENTRIES         256
+
+
 
 /*
  * Interrupt coalescing TimeSet
@@ -708,16 +738,12 @@ struct coalescing_timeset {
 #define COALESCING_TIMESET_VALID_SHIFT   7
 };
 
+
 struct common_queue_zone {
 	__le16 ring_drv_data_consumer;
 	__le16 reserved;
 };
 
-struct nvmf_eqe_data {
-	__le16 icid /* The connection ID for which the EQE is written. */;
-	u8 reserved0[6] /* Alignment to line */;
-};
-
 
 /*
  * ETH Rx producers data
@@ -741,8 +767,7 @@ struct tcp_ulp_connect_done_params {
 struct iscsi_connect_done_results {
 	__le16 icid /* Context ID of the connection */;
 	__le16 conn_id /* Driver connection ID */;
-/* decided tcp params after connect done */
-	struct tcp_ulp_connect_done_params params;
+	struct tcp_ulp_connect_done_params params /* decided tcp params after connect done */;
 };
 
 
@@ -750,11 +775,10 @@ struct iscsi_eqe_data {
 	__le16 icid /* Context ID of the connection */;
 	__le16 conn_id /* Driver connection ID */;
 	__le16 reserved;
-/* error code - relevant only if the opcode indicates its an error */
-	u8 error_code;
+	u8 error_code /* error code - relevant only if the opcode indicates its an error */;
 	u8 error_pdu_opcode_reserved;
-/* The processed PDUs opcode on which happened the error - updated for specific
- * error codes, by default=0xFF
+/* The processed PDUs opcode on which happened the error - updated for specific error codes, by
+ * default=0xFF
  */
 #define ISCSI_EQE_DATA_ERROR_PDU_OPCODE_MASK        0x3F
 #define ISCSI_EQE_DATA_ERROR_PDU_OPCODE_SHIFT       0
@@ -776,7 +800,38 @@ enum mf_mode {
 	MAX_MF_MODE
 };
 
-/* Per-protocol connection types */
+
+struct nvmf_eqe_data {
+	__le16 icid /* The connection ID for which the EQE is written. */;
+	u8 reserved0[6] /* Alignment to line */;
+};
+
+
+/* Per protocol packet duplication enable bit vector. If set, duplicate offloaded traffic to LL2
+ * debug queueu.
+ */
+struct offload_pkt_dup_enable {
+	__le16 enable_vector;
+#define OFFLOAD_PKT_DUP_ENABLE_ISCSI_MASK      0x1 /* iSCSI */
+#define OFFLOAD_PKT_DUP_ENABLE_ISCSI_SHIFT     0
+#define OFFLOAD_PKT_DUP_ENABLE_FCOE_MASK       0x1 /* FCoE */
+#define OFFLOAD_PKT_DUP_ENABLE_FCOE_SHIFT      1
+#define OFFLOAD_PKT_DUP_ENABLE_ROCE_MASK       0x1 /* RoCE */
+#define OFFLOAD_PKT_DUP_ENABLE_ROCE_SHIFT      2
+#define OFFLOAD_PKT_DUP_ENABLE_LL2_MASK        0x1 /* LL2 */
+#define OFFLOAD_PKT_DUP_ENABLE_LL2_SHIFT       3
+#define OFFLOAD_PKT_DUP_ENABLE_RESERVED_MASK   0x1
+#define OFFLOAD_PKT_DUP_ENABLE_RESERVED_SHIFT  4
+#define OFFLOAD_PKT_DUP_ENABLE_IWARP_MASK      0x1 /* iWARP */
+#define OFFLOAD_PKT_DUP_ENABLE_IWARP_SHIFT     5
+#define OFFLOAD_PKT_DUP_ENABLE_RESERVED1_MASK  0x3FF
+#define OFFLOAD_PKT_DUP_ENABLE_RESERVED1_SHIFT 6
+};
+
+
+/*
+ * Per-protocol connection types
+ */
 enum protocol_type {
 	PROTOCOLID_ISCSI /* iSCSI */,
 	PROTOCOLID_FCOE /* FCoE */,
@@ -794,6 +849,15 @@ enum protocol_type {
 };
 
 
+/*
+ * Pstorm packet duplication config
+ */
+struct pstorm_pkt_dup_cfg {
+	struct offload_pkt_dup_enable enable /* TX packet duplication per protocol enable */;
+	__le16 reserved[3];
+};
+
+
 struct regpair {
 	__le32 lo /* low word for reg-pair */;
 	__le32 hi /* high word for reg-pair */;
@@ -820,12 +884,25 @@ struct rdma_eqe_suspend_qp {
  */
 union rdma_eqe_data {
 	struct regpair async_handle /* Host handle for the Async Completions */;
-	/* RoCE Destroy Event Data */
-	struct rdma_eqe_destroy_qp rdma_destroy_qp_data;
-	/* RoCE Suspend QP Event Data */
-	struct rdma_eqe_suspend_qp rdma_suspend_qp_data;
+	struct rdma_eqe_destroy_qp rdma_destroy_qp_data /* RoCE Destroy Event Data */;
+	struct rdma_eqe_suspend_qp rdma_suspend_qp_data /* RoCE Suspend QP Event Data */;
 };
 
+
+
+
+
+/*
+ * Tstorm packet duplication config
+ */
+struct tstorm_pkt_dup_cfg {
+/* RX and loopback packet duplication per protocol enable */
+	struct offload_pkt_dup_enable enable;
+	__le16 reserved;
+	__le32 cid /* Light L2 debug queue CID. */;
+};
+
+
 struct tstorm_queue_zone {
 	__le32 reserved[2];
 };
@@ -835,8 +912,7 @@ struct tstorm_queue_zone {
  * Ustorm Queue Zone
  */
 struct ustorm_eth_queue_zone {
-/* Rx interrupt coalescing TimeSet */
-	struct coalescing_timeset int_coalescing_timeset;
+	struct coalescing_timeset int_coalescing_timeset /* Rx interrupt coalescing TimeSet */;
 	u8 reserved[3];
 };
 
@@ -846,28 +922,30 @@ struct ustorm_queue_zone {
 	struct common_queue_zone common;
 };
 
-/* status block structure */
+
+/*
+ * status block structure
+ */
 struct cau_pi_entry {
 	__le32 prod;
-/* A per protocol indexPROD value. */
-#define CAU_PI_ENTRY_PROD_VAL_MASK    0xFFFF
+#define CAU_PI_ENTRY_PROD_VAL_MASK    0xFFFF /* A per protocol indexPROD value. */
 #define CAU_PI_ENTRY_PROD_VAL_SHIFT   0
-/* This value determines the TimeSet that the PI is associated with */
+/* This value determines the TimeSet that the PI is associated with  */
 #define CAU_PI_ENTRY_PI_TIMESET_MASK  0x7F
 #define CAU_PI_ENTRY_PI_TIMESET_SHIFT 16
-/* Select the FSM within the SB */
-#define CAU_PI_ENTRY_FSM_SEL_MASK     0x1
+#define CAU_PI_ENTRY_FSM_SEL_MASK     0x1 /* Select the FSM within the SB */
 #define CAU_PI_ENTRY_FSM_SEL_SHIFT    23
-/* Select the FSM within the SB */
-#define CAU_PI_ENTRY_RESERVED_MASK    0xFF
+#define CAU_PI_ENTRY_RESERVED_MASK    0xFF /* Select the FSM within the SB */
 #define CAU_PI_ENTRY_RESERVED_SHIFT   24
 };
 
-/* status block structure */
+
+/*
+ * status block structure
+ */
 struct cau_sb_entry {
 	__le32 data;
-/* The SB PROD index which is sent to the IGU. */
-#define CAU_SB_ENTRY_SB_PROD_MASK      0xFFFFFF
+#define CAU_SB_ENTRY_SB_PROD_MASK      0xFFFFFF /* The SB PROD index which is sent to the IGU. */
 #define CAU_SB_ENTRY_SB_PROD_SHIFT     0
 #define CAU_SB_ENTRY_STATE0_MASK       0xF /* RX state */
 #define CAU_SB_ENTRY_STATE0_SHIFT      24
@@ -880,10 +958,10 @@ struct cau_sb_entry {
 /* Indicates the TX TimeSet that this SB is associated with. */
 #define CAU_SB_ENTRY_SB_TIMESET1_MASK  0x7F
 #define CAU_SB_ENTRY_SB_TIMESET1_SHIFT 7
-/* This value will determine the RX FSM timer resolution in ticks */
+/* This value will determine the RX FSM timer resolution in ticks  */
 #define CAU_SB_ENTRY_TIMER_RES0_MASK   0x3
 #define CAU_SB_ENTRY_TIMER_RES0_SHIFT  14
-/* This value will determine the TX FSM timer resolution in ticks */
+/* This value will determine the TX FSM timer resolution in ticks  */
 #define CAU_SB_ENTRY_TIMER_RES1_MASK   0x3
 #define CAU_SB_ENTRY_TIMER_RES1_SHIFT  16
 #define CAU_SB_ENTRY_VF_NUMBER_MASK    0xFF
@@ -892,8 +970,8 @@ struct cau_sb_entry {
 #define CAU_SB_ENTRY_VF_VALID_SHIFT    26
 #define CAU_SB_ENTRY_PF_NUMBER_MASK    0xF
 #define CAU_SB_ENTRY_PF_NUMBER_SHIFT   27
-/* If set then indicates that the TPH STAG is equal to the SB number. Otherwise
- * the STAG will be equal to all ones.
+/* If set then indicates that the TPH STAG is equal to the SB number. Otherwise the STAG will be
+ * equal to all ones.
  */
 #define CAU_SB_ENTRY_TPH_MASK          0x1
 #define CAU_SB_ENTRY_TPH_SHIFT         31
@@ -901,8 +979,7 @@ struct cau_sb_entry {
 
 
 /*
- * Igu cleanup bit values to distinguish between clean or producer consumer
- * update.
+ * Igu cleanup bit values to distinguish between clean or producer consumer update.
  */
 enum command_type_bit {
 	IGU_COMMAND_TYPE_NOP = 0,
@@ -911,28 +988,29 @@ enum command_type_bit {
 };
 
 
-/* core doorbell data */
+/*
+ * core doorbell data
+ */
 struct core_db_data {
 	u8 params;
-/* destination of doorbell (use enum db_dest) */
-#define CORE_DB_DATA_DEST_MASK         0x3
+#define CORE_DB_DATA_DEST_MASK         0x3 /* destination of doorbell (use enum db_dest) */
 #define CORE_DB_DATA_DEST_SHIFT        0
-/* aggregative command to CM (use enum db_agg_cmd_sel) */
-#define CORE_DB_DATA_AGG_CMD_MASK      0x3
+#define CORE_DB_DATA_AGG_CMD_MASK      0x3 /* aggregative command to CM (use enum db_agg_cmd_sel) */
 #define CORE_DB_DATA_AGG_CMD_SHIFT     2
 #define CORE_DB_DATA_BYPASS_EN_MASK    0x1 /* enable QM bypass */
 #define CORE_DB_DATA_BYPASS_EN_SHIFT   4
 #define CORE_DB_DATA_RESERVED_MASK     0x1
 #define CORE_DB_DATA_RESERVED_SHIFT    5
-/* aggregative value selection */
-#define CORE_DB_DATA_AGG_VAL_SEL_MASK  0x3
+#define CORE_DB_DATA_AGG_VAL_SEL_MASK  0x3 /* aggregative value selection */
 #define CORE_DB_DATA_AGG_VAL_SEL_SHIFT 6
-/* bit for every DQ counter flags in CM context that DQ can increment */
-	u8	agg_flags;
-	__le16	spq_prod;
+	u8 agg_flags /* bit for every DQ counter flags in CM context that DQ can increment */;
+	__le16 spq_prod;
 };
 
-/* Enum of doorbell aggregative command selection */
+
+/*
+ * Enum of doorbell aggregative command selection
+ */
 enum db_agg_cmd_sel {
 	DB_AGG_CMD_NOP /* No operation */,
 	DB_AGG_CMD_SET /* Set the value */,
@@ -941,7 +1019,10 @@ enum db_agg_cmd_sel {
 	MAX_DB_AGG_CMD_SEL
 };
 
-/* Enum of doorbell destination */
+
+/*
+ * Enum of doorbell destination
+ */
 enum db_dest {
 	DB_DEST_XCM /* TX doorbell to XCM */,
 	DB_DEST_UCM /* RX doorbell to UCM */,
@@ -957,42 +1038,37 @@ enum db_dest {
 enum db_dpm_type {
 	DPM_LEGACY /* Legacy DPM- to Xstorm RAM */,
 	DPM_RDMA /* RDMA DPM (only RoCE in E4) - to NIG */,
-/* L2 DPM inline- to PBF, with packet data on doorbell */
-	DPM_L2_INLINE,
+	DPM_L2_INLINE /* L2 DPM inline- to PBF, with packet data on doorbell */,
 	DPM_L2_BD /* L2 DPM with BD- to PBF, with TX BD data on doorbell */,
 	MAX_DB_DPM_TYPE
 };
 
+
 /*
- * Structure for doorbell data, in L2 DPM mode, for the first doorbell in a DPM
- * burst
+ * Structure for doorbell data, in L2 DPM mode, for the first doorbell in a DPM burst
  */
 struct db_l2_dpm_data {
 	__le16 icid /* internal CID */;
 	__le16 bd_prod /* bd producer value to update */;
 	__le32 params;
-/* Size in QWORD-s of the DPM burst */
-#define DB_L2_DPM_DATA_SIZE_MASK        0x3F
-#define DB_L2_DPM_DATA_SIZE_SHIFT       0
-/* Type of DPM transaction (DPM_L2_INLINE or DPM_L2_BD) (use enum db_dpm_type)
- */
-#define DB_L2_DPM_DATA_DPM_TYPE_MASK    0x3
-#define DB_L2_DPM_DATA_DPM_TYPE_SHIFT   6
-#define DB_L2_DPM_DATA_NUM_BDS_MASK     0xFF /* number of BD-s */
-#define DB_L2_DPM_DATA_NUM_BDS_SHIFT    8
-/* size of the packet to be transmitted in bytes */
-#define DB_L2_DPM_DATA_PKT_SIZE_MASK    0x7FF
-#define DB_L2_DPM_DATA_PKT_SIZE_SHIFT   16
-#define DB_L2_DPM_DATA_RESERVED0_MASK   0x1
-#define DB_L2_DPM_DATA_RESERVED0_SHIFT  27
-/* In DPM_L2_BD mode: the number of SGE-s */
-#define DB_L2_DPM_DATA_SGE_NUM_MASK     0x7
-#define DB_L2_DPM_DATA_SGE_NUM_SHIFT    28
-/* Flag indicating whether to enable GFS search */
-#define DB_L2_DPM_DATA_RESERVED1_MASK   0x1
-#define DB_L2_DPM_DATA_RESERVED1_SHIFT  31
+#define DB_L2_DPM_DATA_SIZE_MASK         0x3F /* Size in QWORD-s of the DPM burst */
+#define DB_L2_DPM_DATA_SIZE_SHIFT        0
+/* Type of DPM transaction (DPM_L2_INLINE or DPM_L2_BD) (use enum db_dpm_type) */
+#define DB_L2_DPM_DATA_DPM_TYPE_MASK     0x3
+#define DB_L2_DPM_DATA_DPM_TYPE_SHIFT    6
+#define DB_L2_DPM_DATA_NUM_BDS_MASK      0xFF /* number of BD-s */
+#define DB_L2_DPM_DATA_NUM_BDS_SHIFT     8
+#define DB_L2_DPM_DATA_PKT_SIZE_MASK     0x7FF /* size of the packet to be transmitted in bytes */
+#define DB_L2_DPM_DATA_PKT_SIZE_SHIFT    16
+#define DB_L2_DPM_DATA_RESERVED0_MASK    0x1
+#define DB_L2_DPM_DATA_RESERVED0_SHIFT   27
+#define DB_L2_DPM_DATA_SGE_NUM_MASK      0x7 /* In DPM_L2_BD mode: the number of SGE-s */
+#define DB_L2_DPM_DATA_SGE_NUM_SHIFT     28
+#define DB_L2_DPM_DATA_TGFS_SRC_EN_MASK  0x1 /* Flag indicating whether to enable TGFS search */
+#define DB_L2_DPM_DATA_TGFS_SRC_EN_SHIFT 31
 };
 
+
 /*
  * Structure for SGE in a DPM doorbell of type DPM_L2_BD
  */
@@ -1000,48 +1076,31 @@ struct db_l2_dpm_sge {
 	struct regpair addr /* Single continuous buffer */;
 	__le16 nbytes /* Number of bytes in this BD. */;
 	__le16 bitfields;
-/* The TPH STAG index value */
-#define DB_L2_DPM_SGE_TPH_ST_INDEX_MASK  0x1FF
+#define DB_L2_DPM_SGE_TPH_ST_INDEX_MASK  0x1FF /* The TPH STAG index value */
 #define DB_L2_DPM_SGE_TPH_ST_INDEX_SHIFT 0
 #define DB_L2_DPM_SGE_RESERVED0_MASK     0x3
 #define DB_L2_DPM_SGE_RESERVED0_SHIFT    9
-/* Indicate if ST hint is requested or not */
-#define DB_L2_DPM_SGE_ST_VALID_MASK      0x1
+#define DB_L2_DPM_SGE_ST_VALID_MASK      0x1 /* Indicate if ST hint is requested or not */
 #define DB_L2_DPM_SGE_ST_VALID_SHIFT     11
 #define DB_L2_DPM_SGE_RESERVED1_MASK     0xF
 #define DB_L2_DPM_SGE_RESERVED1_SHIFT    12
 	__le32 reserved2;
 };
 
-/* Structure for doorbell address, in legacy mode */
+
+/*
+ * Structure for doorbell address, in legacy mode
+ */
 struct db_legacy_addr {
 	__le32 addr;
 #define DB_LEGACY_ADDR_RESERVED0_MASK  0x3
 #define DB_LEGACY_ADDR_RESERVED0_SHIFT 0
-/* doorbell extraction mode specifier- 0 if not used */
-#define DB_LEGACY_ADDR_DEMS_MASK       0x7
+#define DB_LEGACY_ADDR_DEMS_MASK       0x7 /* doorbell extraction mode specifier- 0 if not used */
 #define DB_LEGACY_ADDR_DEMS_SHIFT      2
 #define DB_LEGACY_ADDR_ICID_MASK       0x7FFFFFF /* internal CID */
 #define DB_LEGACY_ADDR_ICID_SHIFT      5
 };
 
-/*
- * Structure for doorbell address, in PWM mode
- */
-struct db_pwm_addr {
-	__le32 addr;
-#define DB_PWM_ADDR_RESERVED0_MASK  0x7
-#define DB_PWM_ADDR_RESERVED0_SHIFT 0
-/* Offset in PWM address space */
-#define DB_PWM_ADDR_OFFSET_MASK     0x7F
-#define DB_PWM_ADDR_OFFSET_SHIFT    3
-#define DB_PWM_ADDR_WID_MASK        0x3 /* Window ID */
-#define DB_PWM_ADDR_WID_SHIFT       10
-#define DB_PWM_ADDR_DPI_MASK        0xFFFF /* Doorbell page ID */
-#define DB_PWM_ADDR_DPI_SHIFT       12
-#define DB_PWM_ADDR_RESERVED1_MASK  0xF
-#define DB_PWM_ADDR_RESERVED1_SHIFT 28
-};
 
 /*
  * Structure for doorbell address, in legacy mode, without DEMS
@@ -1056,37 +1115,23 @@ struct db_legacy_wo_dems_addr {
 
 
 /*
- * Parameters to RDMA firmware, passed in EDPM doorbell
+ * Structure for doorbell address, in PWM mode
  */
-struct db_rdma_dpm_params {
-	__le32 params;
-/* Size in QWORD-s of the DPM burst */
-#define DB_RDMA_DPM_PARAMS_SIZE_MASK                0x3F
-#define DB_RDMA_DPM_PARAMS_SIZE_SHIFT               0
-/* Type of DPM transacation (DPM_RDMA) (use enum db_dpm_type) */
-#define DB_RDMA_DPM_PARAMS_DPM_TYPE_MASK            0x3
-#define DB_RDMA_DPM_PARAMS_DPM_TYPE_SHIFT           6
-/* opcode for RDMA operation */
-#define DB_RDMA_DPM_PARAMS_OPCODE_MASK              0xFF
-#define DB_RDMA_DPM_PARAMS_OPCODE_SHIFT             8
-/* the size of the WQE payload in bytes */
-#define DB_RDMA_DPM_PARAMS_WQE_SIZE_MASK            0x7FF
-#define DB_RDMA_DPM_PARAMS_WQE_SIZE_SHIFT           16
-#define DB_RDMA_DPM_PARAMS_RESERVED0_MASK           0x1
-#define DB_RDMA_DPM_PARAMS_RESERVED0_SHIFT          27
-/* RoCE ack request (will be set 1) */
-#define DB_RDMA_DPM_PARAMS_ACK_REQUEST_MASK         0x1
-#define DB_RDMA_DPM_PARAMS_ACK_REQUEST_SHIFT        28
-#define DB_RDMA_DPM_PARAMS_S_FLG_MASK               0x1 /* RoCE S flag */
-#define DB_RDMA_DPM_PARAMS_S_FLG_SHIFT              29
-/* RoCE completion flag for FW use */
-#define DB_RDMA_DPM_PARAMS_COMPLETION_FLG_MASK      0x1
-#define DB_RDMA_DPM_PARAMS_COMPLETION_FLG_SHIFT     30
-/* Connection type is iWARP */
-#define DB_RDMA_DPM_PARAMS_CONN_TYPE_IS_IWARP_MASK  0x1
-#define DB_RDMA_DPM_PARAMS_CONN_TYPE_IS_IWARP_SHIFT 31
+struct db_pwm_addr {
+	__le32 addr;
+#define DB_PWM_ADDR_RESERVED0_MASK  0x7
+#define DB_PWM_ADDR_RESERVED0_SHIFT 0
+#define DB_PWM_ADDR_OFFSET_MASK     0x7F /* Offset in PWM address space */
+#define DB_PWM_ADDR_OFFSET_SHIFT    3
+#define DB_PWM_ADDR_WID_MASK        0x3 /* Window ID */
+#define DB_PWM_ADDR_WID_SHIFT       10
+#define DB_PWM_ADDR_DPI_MASK        0xFFFF /* Doorbell page ID */
+#define DB_PWM_ADDR_DPI_SHIFT       12
+#define DB_PWM_ADDR_RESERVED1_MASK  0xF
+#define DB_PWM_ADDR_RESERVED1_SHIFT 28
 };
 
+
 /*
  * Parameters to RDMA firmware, passed in EDPM doorbell
  */
@@ -1098,11 +1143,9 @@ struct db_rdma_24b_icid_dpm_params {
 /* Type of DPM transacation (DPM_RDMA) (use enum db_dpm_type) */
 #define DB_RDMA_24B_ICID_DPM_PARAMS_DPM_TYPE_MASK            0x3
 #define DB_RDMA_24B_ICID_DPM_PARAMS_DPM_TYPE_SHIFT           6
-/* opcode for RDMA operation */
-#define DB_RDMA_24B_ICID_DPM_PARAMS_OPCODE_MASK              0xFF
+#define DB_RDMA_24B_ICID_DPM_PARAMS_OPCODE_MASK              0xFF /* opcode for RDMA operation */
 #define DB_RDMA_24B_ICID_DPM_PARAMS_OPCODE_SHIFT             8
-/* ICID extension */
-#define DB_RDMA_24B_ICID_DPM_PARAMS_ICID_EXT_MASK            0xFF
+#define DB_RDMA_24B_ICID_DPM_PARAMS_ICID_EXT_MASK            0xFF /* ICID extension */
 #define DB_RDMA_24B_ICID_DPM_PARAMS_ICID_EXT_SHIFT           16
 /* Number of invalid bytes in last QWROD of the DPM transaction */
 #define DB_RDMA_24B_ICID_DPM_PARAMS_INV_BYTE_CNT_MASK        0x7
@@ -1110,41 +1153,571 @@ struct db_rdma_24b_icid_dpm_params {
 /* Flag indicating 24b icid mode is enabled */
 #define DB_RDMA_24B_ICID_DPM_PARAMS_EXT_ICID_MODE_EN_MASK    0x1
 #define DB_RDMA_24B_ICID_DPM_PARAMS_EXT_ICID_MODE_EN_SHIFT   27
-/* RoCE completion flag */
-#define DB_RDMA_24B_ICID_DPM_PARAMS_COMPLETION_FLG_MASK      0x1
+#define DB_RDMA_24B_ICID_DPM_PARAMS_COMPLETION_FLG_MASK      0x1 /* RoCE completion flag */
 #define DB_RDMA_24B_ICID_DPM_PARAMS_COMPLETION_FLG_SHIFT     28
-/* RoCE S flag */
-#define DB_RDMA_24B_ICID_DPM_PARAMS_S_FLG_MASK               0x1
+#define DB_RDMA_24B_ICID_DPM_PARAMS_S_FLG_MASK               0x1 /* RoCE S flag */
 #define DB_RDMA_24B_ICID_DPM_PARAMS_S_FLG_SHIFT              29
 #define DB_RDMA_24B_ICID_DPM_PARAMS_RESERVED1_MASK           0x1
 #define DB_RDMA_24B_ICID_DPM_PARAMS_RESERVED1_SHIFT          30
-/* Connection type is iWARP */
-#define DB_RDMA_24B_ICID_DPM_PARAMS_CONN_TYPE_IS_IWARP_MASK  0x1
+#define DB_RDMA_24B_ICID_DPM_PARAMS_CONN_TYPE_IS_IWARP_MASK  0x1 /* Connection type is iWARP */
 #define DB_RDMA_24B_ICID_DPM_PARAMS_CONN_TYPE_IS_IWARP_SHIFT 31
 };
 
 
 /*
- * Structure for doorbell data, in RDMA DPM mode, for the first doorbell in a
- * DPM burst
+ * Parameters to RDMA firmware, passed in EDPM doorbell
+ */
+struct db_rdma_dpm_params {
+	__le32 params;
+#define DB_RDMA_DPM_PARAMS_SIZE_MASK                0x3F /* Size in QWORD-s of the DPM burst */
+#define DB_RDMA_DPM_PARAMS_SIZE_SHIFT               0
+/* Type of DPM transacation (DPM_RDMA) (use enum db_dpm_type) */
+#define DB_RDMA_DPM_PARAMS_DPM_TYPE_MASK            0x3
+#define DB_RDMA_DPM_PARAMS_DPM_TYPE_SHIFT           6
+#define DB_RDMA_DPM_PARAMS_OPCODE_MASK              0xFF /* opcode for RDMA operation */
+#define DB_RDMA_DPM_PARAMS_OPCODE_SHIFT             8
+#define DB_RDMA_DPM_PARAMS_WQE_SIZE_MASK            0x7FF /* the size of the WQE payload in bytes */
+#define DB_RDMA_DPM_PARAMS_WQE_SIZE_SHIFT           16
+#define DB_RDMA_DPM_PARAMS_RESERVED0_MASK           0x1
+#define DB_RDMA_DPM_PARAMS_RESERVED0_SHIFT          27
+#define DB_RDMA_DPM_PARAMS_ACK_REQUEST_MASK         0x1 /* RoCE ack request (will be set 1) */
+#define DB_RDMA_DPM_PARAMS_ACK_REQUEST_SHIFT        28
+#define DB_RDMA_DPM_PARAMS_S_FLG_MASK               0x1 /* RoCE S flag */
+#define DB_RDMA_DPM_PARAMS_S_FLG_SHIFT              29
+#define DB_RDMA_DPM_PARAMS_COMPLETION_FLG_MASK      0x1 /* RoCE completion flag for FW use */
+#define DB_RDMA_DPM_PARAMS_COMPLETION_FLG_SHIFT     30
+#define DB_RDMA_DPM_PARAMS_CONN_TYPE_IS_IWARP_MASK  0x1 /* Connection type is iWARP */
+#define DB_RDMA_DPM_PARAMS_CONN_TYPE_IS_IWARP_SHIFT 31
+};
+
+/*
+ * Structure for doorbell data, in RDMA DPM mode, for the first doorbell in a DPM burst
  */
 struct db_rdma_dpm_data {
 	__le16 icid /* internal CID */;
 	__le16 prod_val /* aggregated value to update */;
-/* parameters passed to RDMA firmware */
-	struct db_rdma_dpm_params params;
+	struct db_rdma_dpm_params params /* parameters passed to RDMA firmware */;
+};
+
+
+
+/*
+ * Rdif context
+ */
+struct e4_rdif_task_context {
+	__le32 initial_ref_tag;
+	__le16 app_tag_value;
+	__le16 app_tag_mask;
+	u8 flags0;
+#define E4_RDIF_TASK_CONTEXT_IGNORE_APP_TAG_MASK             0x1
+#define E4_RDIF_TASK_CONTEXT_IGNORE_APP_TAG_SHIFT            0
+#define E4_RDIF_TASK_CONTEXT_INITIAL_REF_TAG_VALID_MASK      0x1
+#define E4_RDIF_TASK_CONTEXT_INITIAL_REF_TAG_VALID_SHIFT     1
+#define E4_RDIF_TASK_CONTEXT_HOST_GUARD_TYPE_MASK            0x1 /* 0 = IP checksum, 1 = CRC */
+#define E4_RDIF_TASK_CONTEXT_HOST_GUARD_TYPE_SHIFT           2
+#define E4_RDIF_TASK_CONTEXT_SET_ERROR_WITH_EOP_MASK         0x1
+#define E4_RDIF_TASK_CONTEXT_SET_ERROR_WITH_EOP_SHIFT        3
+#define E4_RDIF_TASK_CONTEXT_PROTECTION_TYPE_MASK            0x3 /* 1/2/3 - Protection Type */
+#define E4_RDIF_TASK_CONTEXT_PROTECTION_TYPE_SHIFT           4
+#define E4_RDIF_TASK_CONTEXT_CRC_SEED_MASK                   0x1 /* 0=0x0000, 1=0xffff */
+#define E4_RDIF_TASK_CONTEXT_CRC_SEED_SHIFT                  6
+#define E4_RDIF_TASK_CONTEXT_KEEP_REF_TAG_CONST_MASK         0x1 /* Keep reference tag constant */
+#define E4_RDIF_TASK_CONTEXT_KEEP_REF_TAG_CONST_SHIFT        7
+	u8 partial_dif_data[7];
+	__le16 partial_crc_value;
+	__le16 partial_checksum_value;
+	__le32 offset_in_io;
+	__le16 flags1;
+#define E4_RDIF_TASK_CONTEXT_VALIDATE_GUARD_MASK             0x1
+#define E4_RDIF_TASK_CONTEXT_VALIDATE_GUARD_SHIFT            0
+#define E4_RDIF_TASK_CONTEXT_VALIDATE_APP_TAG_MASK           0x1
+#define E4_RDIF_TASK_CONTEXT_VALIDATE_APP_TAG_SHIFT          1
+#define E4_RDIF_TASK_CONTEXT_VALIDATE_REF_TAG_MASK           0x1
+#define E4_RDIF_TASK_CONTEXT_VALIDATE_REF_TAG_SHIFT          2
+#define E4_RDIF_TASK_CONTEXT_FORWARD_GUARD_MASK              0x1
+#define E4_RDIF_TASK_CONTEXT_FORWARD_GUARD_SHIFT             3
+#define E4_RDIF_TASK_CONTEXT_FORWARD_APP_TAG_MASK            0x1
+#define E4_RDIF_TASK_CONTEXT_FORWARD_APP_TAG_SHIFT           4
+#define E4_RDIF_TASK_CONTEXT_FORWARD_REF_TAG_MASK            0x1
+#define E4_RDIF_TASK_CONTEXT_FORWARD_REF_TAG_SHIFT           5
+/* 0=512B, 1=1KB, 2=2KB, 3=4KB, 4=8KB */
+#define E4_RDIF_TASK_CONTEXT_INTERVAL_SIZE_MASK              0x7
+#define E4_RDIF_TASK_CONTEXT_INTERVAL_SIZE_SHIFT             6
+#define E4_RDIF_TASK_CONTEXT_HOST_INTERFACE_MASK             0x3 /* 0=None, 1=DIF, 2=DIX */
+#define E4_RDIF_TASK_CONTEXT_HOST_INTERFACE_SHIFT            9
+/* DIF tag right at the beginning of DIF interval */
+#define E4_RDIF_TASK_CONTEXT_DIF_BEFORE_DATA_MASK            0x1
+#define E4_RDIF_TASK_CONTEXT_DIF_BEFORE_DATA_SHIFT           11
+#define E4_RDIF_TASK_CONTEXT_RESERVED0_MASK                  0x1
+#define E4_RDIF_TASK_CONTEXT_RESERVED0_SHIFT                 12
+#define E4_RDIF_TASK_CONTEXT_NETWORK_INTERFACE_MASK          0x1 /* 0=None, 1=DIF */
+#define E4_RDIF_TASK_CONTEXT_NETWORK_INTERFACE_SHIFT         13
+/* Forward application tag with mask */
+#define E4_RDIF_TASK_CONTEXT_FORWARD_APP_TAG_WITH_MASK_MASK  0x1
+#define E4_RDIF_TASK_CONTEXT_FORWARD_APP_TAG_WITH_MASK_SHIFT 14
+/* Forward reference tag with mask */
+#define E4_RDIF_TASK_CONTEXT_FORWARD_REF_TAG_WITH_MASK_MASK  0x1
+#define E4_RDIF_TASK_CONTEXT_FORWARD_REF_TAG_WITH_MASK_SHIFT 15
+	__le16 state;
+#define E4_RDIF_TASK_CONTEXT_RECEIVED_DIF_BYTES_LEFT_MASK    0xF
+#define E4_RDIF_TASK_CONTEXT_RECEIVED_DIF_BYTES_LEFT_SHIFT   0
+#define E4_RDIF_TASK_CONTEXT_TRANSMITED_DIF_BYTES_LEFT_MASK  0xF
+#define E4_RDIF_TASK_CONTEXT_TRANSMITED_DIF_BYTES_LEFT_SHIFT 4
+#define E4_RDIF_TASK_CONTEXT_ERROR_IN_IO_MASK                0x1
+#define E4_RDIF_TASK_CONTEXT_ERROR_IN_IO_SHIFT               8
+#define E4_RDIF_TASK_CONTEXT_CHECKSUM_OVERFLOW_MASK          0x1
+#define E4_RDIF_TASK_CONTEXT_CHECKSUM_OVERFLOW_SHIFT         9
+/* mask for refernce tag handling */
+#define E4_RDIF_TASK_CONTEXT_REF_TAG_MASK_MASK               0xF
+#define E4_RDIF_TASK_CONTEXT_REF_TAG_MASK_SHIFT              10
+#define E4_RDIF_TASK_CONTEXT_RESERVED1_MASK                  0x3
+#define E4_RDIF_TASK_CONTEXT_RESERVED1_SHIFT                 14
+	__le32 reserved2;
 };
 
-/* Igu interrupt command */
+
+/*
+ * Tdif context
+ */
+struct e4_tdif_task_context {
+	__le32 initial_ref_tag;
+	__le16 app_tag_value;
+	__le16 app_tag_mask;
+	__le16 partial_crc_value_b;
+	__le16 partial_checksum_value_b;
+	__le16 stateB;
+#define E4_TDIF_TASK_CONTEXT_RECEIVED_DIF_BYTES_LEFT_B_MASK    0xF
+#define E4_TDIF_TASK_CONTEXT_RECEIVED_DIF_BYTES_LEFT_B_SHIFT   0
+#define E4_TDIF_TASK_CONTEXT_TRANSMITED_DIF_BYTES_LEFT_B_MASK  0xF
+#define E4_TDIF_TASK_CONTEXT_TRANSMITED_DIF_BYTES_LEFT_B_SHIFT 4
+#define E4_TDIF_TASK_CONTEXT_ERROR_IN_IO_B_MASK                0x1
+#define E4_TDIF_TASK_CONTEXT_ERROR_IN_IO_B_SHIFT               8
+#define E4_TDIF_TASK_CONTEXT_CHECKSUM_VERFLOW_MASK             0x1
+#define E4_TDIF_TASK_CONTEXT_CHECKSUM_VERFLOW_SHIFT            9
+#define E4_TDIF_TASK_CONTEXT_RESERVED0_MASK                    0x3F
+#define E4_TDIF_TASK_CONTEXT_RESERVED0_SHIFT                   10
+	u8 reserved1;
+	u8 flags0;
+#define E4_TDIF_TASK_CONTEXT_IGNORE_APP_TAG_MASK               0x1
+#define E4_TDIF_TASK_CONTEXT_IGNORE_APP_TAG_SHIFT              0
+#define E4_TDIF_TASK_CONTEXT_INITIAL_REF_TAG_VALID_MASK        0x1
+#define E4_TDIF_TASK_CONTEXT_INITIAL_REF_TAG_VALID_SHIFT       1
+#define E4_TDIF_TASK_CONTEXT_HOST_GUARD_TYPE_MASK              0x1 /* 0 = IP checksum, 1 = CRC */
+#define E4_TDIF_TASK_CONTEXT_HOST_GUARD_TYPE_SHIFT             2
+#define E4_TDIF_TASK_CONTEXT_SET_ERROR_WITH_EOP_MASK           0x1
+#define E4_TDIF_TASK_CONTEXT_SET_ERROR_WITH_EOP_SHIFT          3
+#define E4_TDIF_TASK_CONTEXT_PROTECTION_TYPE_MASK              0x3 /* 1/2/3 - Protection Type */
+#define E4_TDIF_TASK_CONTEXT_PROTECTION_TYPE_SHIFT             4
+#define E4_TDIF_TASK_CONTEXT_CRC_SEED_MASK                     0x1 /* 0=0x0000, 1=0xffff */
+#define E4_TDIF_TASK_CONTEXT_CRC_SEED_SHIFT                    6
+#define E4_TDIF_TASK_CONTEXT_RESERVED2_MASK                    0x1
+#define E4_TDIF_TASK_CONTEXT_RESERVED2_SHIFT                   7
+	__le32 flags1;
+#define E4_TDIF_TASK_CONTEXT_VALIDATE_GUARD_MASK               0x1
+#define E4_TDIF_TASK_CONTEXT_VALIDATE_GUARD_SHIFT              0
+#define E4_TDIF_TASK_CONTEXT_VALIDATE_APP_TAG_MASK             0x1
+#define E4_TDIF_TASK_CONTEXT_VALIDATE_APP_TAG_SHIFT            1
+#define E4_TDIF_TASK_CONTEXT_VALIDATE_REF_TAG_MASK             0x1
+#define E4_TDIF_TASK_CONTEXT_VALIDATE_REF_TAG_SHIFT            2
+#define E4_TDIF_TASK_CONTEXT_FORWARD_GUARD_MASK                0x1
+#define E4_TDIF_TASK_CONTEXT_FORWARD_GUARD_SHIFT               3
+#define E4_TDIF_TASK_CONTEXT_FORWARD_APP_TAG_MASK              0x1
+#define E4_TDIF_TASK_CONTEXT_FORWARD_APP_TAG_SHIFT             4
+#define E4_TDIF_TASK_CONTEXT_FORWARD_REF_TAG_MASK              0x1
+#define E4_TDIF_TASK_CONTEXT_FORWARD_REF_TAG_SHIFT             5
+/* 0=512B, 1=1KB, 2=2KB, 3=4KB, 4=8KB */
+#define E4_TDIF_TASK_CONTEXT_INTERVAL_SIZE_MASK                0x7
+#define E4_TDIF_TASK_CONTEXT_INTERVAL_SIZE_SHIFT               6
+#define E4_TDIF_TASK_CONTEXT_HOST_INTERFACE_MASK               0x3 /* 0=None, 1=DIF, 2=DIX */
+#define E4_TDIF_TASK_CONTEXT_HOST_INTERFACE_SHIFT              9
+/* DIF tag right at the beginning of DIF interval */
+#define E4_TDIF_TASK_CONTEXT_DIF_BEFORE_DATA_MASK              0x1
+#define E4_TDIF_TASK_CONTEXT_DIF_BEFORE_DATA_SHIFT             11
+#define E4_TDIF_TASK_CONTEXT_RESERVED3_MASK                    0x1 /* reserved */
+#define E4_TDIF_TASK_CONTEXT_RESERVED3_SHIFT                   12
+#define E4_TDIF_TASK_CONTEXT_NETWORK_INTERFACE_MASK            0x1 /* 0=None, 1=DIF */
+#define E4_TDIF_TASK_CONTEXT_NETWORK_INTERFACE_SHIFT           13
+#define E4_TDIF_TASK_CONTEXT_RECEIVED_DIF_BYTES_LEFT_A_MASK    0xF
+#define E4_TDIF_TASK_CONTEXT_RECEIVED_DIF_BYTES_LEFT_A_SHIFT   14
+#define E4_TDIF_TASK_CONTEXT_TRANSMITED_DIF_BYTES_LEFT_A_MASK  0xF
+#define E4_TDIF_TASK_CONTEXT_TRANSMITED_DIF_BYTES_LEFT_A_SHIFT 18
+#define E4_TDIF_TASK_CONTEXT_ERROR_IN_IO_A_MASK                0x1
+#define E4_TDIF_TASK_CONTEXT_ERROR_IN_IO_A_SHIFT               22
+#define E4_TDIF_TASK_CONTEXT_CHECKSUM_OVERFLOW_A_MASK          0x1
+#define E4_TDIF_TASK_CONTEXT_CHECKSUM_OVERFLOW_A_SHIFT         23
+/* mask for refernce tag handling */
+#define E4_TDIF_TASK_CONTEXT_REF_TAG_MASK_MASK                 0xF
+#define E4_TDIF_TASK_CONTEXT_REF_TAG_MASK_SHIFT                24
+/* Forward application tag with mask */
+#define E4_TDIF_TASK_CONTEXT_FORWARD_APP_TAG_WITH_MASK_MASK    0x1
+#define E4_TDIF_TASK_CONTEXT_FORWARD_APP_TAG_WITH_MASK_SHIFT   28
+/* Forward reference tag with mask */
+#define E4_TDIF_TASK_CONTEXT_FORWARD_REF_TAG_WITH_MASK_MASK    0x1
+#define E4_TDIF_TASK_CONTEXT_FORWARD_REF_TAG_WITH_MASK_SHIFT   29
+#define E4_TDIF_TASK_CONTEXT_KEEP_REF_TAG_CONST_MASK           0x1 /* Keep reference tag constant */
+#define E4_TDIF_TASK_CONTEXT_KEEP_REF_TAG_CONST_SHIFT          30
+#define E4_TDIF_TASK_CONTEXT_RESERVED4_MASK                    0x1
+#define E4_TDIF_TASK_CONTEXT_RESERVED4_SHIFT                   31
+	__le32 offset_in_io_b;
+	__le16 partial_crc_value_a;
+	__le16 partial_checksum_value_a;
+	__le32 offset_in_io_a;
+	u8 partial_dif_data_a[8];
+	u8 partial_dif_data_b[8];
+};
+
+
+/*
+ * Rdif context
+ */
+struct e5_rdif_task_context {
+	__le32 initial_ref_tag;
+	__le16 app_tag_value;
+	__le16 app_tag_mask;
+	u8 flags0;
+#define E5_RDIF_TASK_CONTEXT_IGNORE_APP_TAG_MASK             0x1
+#define E5_RDIF_TASK_CONTEXT_IGNORE_APP_TAG_SHIFT            0
+#define E5_RDIF_TASK_CONTEXT_INITIAL_REF_TAG_VALID_MASK      0x1
+#define E5_RDIF_TASK_CONTEXT_INITIAL_REF_TAG_VALID_SHIFT     1
+#define E5_RDIF_TASK_CONTEXT_HOST_GUARD_TYPE_MASK            0x1 /* 0 = IP checksum, 1 = CRC */
+#define E5_RDIF_TASK_CONTEXT_HOST_GUARD_TYPE_SHIFT           2
+#define E5_RDIF_TASK_CONTEXT_SET_ERROR_WITH_EOP_MASK         0x1
+#define E5_RDIF_TASK_CONTEXT_SET_ERROR_WITH_EOP_SHIFT        3
+#define E5_RDIF_TASK_CONTEXT_PROTECTION_TYPE_MASK            0x3 /* 1/2/3 - Protection Type */
+#define E5_RDIF_TASK_CONTEXT_PROTECTION_TYPE_SHIFT           4
+/* 0=0x0000, 1=0xffff used only in reg_e4_backward_compatible_mode */
+#define E5_RDIF_TASK_CONTEXT_CRC_SEED_MASK                   0x1
+#define E5_RDIF_TASK_CONTEXT_CRC_SEED_SHIFT                  6
+#define E5_RDIF_TASK_CONTEXT_KEEP_REF_TAG_CONST_MASK         0x1 /* Keep reference tag constant */
+#define E5_RDIF_TASK_CONTEXT_KEEP_REF_TAG_CONST_SHIFT        7
+	u8 partial_dif_data[7];
+	__le16 partial_crc_value;
+	__le16 partial_checksum_value;
+	__le32 offset_in_io;
+	__le16 flags1;
+#define E5_RDIF_TASK_CONTEXT_VALIDATE_GUARD_MASK             0x1
+#define E5_RDIF_TASK_CONTEXT_VALIDATE_GUARD_SHIFT            0
+#define E5_RDIF_TASK_CONTEXT_VALIDATE_APP_TAG_MASK           0x1
+#define E5_RDIF_TASK_CONTEXT_VALIDATE_APP_TAG_SHIFT          1
+#define E5_RDIF_TASK_CONTEXT_VALIDATE_REF_TAG_MASK           0x1
+#define E5_RDIF_TASK_CONTEXT_VALIDATE_REF_TAG_SHIFT          2
+#define E5_RDIF_TASK_CONTEXT_FORWARD_GUARD_MASK              0x1
+#define E5_RDIF_TASK_CONTEXT_FORWARD_GUARD_SHIFT             3
+#define E5_RDIF_TASK_CONTEXT_FORWARD_APP_TAG_MASK            0x1
+#define E5_RDIF_TASK_CONTEXT_FORWARD_APP_TAG_SHIFT           4
+#define E5_RDIF_TASK_CONTEXT_FORWARD_REF_TAG_MASK            0x1
+#define E5_RDIF_TASK_CONTEXT_FORWARD_REF_TAG_SHIFT           5
+/* 0=512B, 1=1KB, 2=2KB, 3=4KB, 4=8KB */
+#define E5_RDIF_TASK_CONTEXT_INTERVAL_SIZE_MASK              0x7
+#define E5_RDIF_TASK_CONTEXT_INTERVAL_SIZE_SHIFT             6
+#define E5_RDIF_TASK_CONTEXT_HOST_INTERFACE_MASK             0x3 /* 0=None, 1=DIF, 2=DIX */
+#define E5_RDIF_TASK_CONTEXT_HOST_INTERFACE_SHIFT            9
+#define E5_RDIF_TASK_CONTEXT_RESERVED0_MASK                  0x3
+#define E5_RDIF_TASK_CONTEXT_RESERVED0_SHIFT                 11
+#define E5_RDIF_TASK_CONTEXT_NETWORK_INTERFACE_MASK          0x1 /* 0=None, 1=DIF */
+#define E5_RDIF_TASK_CONTEXT_NETWORK_INTERFACE_SHIFT         13
+/* Forward application tag with mask */
+#define E5_RDIF_TASK_CONTEXT_FORWARD_APP_TAG_WITH_MASK_MASK  0x1
+#define E5_RDIF_TASK_CONTEXT_FORWARD_APP_TAG_WITH_MASK_SHIFT 14
+/* Forward reference tag with mask */
+#define E5_RDIF_TASK_CONTEXT_FORWARD_REF_TAG_WITH_MASK_MASK  0x1
+#define E5_RDIF_TASK_CONTEXT_FORWARD_REF_TAG_WITH_MASK_SHIFT 15
+	__le16 state;
+#define E5_RDIF_TASK_CONTEXT_RECEIVED_DIF_BYTES_LEFT_MASK    0xF
+#define E5_RDIF_TASK_CONTEXT_RECEIVED_DIF_BYTES_LEFT_SHIFT   0
+#define E5_RDIF_TASK_CONTEXT_TRANSMITED_DIF_BYTES_LEFT_MASK  0xF
+#define E5_RDIF_TASK_CONTEXT_TRANSMITED_DIF_BYTES_LEFT_SHIFT 4
+#define E5_RDIF_TASK_CONTEXT_ERROR_IN_IO_MASK                0x1
+#define E5_RDIF_TASK_CONTEXT_ERROR_IN_IO_SHIFT               8
+#define E5_RDIF_TASK_CONTEXT_CHECKSUM_OVERFLOW_MASK          0x1
+#define E5_RDIF_TASK_CONTEXT_CHECKSUM_OVERFLOW_SHIFT         9
+/* mask for refernce tag handling; used only in reg_e4_backward_compatible_mod */
+#define E5_RDIF_TASK_CONTEXT_REF_TAG_MASK_MASK               0xF
+#define E5_RDIF_TASK_CONTEXT_REF_TAG_MASK_SHIFT              10
+#define E5_RDIF_TASK_CONTEXT_RESERVED1_MASK                  0x3
+#define E5_RDIF_TASK_CONTEXT_RESERVED1_SHIFT                 14
+/* mask for refernce tag handling; used only in 0=reg_e4_backward_compatible_mod **/
+	__le32 ref_tag_mask_e5;
+	__le16 crc_seed_e5 /* Full CRC seed; used only in 0=tdif_reg_e4_backward_compatible_mode */;
+	__le16 reserved2[7] /* padding to 128bit */;
+};
+
+
+/*
+ * Tdif context
+ */
+struct e5_tdif_task_context {
+	__le32 initial_ref_tag;
+	__le16 app_tag_value;
+	__le16 app_tag_mask;
+	__le16 partial_crc_value_b;
+	__le16 partial_checksum_value_b;
+	__le16 stateB;
+#define E5_TDIF_TASK_CONTEXT_RECEIVED_DIF_BYTES_LEFT_B_MASK    0xF
+#define E5_TDIF_TASK_CONTEXT_RECEIVED_DIF_BYTES_LEFT_B_SHIFT   0
+#define E5_TDIF_TASK_CONTEXT_TRANSMITED_DIF_BYTES_LEFT_B_MASK  0xF
+#define E5_TDIF_TASK_CONTEXT_TRANSMITED_DIF_BYTES_LEFT_B_SHIFT 4
+#define E5_TDIF_TASK_CONTEXT_ERROR_IN_IO_B_MASK                0x1
+#define E5_TDIF_TASK_CONTEXT_ERROR_IN_IO_B_SHIFT               8
+#define E5_TDIF_TASK_CONTEXT_CHECKSUM_VERFLOW_MASK             0x1
+#define E5_TDIF_TASK_CONTEXT_CHECKSUM_VERFLOW_SHIFT            9
+#define E5_TDIF_TASK_CONTEXT_RESERVED0_MASK                    0x3F
+#define E5_TDIF_TASK_CONTEXT_RESERVED0_SHIFT                   10
+	u8 reserved1;
+	u8 flags0;
+#define E5_TDIF_TASK_CONTEXT_IGNORE_APP_TAG_MASK               0x1
+#define E5_TDIF_TASK_CONTEXT_IGNORE_APP_TAG_SHIFT              0
+#define E5_TDIF_TASK_CONTEXT_INITIAL_REF_TAG_VALID_MASK        0x1
+#define E5_TDIF_TASK_CONTEXT_INITIAL_REF_TAG_VALID_SHIFT       1
+#define E5_TDIF_TASK_CONTEXT_HOST_GUARD_TYPE_MASK              0x1 /* 0 = IP checksum, 1 = CRC */
+#define E5_TDIF_TASK_CONTEXT_HOST_GUARD_TYPE_SHIFT             2
+#define E5_TDIF_TASK_CONTEXT_SET_ERROR_WITH_EOP_MASK           0x1
+#define E5_TDIF_TASK_CONTEXT_SET_ERROR_WITH_EOP_SHIFT          3
+#define E5_TDIF_TASK_CONTEXT_PROTECTION_TYPE_MASK              0x3 /* 1/2/3 - Protection Type */
+#define E5_TDIF_TASK_CONTEXT_PROTECTION_TYPE_SHIFT             4
+/* 0=0x0000, 1=0xffff; used only in tdif_reg_e4_backward_compatible_mode */
+#define E5_TDIF_TASK_CONTEXT_CRC_SEED_MASK                     0x1
+#define E5_TDIF_TASK_CONTEXT_CRC_SEED_SHIFT                    6
+#define E5_TDIF_TASK_CONTEXT_RESERVED2_MASK                    0x1
+#define E5_TDIF_TASK_CONTEXT_RESERVED2_SHIFT                   7
+	__le32 flags1;
+#define E5_TDIF_TASK_CONTEXT_VALIDATE_GUARD_MASK               0x1
+#define E5_TDIF_TASK_CONTEXT_VALIDATE_GUARD_SHIFT              0
+#define E5_TDIF_TASK_CONTEXT_VALIDATE_APP_TAG_MASK             0x1
+#define E5_TDIF_TASK_CONTEXT_VALIDATE_APP_TAG_SHIFT            1
+#define E5_TDIF_TASK_CONTEXT_VALIDATE_REF_TAG_MASK             0x1
+#define E5_TDIF_TASK_CONTEXT_VALIDATE_REF_TAG_SHIFT            2
+#define E5_TDIF_TASK_CONTEXT_FORWARD_GUARD_MASK                0x1
+#define E5_TDIF_TASK_CONTEXT_FORWARD_GUARD_SHIFT               3
+#define E5_TDIF_TASK_CONTEXT_FORWARD_APP_TAG_MASK              0x1
+#define E5_TDIF_TASK_CONTEXT_FORWARD_APP_TAG_SHIFT             4
+#define E5_TDIF_TASK_CONTEXT_FORWARD_REF_TAG_MASK              0x1
+#define E5_TDIF_TASK_CONTEXT_FORWARD_REF_TAG_SHIFT             5
+/* 0=512B, 1=1KB, 2=2KB, 3=4KB, 4=8KB */
+#define E5_TDIF_TASK_CONTEXT_INTERVAL_SIZE_MASK                0x7
+#define E5_TDIF_TASK_CONTEXT_INTERVAL_SIZE_SHIFT               6
+#define E5_TDIF_TASK_CONTEXT_HOST_INTERFACE_MASK               0x3 /* 0=None, 1=DIF, 2=DIX */
+#define E5_TDIF_TASK_CONTEXT_HOST_INTERFACE_SHIFT              9
+#define E5_TDIF_TASK_CONTEXT_RESERVED3_MASK                    0x3 /* reserved */
+#define E5_TDIF_TASK_CONTEXT_RESERVED3_SHIFT                   11
+#define E5_TDIF_TASK_CONTEXT_NETWORK_INTERFACE_MASK            0x1 /* 0=None, 1=DIF */
+#define E5_TDIF_TASK_CONTEXT_NETWORK_INTERFACE_SHIFT           13
+#define E5_TDIF_TASK_CONTEXT_RECEIVED_DIF_BYTES_LEFT_A_MASK    0xF
+#define E5_TDIF_TASK_CONTEXT_RECEIVED_DIF_BYTES_LEFT_A_SHIFT   14
+#define E5_TDIF_TASK_CONTEXT_TRANSMITED_DIF_BYTES_LEFT_A_MASK  0xF
+#define E5_TDIF_TASK_CONTEXT_TRANSMITED_DIF_BYTES_LEFT_A_SHIFT 18
+#define E5_TDIF_TASK_CONTEXT_ERROR_IN_IO_A_MASK                0x1
+#define E5_TDIF_TASK_CONTEXT_ERROR_IN_IO_A_SHIFT               22
+#define E5_TDIF_TASK_CONTEXT_CHECKSUM_OVERFLOW_A_MASK          0x1
+#define E5_TDIF_TASK_CONTEXT_CHECKSUM_OVERFLOW_A_SHIFT         23
+/* mask for refernce tag handlingl used only in tdif_reg_e4_backward_compatible_mode */
+#define E5_TDIF_TASK_CONTEXT_REF_TAG_MASK_MASK                 0xF
+#define E5_TDIF_TASK_CONTEXT_REF_TAG_MASK_SHIFT                24
+/* Forward application tag with mask */
+#define E5_TDIF_TASK_CONTEXT_FORWARD_APP_TAG_WITH_MASK_MASK    0x1
+#define E5_TDIF_TASK_CONTEXT_FORWARD_APP_TAG_WITH_MASK_SHIFT   28
+/* Forward reference tag with mask */
+#define E5_TDIF_TASK_CONTEXT_FORWARD_REF_TAG_WITH_MASK_MASK    0x1
+#define E5_TDIF_TASK_CONTEXT_FORWARD_REF_TAG_WITH_MASK_SHIFT   29
+#define E5_TDIF_TASK_CONTEXT_KEEP_REF_TAG_CONST_MASK           0x1 /* Keep reference tag constant */
+#define E5_TDIF_TASK_CONTEXT_KEEP_REF_TAG_CONST_SHIFT          30
+#define E5_TDIF_TASK_CONTEXT_RESERVED4_MASK                    0x1
+#define E5_TDIF_TASK_CONTEXT_RESERVED4_SHIFT                   31
+	__le32 offset_in_io_b;
+	__le16 partial_crc_value_a;
+	__le16 partial_checksum_value_a;
+	__le32 offset_in_io_a;
+	u8 partial_dif_data_a[8];
+	u8 partial_dif_data_b[8];
+/* Full reference tagmask seed; used only in 0=tdif_reg_e4_backward_compatible_mode **/
+	__le32 ref_tag_mask_e5;
+	__le16 crc_seed_e5 /* Full CRC seed; used only in 0=tdif_reg_e4_backward_compatible_mode */;
+	__le16 reserved5 /* padding to 64bit */;
+	__le32 reserved6[2] /* padding to 128bit */;
+};
+
+
+/*
+ * Describes L2 upper protocol
+ */
+enum gfs_ether_type_enum {
+	e_gfs_ether_type_other_protocol,
+	e_gfs_ether_type_ipv4,
+	e_gfs_ether_type_ipv6,
+	e_gfs_ether_type_arp,
+	e_gfs_ether_type_roce,
+	e_gfs_ether_type_fcoe,
+	MAX_GFS_ETHER_TYPE_ENUM
+};
+
+
+/*
+ * GFS CAM line struct with fields breakout
+ */
+struct gfs_profile_cam_line {
+	__le32 reg0;
+#define GFS_PROFILE_CAM_LINE_PF_MASK                         0xF
+#define GFS_PROFILE_CAM_LINE_PF_SHIFT                        0
+#define GFS_PROFILE_CAM_LINE_TUNNEL_EXISTS_MASK              0x1
+#define GFS_PROFILE_CAM_LINE_TUNNEL_EXISTS_SHIFT             4
+/*  (use enum gfs_tunnel_type_enum) */
+#define GFS_PROFILE_CAM_LINE_TUNNEL_TYPE_MASK                0xF
+#define GFS_PROFILE_CAM_LINE_TUNNEL_TYPE_SHIFT               5
+#define GFS_PROFILE_CAM_LINE_TUNNEL_IP_VERSION_MASK          0x1
+#define GFS_PROFILE_CAM_LINE_TUNNEL_IP_VERSION_SHIFT         9
+#define GFS_PROFILE_CAM_LINE_L2_HEADER_EXISTS_MASK           0x1
+#define GFS_PROFILE_CAM_LINE_L2_HEADER_EXISTS_SHIFT          10
+/*  (use enum gfs_ether_type_enum) */
+#define GFS_PROFILE_CAM_LINE_ETHER_TYPE_PROTOCOL_MASK        0x7
+#define GFS_PROFILE_CAM_LINE_ETHER_TYPE_PROTOCOL_SHIFT       11
+#define GFS_PROFILE_CAM_LINE_OVER_IP_PROTOCOL_MASK           0xFF
+#define GFS_PROFILE_CAM_LINE_OVER_IP_PROTOCOL_SHIFT          14
+#define GFS_PROFILE_CAM_LINE_IS_IP_MASK                      0x1
+#define GFS_PROFILE_CAM_LINE_IS_IP_SHIFT                     22
+#define GFS_PROFILE_CAM_LINE_IS_TCP_UDP_SCTP_MASK            0x1
+#define GFS_PROFILE_CAM_LINE_IS_TCP_UDP_SCTP_SHIFT           23
+#define GFS_PROFILE_CAM_LINE_IS_UNICAST_MASK                 0x1
+#define GFS_PROFILE_CAM_LINE_IS_UNICAST_SHIFT                24
+#define GFS_PROFILE_CAM_LINE_IP_FRAGMENT_MASK                0x1
+#define GFS_PROFILE_CAM_LINE_IP_FRAGMENT_SHIFT               25
+#define GFS_PROFILE_CAM_LINE_CALCULATED_TCP_FLAGS_MASK       0x3F
+#define GFS_PROFILE_CAM_LINE_CALCULATED_TCP_FLAGS_SHIFT      26
+	__le32 reg1;
+#define GFS_PROFILE_CAM_LINE_INNER_CVLAN_EXISTS_MASK         0x1
+#define GFS_PROFILE_CAM_LINE_INNER_CVLAN_EXISTS_SHIFT        0
+#define GFS_PROFILE_CAM_LINE_INNER_SVLAN_EXISTS_MASK         0x1
+#define GFS_PROFILE_CAM_LINE_INNER_SVLAN_EXISTS_SHIFT        1
+#define GFS_PROFILE_CAM_LINE_TUNNEL_CVLAN_EXISTS_MASK        0x1
+#define GFS_PROFILE_CAM_LINE_TUNNEL_CVLAN_EXISTS_SHIFT       2
+#define GFS_PROFILE_CAM_LINE_TUNNEL_SVLAN_EXISTS_MASK        0x1
+#define GFS_PROFILE_CAM_LINE_TUNNEL_SVLAN_EXISTS_SHIFT       3
+#define GFS_PROFILE_CAM_LINE_MPLS_EXISTS_MASK                0x1
+#define GFS_PROFILE_CAM_LINE_MPLS_EXISTS_SHIFT               4
+#define GFS_PROFILE_CAM_LINE_FLEX_BYTE0_MASK                 0xFF
+#define GFS_PROFILE_CAM_LINE_FLEX_BYTE0_SHIFT                5
+#define GFS_PROFILE_CAM_LINE_FLEX_BYTE1_MASK                 0xFF
+#define GFS_PROFILE_CAM_LINE_FLEX_BYTE1_SHIFT                13
+#define GFS_PROFILE_CAM_LINE_FLEX_BYTE2_LSB_MASK             0xF
+#define GFS_PROFILE_CAM_LINE_FLEX_BYTE2_LSB_SHIFT            21
+#define GFS_PROFILE_CAM_LINE_FLEX_BYTE3_MSB_MASK             0xF
+#define GFS_PROFILE_CAM_LINE_FLEX_BYTE3_MSB_SHIFT            25
+#define GFS_PROFILE_CAM_LINE_RESERVED_MASK                   0x3
+#define GFS_PROFILE_CAM_LINE_RESERVED_SHIFT                  29
+#define GFS_PROFILE_CAM_LINE_VALID_MASK                      0x1
+#define GFS_PROFILE_CAM_LINE_VALID_SHIFT                     31
+	__le32 reg2;
+#define GFS_PROFILE_CAM_LINE_MASK_PF_MASK                    0xF
+#define GFS_PROFILE_CAM_LINE_MASK_PF_SHIFT                   0
+#define GFS_PROFILE_CAM_LINE_MASK_TUNNEL_EXISTS_MASK         0x1
+#define GFS_PROFILE_CAM_LINE_MASK_TUNNEL_EXISTS_SHIFT        4
+#define GFS_PROFILE_CAM_LINE_MASK_TUNNEL_TYPE_MASK           0xF
+#define GFS_PROFILE_CAM_LINE_MASK_TUNNEL_TYPE_SHIFT          5
+#define GFS_PROFILE_CAM_LINE_MASK_TUNNEL_IP_VERSION_MASK     0x1
+#define GFS_PROFILE_CAM_LINE_MASK_TUNNEL_IP_VERSION_SHIFT    9
+#define GFS_PROFILE_CAM_LINE_MASK_L2HEADER_EXISTS_MASK       0x1
+#define GFS_PROFILE_CAM_LINE_MASK_L2HEADER_EXISTS_SHIFT      10
+#define GFS_PROFILE_CAM_LINE_MASK_ETHERTYPE_PROTOCOL_MASK    0x7
+#define GFS_PROFILE_CAM_LINE_MASK_ETHERTYPE_PROTOCOL_SHIFT   11
+#define GFS_PROFILE_CAM_LINE_MASK_OVER_IP_PROTOCOL_MASK      0xFF
+#define GFS_PROFILE_CAM_LINE_MASK_OVER_IP_PROTOCOL_SHIFT     14
+#define GFS_PROFILE_CAM_LINE_MASK_IS_IP_MASK                 0x1
+#define GFS_PROFILE_CAM_LINE_MASK_IS_IP_SHIFT                22
+#define GFS_PROFILE_CAM_LINE_MASK_IS_TCP_UDP_SCTP_MASK       0x1
+#define GFS_PROFILE_CAM_LINE_MASK_IS_TCP_UDP_SCTP_SHIFT      23
+#define GFS_PROFILE_CAM_LINE_MASK_IS_UNICAST_MASK            0x1
+#define GFS_PROFILE_CAM_LINE_MASK_IS_UNICAST_SHIFT           24
+#define GFS_PROFILE_CAM_LINE_MASK_IP_FRAGMENT_MASK           0x1
+#define GFS_PROFILE_CAM_LINE_MASK_IP_FRAGMENT_SHIFT          25
+#define GFS_PROFILE_CAM_LINE_MASK_CALCULATED_TCP_FLAGS_MASK  0x3F
+#define GFS_PROFILE_CAM_LINE_MASK_CALCULATED_TCP_FLAGS_SHIFT 26
+	__le32 reg3;
+#define GFS_PROFILE_CAM_LINE_MASK_INNER_CVLAN_EXISTS_MASK    0x1
+#define GFS_PROFILE_CAM_LINE_MASK_INNER_CVLAN_EXISTS_SHIFT   0
+#define GFS_PROFILE_CAM_LINE_MASK_INNER_SVLAN_EXISTS_MASK    0x1
+#define GFS_PROFILE_CAM_LINE_MASK_INNER_SVLAN_EXISTS_SHIFT   1
+#define GFS_PROFILE_CAM_LINE_MASK_TUNNEL_CVLAN_EXISTS_MASK   0x1
+#define GFS_PROFILE_CAM_LINE_MASK_TUNNEL_CVLAN_EXISTS_SHIFT  2
+#define GFS_PROFILE_CAM_LINE_MASK_TUNNEL_SVLAN_EXISTS_MASK   0x1
+#define GFS_PROFILE_CAM_LINE_MASK_TUNNEL_SVLAN_EXISTS_SHIFT  3
+#define GFS_PROFILE_CAM_LINE_MASK_MPLS_EXISTS_MASK           0x1
+#define GFS_PROFILE_CAM_LINE_MASK_MPLS_EXISTS_SHIFT          4
+#define GFS_PROFILE_CAM_LINE_MASK_FLEX_BYTE0_MASK            0xFF
+#define GFS_PROFILE_CAM_LINE_MASK_FLEX_BYTE0_SHIFT           5
+#define GFS_PROFILE_CAM_LINE_MASK_FLEX_BYTE1_MASK            0xFF
+#define GFS_PROFILE_CAM_LINE_MASK_FLEX_BYTE1_SHIFT           13
+#define GFS_PROFILE_CAM_LINE_MASK_FLEX_BYTE2_LSB_MASK        0xF
+#define GFS_PROFILE_CAM_LINE_MASK_FLEX_BYTE2_LSB_SHIFT       21
+#define GFS_PROFILE_CAM_LINE_MASK_FLEX_BYTE3_MSB_MASK        0xF
+#define GFS_PROFILE_CAM_LINE_MASK_FLEX_BYTE3_MSB_SHIFT       25
+#define GFS_PROFILE_CAM_LINE_RESERVED1_MASK                  0x7
+#define GFS_PROFILE_CAM_LINE_RESERVED1_SHIFT                 29
+};
+
+
+/*
+ * used to write to HASH_PROF_ENABLE_VEC_TWO_BIT_MODIFY register
+ */
+struct gfs_profile_modify_enable {
+	u8 index0 /* The index of the bit to be modified */;
+	u8 index1 /* The index of the bit to be modified */;
+	u8 flags;
+/* The operation to perform on the bit. 0 - reset, 1 - set. */
+#define GFS_PROFILE_MODIFY_ENABLE_SETRESET0_MASK  0x1
+#define GFS_PROFILE_MODIFY_ENABLE_SETRESET0_SHIFT 0
+/* The operation to perform on the bit. 0 - reset, 1 - set. */
+#define GFS_PROFILE_MODIFY_ENABLE_SETRESET1_MASK  0x1
+#define GFS_PROFILE_MODIFY_ENABLE_SETRESET1_SHIFT 1
+/* The operation will be applyed to the bit only if this bit is set. */
+#define GFS_PROFILE_MODIFY_ENABLE_VALID0_MASK     0x1
+#define GFS_PROFILE_MODIFY_ENABLE_VALID0_SHIFT    2
+/* The operation will be applyed to the bit only if this bit is set. */
+#define GFS_PROFILE_MODIFY_ENABLE_VALID1_MASK     0x1
+#define GFS_PROFILE_MODIFY_ENABLE_VALID1_SHIFT    3
+#define GFS_PROFILE_MODIFY_ENABLE_RESERVED1_MASK  0xF
+#define GFS_PROFILE_MODIFY_ENABLE_RESERVED1_SHIFT 4
+	u8 reserved2;
+};
+
+
+enum gfs_swap_i2o_enum {
+	e_no_swap,
+	e_swap_if_tunnel_exist,
+	e_swap_if_tunnel_not_exist,
+	e_swap_always,
+	MAX_GFS_SWAP_I2O_ENUM
+};
+
+
+/*
+ * Describes tunnel type
+ */
+enum gfs_tunnel_type_enum {
+	e_gfs_tunnel_type_no_tunnel = 0,
+	e_gfs_tunnel_type_geneve = 1,
+	e_gfs_tunnel_type_gre = 2,
+	e_gfs_tunnel_type_vxlan = 3,
+	e_gfs_tunnel_type_mpls = 4,
+	e_gfs_tunnel_type_gre_mpls = 5,
+	e_gfs_tunnel_type_udp_mpls = 6,
+	MAX_GFS_TUNNEL_TYPE_ENUM
+};
+
+
+/*
+ * Igu interrupt command
+ */
 enum igu_int_cmd {
-	IGU_INT_ENABLE	= 0,
+	IGU_INT_ENABLE = 0,
 	IGU_INT_DISABLE = 1,
-	IGU_INT_NOP	= 2,
-	IGU_INT_NOP2	= 3,
+	IGU_INT_NOP = 2,
+	IGU_INT_NOP2 = 3,
 	MAX_IGU_INT_CMD
 };
 
-/* IGU producer or consumer update command */
+
+/*
+ * IGU producer or consumer update command
+ */
 struct igu_prod_cons_update {
 	__le32 sb_id_and_flags;
 #define IGU_PROD_CONS_UPDATE_SB_INDEX_MASK        0xFFFFFF
@@ -1154,8 +1727,7 @@ struct igu_prod_cons_update {
 /* interrupt enable/disable/nop (use enum igu_int_cmd) */
 #define IGU_PROD_CONS_UPDATE_ENABLE_INT_MASK      0x3
 #define IGU_PROD_CONS_UPDATE_ENABLE_INT_SHIFT     25
-/*  (use enum igu_seg_access) */
-#define IGU_PROD_CONS_UPDATE_SEGMENT_ACCESS_MASK  0x1
+#define IGU_PROD_CONS_UPDATE_SEGMENT_ACCESS_MASK  0x1 /*  (use enum igu_seg_access) */
 #define IGU_PROD_CONS_UPDATE_SEGMENT_ACCESS_SHIFT 27
 #define IGU_PROD_CONS_UPDATE_TIMER_MASK_MASK      0x1
 #define IGU_PROD_CONS_UPDATE_TIMER_MASK_SHIFT     28
@@ -1167,18 +1739,19 @@ struct igu_prod_cons_update {
 	__le32 reserved1;
 };
 
-/* Igu segments access for default status block only */
+
+/*
+ * Igu segments access for default status block only
+ */
 enum igu_seg_access {
-	IGU_SEG_ACCESS_REG	= 0,
-	IGU_SEG_ACCESS_ATTN	= 1,
+	IGU_SEG_ACCESS_REG = 0,
+	IGU_SEG_ACCESS_ATTN = 1,
 	MAX_IGU_SEG_ACCESS
 };
 
 
-/*
- * Enumeration for L3 type field of parsing_and_err_flags_union. L3Type:
- * 0 - unknown (not ip) ,1 - Ipv4, 2 - Ipv6 (this field can be filled according
- * to the last-ethertype)
+/* Enumeration for L3 type field of parsing_and_err_flags. L3Type: 0 - unknown (not ip) ,1 - Ipv4,
+ * 2 - Ipv6 (this field can be filled according to the last-ethertype)
  */
 enum l3_type {
 	e_l3_type_unknown,
@@ -1188,10 +1761,9 @@ enum l3_type {
 };
 
 
-/*
- * Enumeration for l4Protocol field of parsing_and_err_flags_union. L4-protocol
- * 0 - none, 1 - TCP, 2- UDP. if the packet is IPv4 fragment, and its not the
- * first fragment, the protocol-type should be set to none.
+/* Enumeration for l4Protocol field of parsing_and_err_flags. L4-protocol 0 - none, 1 - TCP, 2- UDP.
+ * if the packet is IPv4 fragment, and its not the first fragment, the protocol-type should be set
+ * to none.
  */
 enum l4_protocol {
 	e_l4_protocol_none,
@@ -1206,59 +1778,55 @@ enum l4_protocol {
  */
 struct parsing_and_err_flags {
 	__le16 flags;
-/* L3Type: 0 - unknown (not ip) ,1 - Ipv4, 2 - Ipv6 (this field can be filled
- * according to the last-ethertype) (use enum l3_type)
+/* L3Type: 0 - unknown (not ip) ,1 - Ipv4, 2 - Ipv6 (this field can be filled according to the
+ * last-ethertype) (use enum l3_type)
  */
 #define PARSING_AND_ERR_FLAGS_L3TYPE_MASK                      0x3
 #define PARSING_AND_ERR_FLAGS_L3TYPE_SHIFT                     0
-/* L4-protocol 0 - none, 1 - TCP, 2- UDP. if the packet is IPv4 fragment, and
- * its not the first fragment, the protocol-type should be set to none.
- * (use enum l4_protocol)
+/* L4-protocol 0 - none, 1 - TCP, 2- UDP. if the packet is IPv4 fragment, and its not the first
+ * fragment, the protocol-type should be set to none. (use enum l4_protocol)
  */
 #define PARSING_AND_ERR_FLAGS_L4PROTOCOL_MASK                  0x3
 #define PARSING_AND_ERR_FLAGS_L4PROTOCOL_SHIFT                 2
-/* Set if the packet is IPv4 fragment. */
+/* Set if the packet is IPv4/IPv6 fragment. */
 #define PARSING_AND_ERR_FLAGS_IPV4FRAG_MASK                    0x1
 #define PARSING_AND_ERR_FLAGS_IPV4FRAG_SHIFT                   4
-/* Set if VLAN tag exists. Invalid if tunnel type are IP GRE or IP GENEVE. */
+/* corresponds to the same 8021q tag that is selected for 8021q-tag fiel. This flag should be set if
+ * the tag appears in the packet, regardless of its value.
+ */
 #define PARSING_AND_ERR_FLAGS_TAG8021QEXIST_MASK               0x1
 #define PARSING_AND_ERR_FLAGS_TAG8021QEXIST_SHIFT              5
-/* Set if L4 checksum was calculated. */
+/* Set if L4 checksum was calculated. taken from the EOP descriptor. */
 #define PARSING_AND_ERR_FLAGS_L4CHKSMWASCALCULATED_MASK        0x1
 #define PARSING_AND_ERR_FLAGS_L4CHKSMWASCALCULATED_SHIFT       6
-/* Set for PTP packet. */
-#define PARSING_AND_ERR_FLAGS_TIMESYNCPKT_MASK                 0x1
+#define PARSING_AND_ERR_FLAGS_TIMESYNCPKT_MASK                 0x1 /* Set for PTP packet. */
 #define PARSING_AND_ERR_FLAGS_TIMESYNCPKT_SHIFT                7
 /* Set if PTP timestamp recorded. */
 #define PARSING_AND_ERR_FLAGS_TIMESTAMPRECORDED_MASK           0x1
 #define PARSING_AND_ERR_FLAGS_TIMESTAMPRECORDED_SHIFT          8
-/* Set if either version-mismatch or hdr-len-error or ipv4-cksm is set or ipv6
- * ver mismatch
- */
+/* Set if either version-mismatch or hdr-len-error or ipv4-cksm is set or ipv6 ver mismatch */
 #define PARSING_AND_ERR_FLAGS_IPHDRERROR_MASK                  0x1
 #define PARSING_AND_ERR_FLAGS_IPHDRERROR_SHIFT                 9
-/* Set if L4 checksum validation failed. Valid only if L4 checksum was
- * calculated.
- */
+/* Set if L4 checksum validation failed. Valid only if L4 checksum was calculated. */
 #define PARSING_AND_ERR_FLAGS_L4CHKSMERROR_MASK                0x1
 #define PARSING_AND_ERR_FLAGS_L4CHKSMERROR_SHIFT               10
 /* Set if GRE/VXLAN/GENEVE tunnel detected. */
 #define PARSING_AND_ERR_FLAGS_TUNNELEXIST_MASK                 0x1
 #define PARSING_AND_ERR_FLAGS_TUNNELEXIST_SHIFT                11
-/* Set if VLAN tag exists in tunnel header. */
+/* This flag should be set if the tag appears in the packet tunnel header, regardless of its value..
+ *
+ */
 #define PARSING_AND_ERR_FLAGS_TUNNEL8021QTAGEXIST_MASK         0x1
 #define PARSING_AND_ERR_FLAGS_TUNNEL8021QTAGEXIST_SHIFT        12
-/* Set if either tunnel-ipv4-version-mismatch or tunnel-ipv4-hdr-len-error or
- * tunnel-ipv4-cksm is set or tunneling ipv6 ver mismatch
+/* Set if either tunnel-ipv4-version-mismatch or tunnel-ipv4-hdr-len-error or tunnel-ipv4-cksm is
+ * set or tunneling ipv6 ver mismatch
  */
 #define PARSING_AND_ERR_FLAGS_TUNNELIPHDRERROR_MASK            0x1
 #define PARSING_AND_ERR_FLAGS_TUNNELIPHDRERROR_SHIFT           13
-/* Set if GRE or VXLAN/GENEVE UDP checksum was calculated. */
+/* taken from the EOP descriptor. */
 #define PARSING_AND_ERR_FLAGS_TUNNELL4CHKSMWASCALCULATED_MASK  0x1
 #define PARSING_AND_ERR_FLAGS_TUNNELL4CHKSMWASCALCULATED_SHIFT 14
-/* Set if tunnel L4 checksum validation failed. Valid only if tunnel L4 checksum
- * was calculated.
- */
+/* Set if tunnel L4 checksum validation failed. Valid only if tunnel L4 checksum was calculated. */
 #define PARSING_AND_ERR_FLAGS_TUNNELL4CHKSMERROR_MASK          0x1
 #define PARSING_AND_ERR_FLAGS_TUNNELL4CHKSMERROR_SHIFT         15
 };
@@ -1269,8 +1837,7 @@ struct parsing_and_err_flags {
  */
 struct parsing_err_flags {
 	__le16 flags;
-/* MAC error indication */
-#define PARSING_ERR_FLAGS_MAC_ERROR_MASK                          0x1
+#define PARSING_ERR_FLAGS_MAC_ERROR_MASK                          0x1 /* MAC error indication */
 #define PARSING_ERR_FLAGS_MAC_ERROR_SHIFT                         0
 /* truncation error indication */
 #define PARSING_ERR_FLAGS_TRUNC_ERROR_MASK                        0x1
@@ -1278,49 +1845,47 @@ struct parsing_err_flags {
 /* packet too small indication */
 #define PARSING_ERR_FLAGS_PKT_TOO_SMALL_MASK                      0x1
 #define PARSING_ERR_FLAGS_PKT_TOO_SMALL_SHIFT                     2
-/* Header Missing Tag */
-#define PARSING_ERR_FLAGS_ANY_HDR_MISSING_TAG_MASK                0x1
+#define PARSING_ERR_FLAGS_ANY_HDR_MISSING_TAG_MASK                0x1 /* Header Missing Tag */
 #define PARSING_ERR_FLAGS_ANY_HDR_MISSING_TAG_SHIFT               3
-/* from frame cracker output */
+/* From FC. See spec for detailed description */
 #define PARSING_ERR_FLAGS_ANY_HDR_IP_VER_MISMTCH_MASK             0x1
 #define PARSING_ERR_FLAGS_ANY_HDR_IP_VER_MISMTCH_SHIFT            4
-/* from frame cracker output */
+/* From FC. See spec for detailed description */
 #define PARSING_ERR_FLAGS_ANY_HDR_IP_V4_HDR_LEN_TOO_SMALL_MASK    0x1
 #define PARSING_ERR_FLAGS_ANY_HDR_IP_V4_HDR_LEN_TOO_SMALL_SHIFT   5
-/* set this error if: 1. total-len is smaller than hdr-len 2. total-ip-len
- * indicates number that is bigger than real packet length 3. tunneling:
- * total-ip-length of the outer header points to offset that is smaller than
- * the one pointed to by the total-ip-len of the inner hdr.
+/* set this error if: 1. total-len is smaller than hdr-len 2. total-ip-len indicates number that is
+ * bigger than real packet length 3. tunneling: total-ip-length of the outer header points to offset
+ * that is smaller than the one pointed to by the total-ip-len of the inner hdr.
  */
 #define PARSING_ERR_FLAGS_ANY_HDR_IP_BAD_TOTAL_LEN_MASK           0x1
 #define PARSING_ERR_FLAGS_ANY_HDR_IP_BAD_TOTAL_LEN_SHIFT          6
-/* from frame cracker output */
+/* From FC. See spec for detailed description */
 #define PARSING_ERR_FLAGS_IP_V4_CHKSM_ERROR_MASK                  0x1
 #define PARSING_ERR_FLAGS_IP_V4_CHKSM_ERROR_SHIFT                 7
-/* from frame cracker output. for either TCP or UDP */
+/* From FC. See spec for detailed description. for either TCP or UDP */
 #define PARSING_ERR_FLAGS_ANY_HDR_L4_IP_LEN_MISMTCH_MASK          0x1
 #define PARSING_ERR_FLAGS_ANY_HDR_L4_IP_LEN_MISMTCH_SHIFT         8
-/* from frame cracker output */
+/* From FC. See spec for detailed description */
 #define PARSING_ERR_FLAGS_ZERO_UDP_IP_V6_CHKSM_MASK               0x1
 #define PARSING_ERR_FLAGS_ZERO_UDP_IP_V6_CHKSM_SHIFT              9
-/* cksm calculated and value isn't 0xffff or L4-cksm-wasnt-calculated for any
- * reason, like: udp/ipv4 checksum is 0 etc.
+/* cksm calculated and value isn't 0xffff or L4-cksm-wasnt-calculated for any reason, like: udp/ipv4
+ * checksum is 0 etc.
  */
 #define PARSING_ERR_FLAGS_INNER_L4_CHKSM_ERROR_MASK               0x1
 #define PARSING_ERR_FLAGS_INNER_L4_CHKSM_ERROR_SHIFT              10
-/* from frame cracker output */
+/* From FC. See spec for detailed description */
 #define PARSING_ERR_FLAGS_ANY_HDR_ZERO_TTL_OR_HOP_LIM_MASK        0x1
 #define PARSING_ERR_FLAGS_ANY_HDR_ZERO_TTL_OR_HOP_LIM_SHIFT       11
-/* from frame cracker output */
+/* From FC. See spec for detailed description */
 #define PARSING_ERR_FLAGS_NON_8021Q_TAG_EXISTS_IN_BOTH_HDRS_MASK  0x1
 #define PARSING_ERR_FLAGS_NON_8021Q_TAG_EXISTS_IN_BOTH_HDRS_SHIFT 12
 /* set if geneve option size was over 32 byte */
 #define PARSING_ERR_FLAGS_GENEVE_OPTION_OVERSIZED_MASK            0x1
 #define PARSING_ERR_FLAGS_GENEVE_OPTION_OVERSIZED_SHIFT           13
-/* from frame cracker output */
+/* From FC. See spec for detailed description */
 #define PARSING_ERR_FLAGS_TUNNEL_IP_V4_CHKSM_ERROR_MASK           0x1
 #define PARSING_ERR_FLAGS_TUNNEL_IP_V4_CHKSM_ERROR_SHIFT          14
-/* from frame cracker output */
+/* From FC. See spec for detailed description */
 #define PARSING_ERR_FLAGS_TUNNEL_L4_CHKSM_ERROR_MASK              0x1
 #define PARSING_ERR_FLAGS_TUNNEL_L4_CHKSM_ERROR_SHIFT             15
 };
@@ -1333,25 +1898,33 @@ struct pb_context {
 	__le32 crc[4];
 };
 
-/* Concrete Function ID. */
+
+/*
+ * Concrete Function ID.
+ */
 struct pxp_concrete_fid {
 	__le16 fid;
-#define PXP_CONCRETE_FID_PFID_MASK     0xF /* Parent PFID */
+#define PXP_CONCRETE_FID_PFID_MASK     0xF /* Parent PFID (Relative to path) */
 #define PXP_CONCRETE_FID_PFID_SHIFT    0
-#define PXP_CONCRETE_FID_PORT_MASK     0x3 /* port number */
+#define PXP_CONCRETE_FID_PORT_MASK     0x3 /* port number (Relative to path) */
 #define PXP_CONCRETE_FID_PORT_SHIFT    4
 #define PXP_CONCRETE_FID_PATH_MASK     0x1 /* path number */
 #define PXP_CONCRETE_FID_PATH_SHIFT    6
 #define PXP_CONCRETE_FID_VFVALID_MASK  0x1
 #define PXP_CONCRETE_FID_VFVALID_SHIFT 7
-#define PXP_CONCRETE_FID_VFID_MASK     0xFF
+#define PXP_CONCRETE_FID_VFID_MASK     0xFF /* (Relative to path) */
 #define PXP_CONCRETE_FID_VFID_SHIFT    8
 };
 
+
+/*
+ * Concrete Function ID.
+ */
 struct pxp_pretend_concrete_fid {
 	__le16 fid;
-#define PXP_PRETEND_CONCRETE_FID_PFID_MASK      0xF
+#define PXP_PRETEND_CONCRETE_FID_PFID_MASK      0xF /* Parent PFID */
 #define PXP_PRETEND_CONCRETE_FID_PFID_SHIFT     0
+/* port number. Only when part of ME register. */
 #define PXP_PRETEND_CONCRETE_FID_RESERVED_MASK  0x7
 #define PXP_PRETEND_CONCRETE_FID_RESERVED_SHIFT 4
 #define PXP_PRETEND_CONCRETE_FID_VFVALID_MASK   0x1
@@ -1360,15 +1933,20 @@ struct pxp_pretend_concrete_fid {
 #define PXP_PRETEND_CONCRETE_FID_VFID_SHIFT     8
 };
 
+/*
+ * Function ID.
+ */
 union pxp_pretend_fid {
 	struct pxp_pretend_concrete_fid concrete_fid;
-	__le16				opaque_fid;
+	__le16 opaque_fid;
 };
 
-/* Pxp Pretend Command Register. */
+/*
+ * Pxp Pretend Command Register.
+ */
 struct pxp_pretend_cmd {
-	union pxp_pretend_fid	fid;
-	__le16			control;
+	union pxp_pretend_fid fid;
+	__le16 control;
 #define PXP_PRETEND_CMD_PATH_MASK              0x1
 #define PXP_PRETEND_CMD_PATH_SHIFT             0
 #define PXP_PRETEND_CMD_USE_PORT_MASK          0x1
@@ -1379,24 +1957,29 @@ struct pxp_pretend_cmd {
 #define PXP_PRETEND_CMD_RESERVED0_SHIFT        4
 #define PXP_PRETEND_CMD_RESERVED1_MASK         0xF
 #define PXP_PRETEND_CMD_RESERVED1_SHIFT        8
-#define PXP_PRETEND_CMD_PRETEND_PATH_MASK      0x1
+#define PXP_PRETEND_CMD_PRETEND_PATH_MASK      0x1 /* is pretend mode? */
 #define PXP_PRETEND_CMD_PRETEND_PATH_SHIFT     12
-#define PXP_PRETEND_CMD_PRETEND_PORT_MASK      0x1
+#define PXP_PRETEND_CMD_PRETEND_PORT_MASK      0x1 /* is pretend mode? */
 #define PXP_PRETEND_CMD_PRETEND_PORT_SHIFT     13
-#define PXP_PRETEND_CMD_PRETEND_FUNCTION_MASK  0x1
+#define PXP_PRETEND_CMD_PRETEND_FUNCTION_MASK  0x1 /* is pretend mode? */
 #define PXP_PRETEND_CMD_PRETEND_FUNCTION_SHIFT 14
-#define PXP_PRETEND_CMD_IS_CONCRETE_MASK       0x1
+#define PXP_PRETEND_CMD_IS_CONCRETE_MASK       0x1 /* is fid concrete? */
 #define PXP_PRETEND_CMD_IS_CONCRETE_SHIFT      15
 };
 
-/* PTT Record in PXP Admin Window. */
+
+
+
+/*
+ * PTT Record in PXP Admin Window.
+ */
 struct pxp_ptt_entry {
-	__le32			offset;
+	__le32 offset;
 #define PXP_PTT_ENTRY_OFFSET_MASK     0x7FFFFF
 #define PXP_PTT_ENTRY_OFFSET_SHIFT    0
 #define PXP_PTT_ENTRY_RESERVED0_MASK  0x1FF
 #define PXP_PTT_ENTRY_RESERVED0_SHIFT 23
-	struct pxp_pretend_cmd	pretend;
+	struct pxp_pretend_cmd pretend;
 };
 
 
@@ -1416,214 +1999,72 @@ struct pxp_vf_zone_a_permission {
 };
 
 
+
 /*
- * Rdif context
+ * Searcher Table struct
  */
-struct rdif_task_context {
-	__le32 initial_ref_tag;
-	__le16 app_tag_value;
-	__le16 app_tag_mask;
-	u8 flags0;
-#define RDIF_TASK_CONTEXT_IGNORE_APP_TAG_MASK             0x1
-#define RDIF_TASK_CONTEXT_IGNORE_APP_TAG_SHIFT            0
-#define RDIF_TASK_CONTEXT_INITIAL_REF_TAG_VALID_MASK      0x1
-#define RDIF_TASK_CONTEXT_INITIAL_REF_TAG_VALID_SHIFT     1
-/* 0 = IP checksum, 1 = CRC */
-#define RDIF_TASK_CONTEXT_HOST_GUARD_TYPE_MASK            0x1
-#define RDIF_TASK_CONTEXT_HOST_GUARD_TYPE_SHIFT           2
-#define RDIF_TASK_CONTEXT_SET_ERROR_WITH_EOP_MASK         0x1
-#define RDIF_TASK_CONTEXT_SET_ERROR_WITH_EOP_SHIFT        3
-/* 1/2/3 - Protection Type */
-#define RDIF_TASK_CONTEXT_PROTECTION_TYPE_MASK            0x3
-#define RDIF_TASK_CONTEXT_PROTECTION_TYPE_SHIFT           4
-/* 0=0x0000, 1=0xffff */
-#define RDIF_TASK_CONTEXT_CRC_SEED_MASK                   0x1
-#define RDIF_TASK_CONTEXT_CRC_SEED_SHIFT                  6
-/* Keep reference tag constant */
-#define RDIF_TASK_CONTEXT_KEEP_REF_TAG_CONST_MASK         0x1
-#define RDIF_TASK_CONTEXT_KEEP_REF_TAG_CONST_SHIFT        7
-	u8 partial_dif_data[7];
-	__le16 partial_crc_value;
-	__le16 partial_checksum_value;
-	__le32 offset_in_io;
-	__le16 flags1;
-#define RDIF_TASK_CONTEXT_VALIDATE_GUARD_MASK             0x1
-#define RDIF_TASK_CONTEXT_VALIDATE_GUARD_SHIFT            0
-#define RDIF_TASK_CONTEXT_VALIDATE_APP_TAG_MASK           0x1
-#define RDIF_TASK_CONTEXT_VALIDATE_APP_TAG_SHIFT          1
-#define RDIF_TASK_CONTEXT_VALIDATE_REF_TAG_MASK           0x1
-#define RDIF_TASK_CONTEXT_VALIDATE_REF_TAG_SHIFT          2
-#define RDIF_TASK_CONTEXT_FORWARD_GUARD_MASK              0x1
-#define RDIF_TASK_CONTEXT_FORWARD_GUARD_SHIFT             3
-#define RDIF_TASK_CONTEXT_FORWARD_APP_TAG_MASK            0x1
-#define RDIF_TASK_CONTEXT_FORWARD_APP_TAG_SHIFT           4
-#define RDIF_TASK_CONTEXT_FORWARD_REF_TAG_MASK            0x1
-#define RDIF_TASK_CONTEXT_FORWARD_REF_TAG_SHIFT           5
-/* 0=512B, 1=1KB, 2=2KB, 3=4KB, 4=8KB */
-#define RDIF_TASK_CONTEXT_INTERVAL_SIZE_MASK              0x7
-#define RDIF_TASK_CONTEXT_INTERVAL_SIZE_SHIFT             6
-/* 0=None, 1=DIF, 2=DIX */
-#define RDIF_TASK_CONTEXT_HOST_INTERFACE_MASK             0x3
-#define RDIF_TASK_CONTEXT_HOST_INTERFACE_SHIFT            9
-/* DIF tag right at the beginning of DIF interval */
-#define RDIF_TASK_CONTEXT_DIF_BEFORE_DATA_MASK            0x1
-#define RDIF_TASK_CONTEXT_DIF_BEFORE_DATA_SHIFT           11
-#define RDIF_TASK_CONTEXT_RESERVED0_MASK                  0x1
-#define RDIF_TASK_CONTEXT_RESERVED0_SHIFT                 12
-/* 0=None, 1=DIF */
-#define RDIF_TASK_CONTEXT_NETWORK_INTERFACE_MASK          0x1
-#define RDIF_TASK_CONTEXT_NETWORK_INTERFACE_SHIFT         13
-/* Forward application tag with mask */
-#define RDIF_TASK_CONTEXT_FORWARD_APP_TAG_WITH_MASK_MASK  0x1
-#define RDIF_TASK_CONTEXT_FORWARD_APP_TAG_WITH_MASK_SHIFT 14
-/* Forward reference tag with mask */
-#define RDIF_TASK_CONTEXT_FORWARD_REF_TAG_WITH_MASK_MASK  0x1
-#define RDIF_TASK_CONTEXT_FORWARD_REF_TAG_WITH_MASK_SHIFT 15
-	__le16 state;
-#define RDIF_TASK_CONTEXT_RECEIVED_DIF_BYTES_LEFT_MASK    0xF
-#define RDIF_TASK_CONTEXT_RECEIVED_DIF_BYTES_LEFT_SHIFT   0
-#define RDIF_TASK_CONTEXT_TRANSMITED_DIF_BYTES_LEFT_MASK  0xF
-#define RDIF_TASK_CONTEXT_TRANSMITED_DIF_BYTES_LEFT_SHIFT 4
-#define RDIF_TASK_CONTEXT_ERROR_IN_IO_MASK                0x1
-#define RDIF_TASK_CONTEXT_ERROR_IN_IO_SHIFT               8
-#define RDIF_TASK_CONTEXT_CHECKSUM_OVERFLOW_MASK          0x1
-#define RDIF_TASK_CONTEXT_CHECKSUM_OVERFLOW_SHIFT         9
-/* mask for refernce tag handling */
-#define RDIF_TASK_CONTEXT_REF_TAG_MASK_MASK               0xF
-#define RDIF_TASK_CONTEXT_REF_TAG_MASK_SHIFT              10
-#define RDIF_TASK_CONTEXT_RESERVED1_MASK                  0x3
-#define RDIF_TASK_CONTEXT_RESERVED1_SHIFT                 14
-	__le32 reserved2;
+struct src_entry_header {
+	__le32 flags;
+/* Address type : Physical = 0 , Logical = 1 (use enum src_header_next_ptr_type_enum) */
+#define SRC_ENTRY_HEADER_NEXT_PTR_TYPE_MASK  0x1
+#define SRC_ENTRY_HEADER_NEXT_PTR_TYPE_SHIFT 0
+#define SRC_ENTRY_HEADER_EMPTY_MASK          0x1 /* In T1 (first hop) indicates an empty hash bin */
+#define SRC_ENTRY_HEADER_EMPTY_SHIFT         1
+#define SRC_ENTRY_HEADER_RESERVED_MASK       0x3FFFFFFF
+#define SRC_ENTRY_HEADER_RESERVED_SHIFT      2
+	__le32 magic_number /* Must be SRC_HEADER_MAGIC_NUMBER (0x600DFEED) */;
+	struct regpair next_ptr /* Pointer to next bin */;
 };
 
+
 /*
- * RSS hash type
- */
-enum rss_hash_type {
-	RSS_HASH_TYPE_DEFAULT = 0,
-	RSS_HASH_TYPE_IPV4 = 1,
-	RSS_HASH_TYPE_TCP_IPV4 = 2,
-	RSS_HASH_TYPE_IPV6 = 3,
-	RSS_HASH_TYPE_TCP_IPV6 = 4,
-	RSS_HASH_TYPE_UDP_IPV4 = 5,
-	RSS_HASH_TYPE_UDP_IPV6 = 6,
-	MAX_RSS_HASH_TYPE
+ * Enumeration for address type
+ */
+enum src_header_next_ptr_type_enum {
+	e_physical_addr /* Address of type physical */,
+	e_logical_addr /* Address of type logical */,
+	MAX_SRC_HEADER_NEXT_PTR_TYPE_ENUM
 };
 
+
 /*
  * status block structure
  */
-struct status_block {
-	__le16 pi_array[PIS_PER_SB];
+struct status_block_e4 {
+	__le16 pi_array[PIS_PER_SB_E4];
 	__le32 sb_num;
-#define STATUS_BLOCK_SB_NUM_MASK      0x1FF
-#define STATUS_BLOCK_SB_NUM_SHIFT     0
-#define STATUS_BLOCK_ZERO_PAD_MASK    0x7F
-#define STATUS_BLOCK_ZERO_PAD_SHIFT   9
-#define STATUS_BLOCK_ZERO_PAD2_MASK   0xFFFF
-#define STATUS_BLOCK_ZERO_PAD2_SHIFT  16
+#define STATUS_BLOCK_E4_SB_NUM_MASK      0x1FF
+#define STATUS_BLOCK_E4_SB_NUM_SHIFT     0
+#define STATUS_BLOCK_E4_ZERO_PAD_MASK    0x7F
+#define STATUS_BLOCK_E4_ZERO_PAD_SHIFT   9
+#define STATUS_BLOCK_E4_ZERO_PAD2_MASK   0xFFFF
+#define STATUS_BLOCK_E4_ZERO_PAD2_SHIFT  16
 	__le32 prod_index;
-#define STATUS_BLOCK_PROD_INDEX_MASK  0xFFFFFF
-#define STATUS_BLOCK_PROD_INDEX_SHIFT 0
-#define STATUS_BLOCK_ZERO_PAD3_MASK   0xFF
-#define STATUS_BLOCK_ZERO_PAD3_SHIFT  24
+#define STATUS_BLOCK_E4_PROD_INDEX_MASK  0xFFFFFF
+#define STATUS_BLOCK_E4_PROD_INDEX_SHIFT 0
+#define STATUS_BLOCK_E4_ZERO_PAD3_MASK   0xFF
+#define STATUS_BLOCK_E4_ZERO_PAD3_SHIFT  24
 };
 
 
 /*
- * Tdif context
+ * status block structure
  */
-struct tdif_task_context {
-	__le32 initial_ref_tag;
-	__le16 app_tag_value;
-	__le16 app_tag_mask;
-	__le16 partial_crc_value_b;
-	__le16 partial_checksum_value_b;
-	__le16 stateB;
-#define TDIF_TASK_CONTEXT_RECEIVED_DIF_BYTES_LEFT_B_MASK    0xF
-#define TDIF_TASK_CONTEXT_RECEIVED_DIF_BYTES_LEFT_B_SHIFT   0
-#define TDIF_TASK_CONTEXT_TRANSMITED_DIF_BYTES_LEFT_B_MASK  0xF
-#define TDIF_TASK_CONTEXT_TRANSMITED_DIF_BYTES_LEFT_B_SHIFT 4
-#define TDIF_TASK_CONTEXT_ERROR_IN_IO_B_MASK                0x1
-#define TDIF_TASK_CONTEXT_ERROR_IN_IO_B_SHIFT               8
-#define TDIF_TASK_CONTEXT_CHECKSUM_VERFLOW_MASK             0x1
-#define TDIF_TASK_CONTEXT_CHECKSUM_VERFLOW_SHIFT            9
-#define TDIF_TASK_CONTEXT_RESERVED0_MASK                    0x3F
-#define TDIF_TASK_CONTEXT_RESERVED0_SHIFT                   10
-	u8 reserved1;
-	u8 flags0;
-#define TDIF_TASK_CONTEXT_IGNORE_APP_TAG_MASK               0x1
-#define TDIF_TASK_CONTEXT_IGNORE_APP_TAG_SHIFT              0
-#define TDIF_TASK_CONTEXT_INITIAL_REF_TAG_VALID_MASK        0x1
-#define TDIF_TASK_CONTEXT_INITIAL_REF_TAG_VALID_SHIFT       1
-/* 0 = IP checksum, 1 = CRC */
-#define TDIF_TASK_CONTEXT_HOST_GUARD_TYPE_MASK              0x1
-#define TDIF_TASK_CONTEXT_HOST_GUARD_TYPE_SHIFT             2
-#define TDIF_TASK_CONTEXT_SET_ERROR_WITH_EOP_MASK           0x1
-#define TDIF_TASK_CONTEXT_SET_ERROR_WITH_EOP_SHIFT          3
-/* 1/2/3 - Protection Type */
-#define TDIF_TASK_CONTEXT_PROTECTION_TYPE_MASK              0x3
-#define TDIF_TASK_CONTEXT_PROTECTION_TYPE_SHIFT             4
-/* 0=0x0000, 1=0xffff */
-#define TDIF_TASK_CONTEXT_CRC_SEED_MASK                     0x1
-#define TDIF_TASK_CONTEXT_CRC_SEED_SHIFT                    6
-#define TDIF_TASK_CONTEXT_RESERVED2_MASK                    0x1
-#define TDIF_TASK_CONTEXT_RESERVED2_SHIFT                   7
-	__le32 flags1;
-#define TDIF_TASK_CONTEXT_VALIDATE_GUARD_MASK               0x1
-#define TDIF_TASK_CONTEXT_VALIDATE_GUARD_SHIFT              0
-#define TDIF_TASK_CONTEXT_VALIDATE_APP_TAG_MASK             0x1
-#define TDIF_TASK_CONTEXT_VALIDATE_APP_TAG_SHIFT            1
-#define TDIF_TASK_CONTEXT_VALIDATE_REF_TAG_MASK             0x1
-#define TDIF_TASK_CONTEXT_VALIDATE_REF_TAG_SHIFT            2
-#define TDIF_TASK_CONTEXT_FORWARD_GUARD_MASK                0x1
-#define TDIF_TASK_CONTEXT_FORWARD_GUARD_SHIFT               3
-#define TDIF_TASK_CONTEXT_FORWARD_APP_TAG_MASK              0x1
-#define TDIF_TASK_CONTEXT_FORWARD_APP_TAG_SHIFT             4
-#define TDIF_TASK_CONTEXT_FORWARD_REF_TAG_MASK              0x1
-#define TDIF_TASK_CONTEXT_FORWARD_REF_TAG_SHIFT             5
-/* 0=512B, 1=1KB, 2=2KB, 3=4KB, 4=8KB */
-#define TDIF_TASK_CONTEXT_INTERVAL_SIZE_MASK                0x7
-#define TDIF_TASK_CONTEXT_INTERVAL_SIZE_SHIFT               6
-/* 0=None, 1=DIF, 2=DIX */
-#define TDIF_TASK_CONTEXT_HOST_INTERFACE_MASK               0x3
-#define TDIF_TASK_CONTEXT_HOST_INTERFACE_SHIFT              9
-/* DIF tag right at the beginning of DIF interval */
-#define TDIF_TASK_CONTEXT_DIF_BEFORE_DATA_MASK              0x1
-#define TDIF_TASK_CONTEXT_DIF_BEFORE_DATA_SHIFT             11
-#define TDIF_TASK_CONTEXT_RESERVED3_MASK                    0x1 /* reserved */
-#define TDIF_TASK_CONTEXT_RESERVED3_SHIFT                   12
-/* 0=None, 1=DIF */
-#define TDIF_TASK_CONTEXT_NETWORK_INTERFACE_MASK            0x1
-#define TDIF_TASK_CONTEXT_NETWORK_INTERFACE_SHIFT           13
-#define TDIF_TASK_CONTEXT_RECEIVED_DIF_BYTES_LEFT_A_MASK    0xF
-#define TDIF_TASK_CONTEXT_RECEIVED_DIF_BYTES_LEFT_A_SHIFT   14
-#define TDIF_TASK_CONTEXT_TRANSMITED_DIF_BYTES_LEFT_A_MASK  0xF
-#define TDIF_TASK_CONTEXT_TRANSMITED_DIF_BYTES_LEFT_A_SHIFT 18
-#define TDIF_TASK_CONTEXT_ERROR_IN_IO_A_MASK                0x1
-#define TDIF_TASK_CONTEXT_ERROR_IN_IO_A_SHIFT               22
-#define TDIF_TASK_CONTEXT_CHECKSUM_OVERFLOW_A_MASK          0x1
-#define TDIF_TASK_CONTEXT_CHECKSUM_OVERFLOW_A_SHIFT         23
-/* mask for refernce tag handling */
-#define TDIF_TASK_CONTEXT_REF_TAG_MASK_MASK                 0xF
-#define TDIF_TASK_CONTEXT_REF_TAG_MASK_SHIFT                24
-/* Forward application tag with mask */
-#define TDIF_TASK_CONTEXT_FORWARD_APP_TAG_WITH_MASK_MASK    0x1
-#define TDIF_TASK_CONTEXT_FORWARD_APP_TAG_WITH_MASK_SHIFT   28
-/* Forward reference tag with mask */
-#define TDIF_TASK_CONTEXT_FORWARD_REF_TAG_WITH_MASK_MASK    0x1
-#define TDIF_TASK_CONTEXT_FORWARD_REF_TAG_WITH_MASK_SHIFT   29
-/* Keep reference tag constant */
-#define TDIF_TASK_CONTEXT_KEEP_REF_TAG_CONST_MASK           0x1
-#define TDIF_TASK_CONTEXT_KEEP_REF_TAG_CONST_SHIFT          30
-#define TDIF_TASK_CONTEXT_RESERVED4_MASK                    0x1
-#define TDIF_TASK_CONTEXT_RESERVED4_SHIFT                   31
-	__le32 offset_in_io_b;
-	__le16 partial_crc_value_a;
-	__le16 partial_checksum_value_a;
-	__le32 offset_in_io_a;
-	u8 partial_dif_data_a[8];
-	u8 partial_dif_data_b[8];
+struct status_block_e5 {
+	__le16 pi_array[PIS_PER_SB_E5];
+	__le16 pi_array_padding[PIS_PER_SB_PADDING_E5];
+	__le32 sb_num;
+#define STATUS_BLOCK_E5_SB_NUM_MASK      0x1FF
+#define STATUS_BLOCK_E5_SB_NUM_SHIFT     0
+#define STATUS_BLOCK_E5_ZERO_PAD_MASK    0x7F
+#define STATUS_BLOCK_E5_ZERO_PAD_SHIFT   9
+#define STATUS_BLOCK_E5_ZERO_PAD2_MASK   0xFFFF
+#define STATUS_BLOCK_E5_ZERO_PAD2_SHIFT  16
+	__le32 prod_index;
+#define STATUS_BLOCK_E5_PROD_INDEX_MASK  0xFFFFFF
+#define STATUS_BLOCK_E5_PROD_INDEX_SHIFT 0
+#define STATUS_BLOCK_E5_ZERO_PAD3_MASK   0xFF
+#define STATUS_BLOCK_E5_ZERO_PAD3_SHIFT  24
 };
 
 
@@ -1637,11 +2078,9 @@ struct timers_context {
 #define TIMERS_CONTEXT_EXPIRATIONTIMELC0_SHIFT    0
 #define TIMERS_CONTEXT_RESERVED0_MASK             0x1
 #define TIMERS_CONTEXT_RESERVED0_SHIFT            27
-/* Valid bit of logical client 0 */
-#define TIMERS_CONTEXT_VALIDLC0_MASK              0x1
+#define TIMERS_CONTEXT_VALIDLC0_MASK              0x1 /* Valid bit of logical client 0 */
 #define TIMERS_CONTEXT_VALIDLC0_SHIFT             28
-/* Active bit of logical client 0 */
-#define TIMERS_CONTEXT_ACTIVELC0_MASK             0x1
+#define TIMERS_CONTEXT_ACTIVELC0_MASK             0x1 /* Active bit of logical client 0 */
 #define TIMERS_CONTEXT_ACTIVELC0_SHIFT            29
 #define TIMERS_CONTEXT_RESERVED1_MASK             0x3
 #define TIMERS_CONTEXT_RESERVED1_SHIFT            30
@@ -1651,11 +2090,9 @@ struct timers_context {
 #define TIMERS_CONTEXT_EXPIRATIONTIMELC1_SHIFT    0
 #define TIMERS_CONTEXT_RESERVED2_MASK             0x1
 #define TIMERS_CONTEXT_RESERVED2_SHIFT            27
-/* Valid bit of logical client 1 */
-#define TIMERS_CONTEXT_VALIDLC1_MASK              0x1
+#define TIMERS_CONTEXT_VALIDLC1_MASK              0x1 /* Valid bit of logical client 1 */
 #define TIMERS_CONTEXT_VALIDLC1_SHIFT             28
-/* Active bit of logical client 1 */
-#define TIMERS_CONTEXT_ACTIVELC1_MASK             0x1
+#define TIMERS_CONTEXT_ACTIVELC1_MASK             0x1 /* Active bit of logical client 1 */
 #define TIMERS_CONTEXT_ACTIVELC1_SHIFT            29
 #define TIMERS_CONTEXT_RESERVED3_MASK             0x3
 #define TIMERS_CONTEXT_RESERVED3_SHIFT            30
@@ -1665,11 +2102,9 @@ struct timers_context {
 #define TIMERS_CONTEXT_EXPIRATIONTIMELC2_SHIFT    0
 #define TIMERS_CONTEXT_RESERVED4_MASK             0x1
 #define TIMERS_CONTEXT_RESERVED4_SHIFT            27
-/* Valid bit of logical client 2 */
-#define TIMERS_CONTEXT_VALIDLC2_MASK              0x1
+#define TIMERS_CONTEXT_VALIDLC2_MASK              0x1 /* Valid bit of logical client 2 */
 #define TIMERS_CONTEXT_VALIDLC2_SHIFT             28
-/* Active bit of logical client 2 */
-#define TIMERS_CONTEXT_ACTIVELC2_MASK             0x1
+#define TIMERS_CONTEXT_ACTIVELC2_MASK             0x1 /* Active bit of logical client 2 */
 #define TIMERS_CONTEXT_ACTIVELC2_SHIFT            29
 #define TIMERS_CONTEXT_RESERVED5_MASK             0x3
 #define TIMERS_CONTEXT_RESERVED5_SHIFT            30
@@ -1679,8 +2114,7 @@ struct timers_context {
 #define TIMERS_CONTEXT_HOSTEXPRIRATIONVALUE_SHIFT 0
 #define TIMERS_CONTEXT_RESERVED6_MASK             0x1
 #define TIMERS_CONTEXT_RESERVED6_SHIFT            27
-/* Valid bit of host expiration */
-#define TIMERS_CONTEXT_HOSTEXPRIRATIONVALID_MASK  0x1
+#define TIMERS_CONTEXT_HOSTEXPRIRATIONVALID_MASK  0x1 /* Valid bit of host expiration */
 #define TIMERS_CONTEXT_HOSTEXPRIRATIONVALID_SHIFT 28
 #define TIMERS_CONTEXT_RESERVED7_MASK             0x7
 #define TIMERS_CONTEXT_RESERVED7_SHIFT            29
@@ -1688,7 +2122,7 @@ struct timers_context {
 
 
 /*
- * Enum for next_protocol field of tunnel_parsing_flags
+ * Enum for next_protocol field of tunnel_parsing_flags / tunnelTypeDesc
  */
 enum tunnel_next_protocol {
 	e_unknown = 0,
drivers/net/qede/base/ecore.h +19 -3
index 6c8e6d407..3fb8fd2ce 100644
@@ -516,8 +516,10 @@ struct ecore_fw_data {
 	const u8 *modes_tree_buf;
 	union init_op *init_ops;
 	const u32 *arr_data;
-	const u32 *fw_overlays;
-	u32 fw_overlays_len;
+	const u32 *fw_overlays_e4;
+	u32 fw_overlays_e4_len;
+	const u32 *fw_overlays_e5;
+	u32 fw_overlays_e5_len;
 	u32 init_ops_size;
 };
 
@@ -730,6 +732,7 @@ enum ecore_mf_mode {
 enum ecore_dev_type {
 	ECORE_DEV_TYPE_BB,
 	ECORE_DEV_TYPE_AH,
+	ECORE_DEV_TYPE_E5,
 };
 
 /* @DPDK */
@@ -775,12 +778,15 @@ struct ecore_dev {
 #endif
 #define ECORE_IS_AH(dev)	((dev)->type == ECORE_DEV_TYPE_AH)
 #define ECORE_IS_K2(dev)	ECORE_IS_AH(dev)
+#define ECORE_IS_E4(dev)	(ECORE_IS_BB(dev) || ECORE_IS_AH(dev))
+#define ECORE_IS_E5(dev)	((dev)->type == ECORE_DEV_TYPE_E5)
 
 	u16 vendor_id;
 	u16 device_id;
 #define ECORE_DEV_ID_MASK	0xff00
 #define ECORE_DEV_ID_MASK_BB	0x1600
 #define ECORE_DEV_ID_MASK_AH	0x8000
+#define ECORE_DEV_ID_MASK_E5	0x8100
 
 	u16				chip_num;
 #define CHIP_NUM_MASK			0xffff
@@ -1105,8 +1111,18 @@ void ecore_set_platform_str(struct ecore_hwfn *p_hwfn,
 			    char *buf_str, u32 buf_size);
 
 #define TSTORM_QZONE_START	PXP_VF_BAR0_START_SDM_ZONE_A
+#define TSTORM_QZONE_SIZE(dev) \
+	(ECORE_IS_E4(dev) ? TSTORM_QZONE_SIZE_E4 : TSTORM_QZONE_SIZE_E5)
 
 #define MSTORM_QZONE_START(dev) \
-	(TSTORM_QZONE_START + (TSTORM_QZONE_SIZE * NUM_OF_L2_QUEUES(dev)))
+	(TSTORM_QZONE_START + (TSTORM_QZONE_SIZE(dev) * NUM_OF_L2_QUEUES(dev)))
+#define MSTORM_QZONE_SIZE(dev) \
+	(ECORE_IS_E4(dev) ? MSTORM_QZONE_SIZE_E4 : MSTORM_QZONE_SIZE_E5)
+
+#define USTORM_QZONE_START(dev) \
+	(MSTORM_QZONE_START(dev) + \
+	 (MSTORM_QZONE_SIZE(dev) *  NUM_OF_L2_QUEUES(dev)))
+#define USTORM_QZONE_SIZE(dev) \
+	(ECORE_IS_E4(dev) ? USTORM_QZONE_SIZE_E4 : USTORM_QZONE_SIZE_E5)
 
 #endif /* __ECORE_H */
drivers/net/qede/base/ecore_cxt.c +43 -10

76 lines not on this page · raw message

drivers/net/qede/base/ecore_cxt.h +0 -12
index 1a539bbc7..cd0e32e3b 100644
@@ -22,18 +22,6 @@ enum ecore_cxt_elem_type {
 	ECORE_ELEM_TASK
 };
 
-enum ilt_clients {
-	ILT_CLI_CDUC,
-	ILT_CLI_CDUT,
-	ILT_CLI_QM,
-	ILT_CLI_TM,
-	ILT_CLI_SRC,
-	ILT_CLI_TSDM,
-	ILT_CLI_RGFS,
-	ILT_CLI_TGFS,
-	MAX_ILT_CLIENTS
-};
-
 u32 ecore_cxt_get_proto_cid_count(struct ecore_hwfn *p_hwfn,
 				  enum protocol_type type,
 				  u32 *vf_cid);
drivers/net/qede/base/ecore_dev.c +29 -20

66 lines not on this page · raw message

drivers/net/qede/base/ecore_hsi_common.h +1605 -1114

374 lines not on this page · raw message

drivers/net/qede/base/ecore_hsi_debug_tools.h +220 -206

426 lines not on this page · raw message

drivers/net/qede/base/ecore_hsi_eth.h +3349 -1192

4,541 lines not on this page · raw message

drivers/net/qede/base/ecore_hsi_func_common.h +3 -2
index 4351b7b14..6dc10aece 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/base/ecore_hsi_init_func.h +681 -24

705 lines not on this page · raw message

drivers/net/qede/base/ecore_hsi_init_tool.h +114 -140

254 lines not on this page · raw message

drivers/net/qede/base/ecore_init_fw_funcs.c +94 -59

153 lines not on this page · raw message

drivers/net/qede/base/ecore_init_ops.c +12 -4
index ea964ea2f..42885a401 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/base/ecore_int.c +27 -12
index 4207b1853..e0d61e375 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/base/ecore_int.h +3 -1
index 5042cd1d1..924c31429 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/base/ecore_int_api.h +1 -1
index d7b6b86cc..553d7e6b3 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/base/ecore_l2.c +3 -3
index af234dec8..01eb69c0e 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/base/ecore_spq.c +28 -11
index 02f613688..93e984bf8 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/base/ecore_spq.h +1 -1
index 0958e5a0a..80dbdeaa0 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/base/ecore_sriov.c +3 -2
index ed8cc695f..b49465b88 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/base/ecore_vf.c +1 -1
index db03bc494..e00caf646 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/base/eth_common.h +5 -1
index 4611d86d9..1ca11c473 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/qede_debug.c +15 -9
index 180d6f92c..d46727c45 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/qede_main.c +1 -1
index caa9d1d4f..e865d988f 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/qede_rxtx.c +8 -7
index 75d78cebb..6fc67d878 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.18.0

Part of the diff is not shown here. View the raw message.

#2 lore raw

PATCH 3/7 net/qede/base: add OS abstracted changes

In reply to Rasesh Mody

The patch includes OS abstracted changes required to support new hardware and the new feature supported by it. It also adds new bit ops to RTE library.

---
 drivers/net/qede/base/bcm_osal.c    |  2 +-
 drivers/net/qede/base/bcm_osal.h    | 39 ++++++++++++++++++---
 lib/librte_eal/include/rte_bitops.h | 54 ++++++++++++++++++++++++++++-
 3 files changed, 88 insertions(+), 7 deletions(-)
drivers/net/qede/base/bcm_osal.c +1 -1
index 2c59397e0..23a84795f 100644
@@ -121,7 +121,7 @@ void qede_vf_fill_driver_data(struct ecore_hwfn *hwfn,
 			      struct ecore_vf_acquire_sw_info *vf_sw_info)
 {
 	vf_sw_info->os_type = VFPF_ACQUIRE_OS_LINUX_USERSPACE;
-	vf_sw_info->override_fw_version = 1;
+	/* TODO - fill driver version */
 }
 
 void *osal_dma_alloc_coherent(struct ecore_dev *p_dev,
drivers/net/qede/base/bcm_osal.h +34 -5
index c5b539928..38b7fff67 100644
@@ -47,9 +47,10 @@ void qed_link_update(struct ecore_hwfn *hwfn);
 #endif
 #endif
 
-#define OSAL_WARN(arg1, arg2, arg3, ...) (0)
-
-#define UNUSED(x)	(void)(x)
+#define UNUSED1(a)		(void)(a)
+#define UNUSED2(a, b)		((void)(a), UNUSED1(b))
+#define UNUSED3(a, b, c)	((void)(a), UNUSED2(b, c))
+#define UNUSED4(a, b, c, d)	((void)(a), UNUSED3(b, c, d))
 
 /* Memory Types */
 typedef uint8_t u8;
@@ -167,9 +168,8 @@ typedef pthread_mutex_t osal_mutex_t;
 #define OSAL_SPIN_UNLOCK(lock) rte_spinlock_unlock(lock)
 #define OSAL_SPIN_LOCK_IRQSAVE(lock, flags)	\
 	do {					\
-		UNUSED(lock);			\
 		flags = 0;			\
-		UNUSED(flags);			\
+		UNUSED2(lock, flags);		\
 	} while (0)
 #define OSAL_SPIN_UNLOCK_IRQSAVE(lock, flags) nothing
 #define OSAL_SPIN_LOCK_ALLOC(hwfn, lock) nothing
@@ -326,6 +326,18 @@ typedef struct osal_list_t {
 #define OSAL_GET_BIT(bit, bitmap) \
 	rte_bit_relaxed_get32(bit, bitmap)
 
+#define OSAL_TEST_BIT(bit, bitmap) \
+	OSAL_GET_BIT(bit, bitmap)
+
+#define OSAL_TEST_AND_CLEAR_BIT(bit, bitmap) \
+	rte_bit_relaxed_test_and_clear32(bit, bitmap)
+
+#define OSAL_TEST_AND_FLIP_BIT(bit, bitmap) \
+	rte_bit_relaxed_test_and_flip32(bit, bitmap)
+
+#define OSAL_NON_ATOMIC_SET_BIT(bit, bitmap) \
+	rte_bit_relaxed_set32(bit, bitmap)
+
 u32 qede_find_first_bit(unsigned long *, u32);
 #define OSAL_FIND_FIRST_BIT(bitmap, length) \
 	qede_find_first_bit(bitmap, length)
@@ -342,7 +354,10 @@ u32 qede_find_first_zero_bit(u32 *bitmap, u32 length);
 #define OSAL_BITMAP_WEIGHT(bitmap, count) 0
 
 #define OSAL_LINK_UPDATE(hwfn) qed_link_update(hwfn)
+#define OSAL_BW_UPDATE(hwfn, ptt) nothing
 #define OSAL_TRANSCEIVER_UPDATE(hwfn) nothing
+#define OSAL_TRANSCEIVER_TX_FAULT(hwfn) nothing
+#define OSAL_TRANSCEIVER_RX_LOS(hwfn) nothing
 #define OSAL_DCBX_AEN(hwfn, mib_type) nothing
 
 /* SR-IOV channel */
@@ -366,6 +381,8 @@ void osal_vf_flr_update(struct ecore_hwfn *p_hwfn);
 #define OSAL_IOV_VF_MSG_TYPE(hwfn, vfid, vf_msg_type) nothing
 #define OSAL_IOV_PF_RESP_TYPE(hwfn, vfid, pf_resp_type) nothing
 #define OSAL_IOV_VF_VPORT_STOP(hwfn, vf) nothing
+#define OSAL_IOV_DB_REC_HANDLER(hwfn) nothing
+#define OSAL_IOV_BULLETIN_UPDATE(hwfn) nothing
 
 u32 qede_unzip_data(struct ecore_hwfn *p_hwfn, u32 input_len,
 		   u8 *input_buf, u32 max_size, u8 *unzip_buf);
@@ -412,16 +429,20 @@ u32 qede_osal_log2(u32);
 
 #define OFFSETOF(str, field) __builtin_offsetof(str, field)
 #define OSAL_ASSERT(is_assert) assert(is_assert)
+#define OSAL_WARN(condition, format, ...) (0)
 #define OSAL_BEFORE_PF_START(file, engine) nothing
 #define OSAL_AFTER_PF_STOP(file, engine) nothing
+#define OSAL_GCD(a, b)  (1)
 
 /* Endian macros */
 #define OSAL_CPU_TO_BE32(val) rte_cpu_to_be_32(val)
+#define OSAL_CPU_TO_BE16(val) rte_cpu_to_be_16(val)
 #define OSAL_BE32_TO_CPU(val) rte_be_to_cpu_32(val)
 #define OSAL_CPU_TO_LE32(val) rte_cpu_to_le_32(val)
 #define OSAL_CPU_TO_LE16(val) rte_cpu_to_le_16(val)
 #define OSAL_LE32_TO_CPU(val) rte_le_to_cpu_32(val)
 #define OSAL_LE16_TO_CPU(val) rte_le_to_cpu_16(val)
+#define OSAL_BE16_TO_CPU(val) rte_be_to_cpu_16(val)
 #define OSAL_CPU_TO_BE64(val) rte_cpu_to_be_64(val)
 
 #define OSAL_ARRAY_SIZE(arr) RTE_DIM(arr)
@@ -432,6 +453,7 @@ u32 qede_osal_log2(u32);
 #define OSAL_STRLEN(string) strlen(string)
 #define OSAL_STRCPY(dst, string) strcpy(dst, string)
 #define OSAL_STRNCPY(dst, string, len) strncpy(dst, string, len)
+#define OSAL_STRLCPY(dst, string, len) strlcpy(dst, string, len)
 #define OSAL_STRCMP(str1, str2) strcmp(str1, str2)
 #define OSAL_STRTOUL(str, base, res) 0
 
@@ -463,6 +485,7 @@ u32 qede_crc32(u32 crc, u8 *ptr, u32 length);
 #define OSAL_MFW_FILL_TLV_DATA(type, buf, data) (0)
 #define OSAL_HW_INFO_CHANGE(p_hwfn, change) nothing
 #define OSAL_MFW_CMD_PREEMPT(p_hwfn) nothing
+#define OSAL_NUM_FUNCS_IS_SET(p_hwfn) nothing
 #define OSAL_PF_VALIDATE_MODIFY_TUNN_CONFIG(p_hwfn, mask, b_update, tunn) 0
 
 #define OSAL_DIV_S64(a, b)	((a) / (b))
@@ -478,4 +501,10 @@ enum dbg_status	qed_dbg_alloc_user_data(struct ecore_hwfn *p_hwfn,
 	qed_dbg_alloc_user_data(p_hwfn, user_data_ptr)
 #define OSAL_DB_REC_OCCURRED(p_hwfn) nothing
 
+typedef int osal_va_list;
+#define OSAL_VA_START(A, B) UNUSED2(A, B)
+#define OSAL_VA_END(A) UNUSED1(A)
+#define OSAL_VSNPRINTF(A, ...) 0
+#define OSAL_INT_DBG_STORE(P_DEV, ...) nothing
+
 #endif /* __BCM_OSAL_H */
lib/librte_eal/include/rte_bitops.h +53 -1

70 lines not on this page · raw message

Signature · 1 line
2.18.0
#3 lore raw

PATCH 4/7 net/qede/base: update base driver to 8.62.4.0

In reply to Rasesh Mody

The patch updates the base driver required to support new hardware and the new firmware supported by it as well as the existing hardware. The base driver is updated to 8.62.4.0 version. There are some white space changes adhering new policy.

---
 drivers/net/qede/base/ecore.h               |  550 +-
 drivers/net/qede/base/ecore_attn_values.h   |    3 +-
 drivers/net/qede/base/ecore_cxt.c           | 1184 +++--
 drivers/net/qede/base/ecore_cxt.h           |  140 +-
 drivers/net/qede/base/ecore_cxt_api.h       |   31 +-
 drivers/net/qede/base/ecore_dcbx.c          |  524 +-
 drivers/net/qede/base/ecore_dcbx.h          |   16 +-
 drivers/net/qede/base/ecore_dcbx_api.h      |   41 +-
 drivers/net/qede/base/ecore_dev.c           | 3865 ++++++++++----
 drivers/net/qede/base/ecore_dev_api.h       |  354 +-
 drivers/net/qede/base/ecore_gtt_reg_addr.h  |   93 +-
 drivers/net/qede/base/ecore_gtt_values.h    |    4 +-
 drivers/net/qede/base/ecore_hsi_common.h    |    2 +-
 drivers/net/qede/base/ecore_hw.c            |  381 +-
 drivers/net/qede/base/ecore_hw.h            |   55 +-
 drivers/net/qede/base/ecore_hw_defs.h       |   45 +-
 drivers/net/qede/base/ecore_init_fw_funcs.c | 1224 +++--
 drivers/net/qede/base/ecore_init_fw_funcs.h |  457 +-
 drivers/net/qede/base/ecore_init_ops.c      |  143 +-
 drivers/net/qede/base/ecore_init_ops.h      |   19 +-
 drivers/net/qede/base/ecore_int.c           | 1313 +++--
 drivers/net/qede/base/ecore_int.h           |   60 +-
 drivers/net/qede/base/ecore_int_api.h       |  125 +-
 drivers/net/qede/base/ecore_iov_api.h       |  115 +-
 drivers/net/qede/base/ecore_iro.h           |  427 +-
 drivers/net/qede/base/ecore_iro_values.h    |  463 +-
 drivers/net/qede/base/ecore_l2.c            |  485 +-
 drivers/net/qede/base/ecore_l2.h            |   18 +-
 drivers/net/qede/base/ecore_l2_api.h        |  148 +-
 drivers/net/qede/base/ecore_mcp.c           | 2610 +++++++---
 drivers/net/qede/base/ecore_mcp.h           |  124 +-
 drivers/net/qede/base/ecore_mcp_api.h       |  467 +-
 drivers/net/qede/base/ecore_mng_tlv.c       |  910 ++--
 drivers/net/qede/base/ecore_proto_if.h      |   69 +-
 drivers/net/qede/base/ecore_rt_defs.h       |  895 ++--
 drivers/net/qede/base/ecore_sp_api.h        |    6 +-
 drivers/net/qede/base/ecore_sp_commands.c   |  138 +-
 drivers/net/qede/base/ecore_sp_commands.h   |   18 +-
 drivers/net/qede/base/ecore_spq.c           |  330 +-
 drivers/net/qede/base/ecore_spq.h           |   63 +-
 drivers/net/qede/base/ecore_sriov.c         | 1660 ++++--
 drivers/net/qede/base/ecore_sriov.h         |  146 +-
 drivers/net/qede/base/ecore_status.h        |    4 +-
 drivers/net/qede/base/ecore_utils.h         |   18 +-
 drivers/net/qede/base/ecore_vf.c            |  546 +-
 drivers/net/qede/base/ecore_vf.h            |   54 +-
 drivers/net/qede/base/ecore_vf_api.h        |   72 +-
 drivers/net/qede/base/ecore_vfpf_if.h       |  117 +-
 drivers/net/qede/base/eth_common.h          |  294 +-
 drivers/net/qede/base/mcp_public.h          | 2341 ++++++---
 drivers/net/qede/base/nvm_cfg.h             | 5059 ++++++++++---------
 drivers/net/qede/qede_debug.c               |   31 +-
 drivers/net/qede/qede_ethdev.c              |    2 +-
 drivers/net/qede/qede_rxtx.c                |    2 +-
 54 files changed, 18340 insertions(+), 9921 deletions(-)
drivers/net/qede/base/ecore.h +456 -94
index 3fb8fd2ce..9801d5348 100644
@@ -1,19 +1,28 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (c) 2016 - 2018 Cavium Inc.
+ * Copyright (c) 2018 - 2020 Marvell Semiconductor Inc.
  * All rights reserved.
- * www.cavium.com
+ * www.marvell.com
  */
-
 #ifndef __ECORE_H
 #define __ECORE_H
 
+#include <linux/if_ether.h>
+
+#define ECORE_ETH_ALEN ETH_ALEN
+#define ECORE_ETH_P_8021Q ETH_P_8021Q
+#define ECORE_ETH_P_8021AD ETH_P_8021AD
+#define UEFI
+
 /* @DPDK */
+#define CONFIG_ECORE_BINARY_FW
+#undef CONFIG_ECORE_ZIPPED_FW
+
+#ifdef CONFIG_ECORE_BINARY_FW
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
-
-#define CONFIG_ECORE_BINARY_FW
-#undef CONFIG_ECORE_ZIPPED_FW
+#endif
 
 #ifdef CONFIG_ECORE_ZIPPED_FW
 #include <zlib.h>
@@ -29,8 +38,8 @@
 #include "mcp_public.h"
 
 #define ECORE_MAJOR_VERSION		8
-#define ECORE_MINOR_VERSION		40
-#define ECORE_REVISION_VERSION		26
+#define ECORE_MINOR_VERSION		62
+#define ECORE_REVISION_VERSION		4
 #define ECORE_ENGINEERING_VERSION	0
 
 #define ECORE_VERSION							\
@@ -49,14 +58,23 @@
 #define ECORE_WFQ_UNIT	100
 #include "../qede_logs.h" /* @DPDK */
 
-#define ISCSI_BDQ_ID(_port_id) (_port_id)
-#define FCOE_BDQ_ID(_port_id) (_port_id + 2)
 /* Constants */
 #define ECORE_WID_SIZE		(1024)
 #define ECORE_MIN_WIDS		(4)
 
 /* Configurable */
 #define ECORE_PF_DEMS_SIZE	(4)
+#define ECORE_VF_DEMS_SIZE	(32)
+#define ECORE_MIN_DPIS		(4)  /* The minimal number of DPIs required to
+				      * load the driver. The number was
+				      * arbitrarily set.
+				      */
+/* Derived */
+#define ECORE_MIN_PWM_REGION	(ECORE_WID_SIZE * ECORE_MIN_DPIS)
+
+#define ECORE_CXT_PF_CID (0xff)
+
+#define ECORE_HW_STOP_RETRY_LIMIT	(10)
 
 /* cau states */
 enum ecore_coalescing_mode {
@@ -71,23 +89,29 @@ enum ecore_nvm_cmd {
 	ECORE_NVM_WRITE_NVRAM = DRV_MSG_CODE_NVM_WRITE_NVRAM,
 	ECORE_NVM_DEL_FILE = DRV_MSG_CODE_NVM_DEL_FILE,
 	ECORE_EXT_PHY_FW_UPGRADE = DRV_MSG_CODE_EXT_PHY_FW_UPGRADE,
-	ECORE_NVM_SET_SECURE_MODE = DRV_MSG_CODE_SET_SECURE_MODE,
 	ECORE_PHY_RAW_READ = DRV_MSG_CODE_PHY_RAW_READ,
 	ECORE_PHY_RAW_WRITE = DRV_MSG_CODE_PHY_RAW_WRITE,
 	ECORE_PHY_CORE_READ = DRV_MSG_CODE_PHY_CORE_READ,
 	ECORE_PHY_CORE_WRITE = DRV_MSG_CODE_PHY_CORE_WRITE,
+	ECORE_ENCRYPT_PASSWORD = DRV_MSG_CODE_ENCRYPT_PASSWORD,
 	ECORE_GET_MCP_NVM_RESP = 0xFFFFFF00
 };
 
-#ifndef LINUX_REMOVE
-#if !defined(CONFIG_ECORE_L2)
+#if !defined(CONFIG_ECORE_L2) && !defined(CONFIG_ECORE_ROCE) && \
+	!defined(CONFIG_ECORE_FCOE) && !defined(CONFIG_ECORE_ISCSI) && \
+	!defined(CONFIG_ECORE_IWARP) && !defined(CONFIG_ECORE_OOO)
 #define CONFIG_ECORE_L2
 #define CONFIG_ECORE_SRIOV
-#endif
+#define CONFIG_ECORE_ROCE
+#define CONFIG_ECORE_IWARP
+#define CONFIG_ECORE_FCOE
+#define CONFIG_ECORE_ISCSI
+#define CONFIG_ECORE_LL2
+#define CONFIG_ECORE_OOO
 #endif
 
 /* helpers */
-#ifndef __EXTRACT__LINUX__
+#ifndef __EXTRACT__LINUX__IF__
 #define MASK_FIELD(_name, _value)					\
 		((_value) &= (_name##_MASK))
 
@@ -103,14 +127,16 @@ do {									\
 #define GET_FIELD(value, name)						\
 	(((value) >> (name##_SHIFT)) & name##_MASK)
 
-#define GET_MFW_FIELD(name, field)				\
+#define GET_MFW_FIELD(name, field)					\
 	(((name) & (field ## _MASK)) >> (field ## _OFFSET))
 
 #define SET_MFW_FIELD(name, field, value)				\
 do {									\
-	(name) &= ~((field ## _MASK));		\
+	(name) &= ~(field ## _MASK);					\
 	(name) |= (((value) << (field ## _OFFSET)) & (field ## _MASK));	\
 } while (0)
+
+#define DB_ADDR_SHIFT(addr)             ((addr) << DB_PWM_ADDR_OFFSET_SHIFT)
 #endif
 
 static OSAL_INLINE u32 DB_ADDR(u32 cid, u32 DEMS)
@@ -121,7 +147,7 @@ static OSAL_INLINE u32 DB_ADDR(u32 cid, u32 DEMS)
 	return db_addr;
 }
 
-static OSAL_INLINE u32 DB_ADDR_VF(u32 cid, u32 DEMS)
+static OSAL_INLINE u32 DB_ADDR_VF_E4(u32 cid, u32 DEMS)
 {
 	u32 db_addr = FIELD_VALUE(DB_LEGACY_ADDR_DEMS, DEMS) |
 		      FIELD_VALUE(DB_LEGACY_ADDR_ICID, cid);
@@ -129,6 +155,17 @@ static OSAL_INLINE u32 DB_ADDR_VF(u32 cid, u32 DEMS)
 	return db_addr;
 }
 
+static OSAL_INLINE u32 DB_ADDR_VF_E5(u32 cid, u32 DEMS)
+{
+	u32 db_addr = FIELD_VALUE(DB_LEGACY_ADDR_DEMS, DEMS) |
+		      (cid * ECORE_VF_DEMS_SIZE);
+
+	return db_addr;
+}
+
+#define DB_ADDR_VF(dev, cid, DEMS) \
+	(ECORE_IS_E4(dev) ? DB_ADDR_VF_E4(cid, DEMS) : DB_ADDR_VF_E5(cid, DEMS))
+
 #define ALIGNED_TYPE_SIZE(type_name, p_hwfn)				  \
 	((sizeof(type_name) + (u32)(1 << (p_hwfn->p_dev->cache_shift)) - 1) & \
 	 ~((1 << (p_hwfn->p_dev->cache_shift)) - 1))
@@ -143,7 +180,84 @@ static OSAL_INLINE u32 DB_ADDR_VF(u32 cid, u32 DEMS)
 #endif
 #endif
 
-#ifndef __EXTRACT__LINUX__
+#ifndef __EXTRACT__LINUX__IF__
+#define ECORE_INT_DEBUG_SIZE_DEF     _MB(2)
+struct ecore_internal_trace {
+	char *buf;
+	u32 size;
+	u64 prod;
+	osal_spinlock_t lock;
+};
+
+#define ECORE_DP_INT_LOG_MAX_STR_SIZE 256
+#define ECORE_DP_INT_LOG_DEFAULT_MASK (0xffffc3ff)
+
+#ifndef UEFI
+/* Debug print definitions */
+#define DP_INT_LOG(P_DEV, LEVEL, MODULE, fmt, ...)		\
+do {								\
+	if (OSAL_UNLIKELY((P_DEV)->dp_int_level > (LEVEL)))	\
+		break;						\
+	if (OSAL_UNLIKELY((P_DEV)->dp_int_level == ECORE_LEVEL_VERBOSE) && \
+	    ((LEVEL) == ECORE_LEVEL_VERBOSE) &&			\
+	    ((P_DEV)->dp_int_module & (MODULE)) == 0)		\
+		break;						\
+								\
+	OSAL_INT_DBG_STORE(P_DEV, fmt,				\
+				__func__, __LINE__,		\
+				(P_DEV)->name ? (P_DEV)->name : "",	\
+				##__VA_ARGS__);		\
+} while (0)
+
+#define DP_ERR(P_DEV, fmt, ...)				\
+do {							\
+	DP_INT_LOG((P_DEV), ECORE_LEVEL_ERR, 0,		\
+		"ERR: [%s:%d(%s)]" fmt, ##__VA_ARGS__);	\
+	PRINT_ERR((P_DEV)->dp_ctx, "[%s:%d(%s)]" fmt,	\
+		  __func__, __LINE__,			\
+		  (P_DEV)->name ? (P_DEV)->name : "",	\
+		  ##__VA_ARGS__);			\
+} while (0)
+
+#define DP_NOTICE(P_DEV, is_assert, fmt, ...)				\
+do {									\
+	DP_INT_LOG((P_DEV), ECORE_LEVEL_NOTICE,	0,			\
+		 "NOTICE: [%s:%d(%s)]" fmt, ##__VA_ARGS__);		\
+	if (OSAL_UNLIKELY((P_DEV)->dp_level <= ECORE_LEVEL_NOTICE)) {	\
+		PRINT((P_DEV)->dp_ctx, "[%s:%d(%s)]" fmt,		\
+		      __func__, __LINE__,				\
+		      (P_DEV)->name ? (P_DEV)->name : "",		\
+		      ##__VA_ARGS__);					\
+		OSAL_ASSERT(!(is_assert));				\
+	}								\
+} while (0)
+
+#define DP_INFO(P_DEV, fmt, ...)				      \
+do {								      \
+	DP_INT_LOG((P_DEV), ECORE_LEVEL_INFO, 0,		      \
+		"INFO: [%s:%d(%s)]" fmt, ##__VA_ARGS__);	      \
+	if (OSAL_UNLIKELY((P_DEV)->dp_level <= ECORE_LEVEL_INFO)) {   \
+		PRINT((P_DEV)->dp_ctx, "[%s:%d(%s)]" fmt,	      \
+		      __func__, __LINE__,			      \
+		      (P_DEV)->name ? (P_DEV)->name : "",	      \
+		      ##__VA_ARGS__);				      \
+	}							      \
+} while (0)
+
+#define DP_VERBOSE(P_DEV, module, fmt, ...)				\
+do {									\
+	DP_INT_LOG((P_DEV), ECORE_LEVEL_VERBOSE, module,		\
+		"VERBOSE: [%s:%d(%s)]" fmt, ##__VA_ARGS__);		\
+	if (OSAL_UNLIKELY(((P_DEV)->dp_level <= ECORE_LEVEL_VERBOSE) &&	\
+	    ((P_DEV)->dp_module & module))) {				\
+		PRINT((P_DEV)->dp_ctx, "[%s:%d(%s)]" fmt,		\
+		      __func__, __LINE__,				\
+		      (P_DEV)->name ? (P_DEV)->name : "",		\
+		      ##__VA_ARGS__);					\
+	}								\
+} while (0)
+#endif
+
 enum DP_LEVEL {
 	ECORE_LEVEL_VERBOSE	= 0x0,
 	ECORE_LEVEL_INFO	= 0x1,
@@ -181,6 +295,7 @@ enum DP_MODULE {
 	ECORE_MSG_SP		= 0x100000,
 	ECORE_MSG_STORAGE	= 0x200000,
 	ECORE_MSG_OOO		= 0x200000,
+	ECORE_MSG_FS		= 0x400000,
 	ECORE_MSG_CXT		= 0x800000,
 	ECORE_MSG_LL2		= 0x1000000,
 	ECORE_MSG_ILT		= 0x2000000,
@@ -188,13 +303,49 @@ enum DP_MODULE {
 	ECORE_MSG_DEBUG		= 0x8000000,
 	/* to be added...up to 0x8000000 */
 };
+
+/**
+ * @brief Convert from 32b debug param to two params of level and module
+
+ * @param debug
+ * @param p_dp_module
+ * @param p_dp_level
+ * @return void
+ *
+ * @note Input 32b decoding:
+ *	 b31 - enable all NOTICE prints. NOTICE prints are for deviation from
+ *	 the 'happy' flow, e.g. memory allocation failed.
+ *	 b30 - enable all INFO prints. INFO prints are for major steps in the
+ *	 flow and provide important parameters.
+ *	 b29-b0 - per-module bitmap, where each bit enables VERBOSE prints of
+ *	 that module. VERBOSE prints are for tracking the specific flow in low
+ *	 level.
+ *
+ *	 Notice that the level should be that of the lowest required logs.
+ */
+static OSAL_INLINE void ecore_config_debug(u32 debug, u32 *p_dp_module,
+					   u8 *p_dp_level)
+{
+	*p_dp_level = ECORE_LEVEL_NOTICE;
+	*p_dp_module = 0;
+
+	if (debug & ECORE_LOG_VERBOSE_MASK) {
+		*p_dp_level = ECORE_LEVEL_VERBOSE;
+		*p_dp_module = (debug & 0x3FFFFFFF);
+	} else if (debug & ECORE_LOG_INFO_MASK) {
+		*p_dp_level = ECORE_LEVEL_INFO;
+	} else if (debug & ECORE_LOG_NOTICE_MASK) {
+		*p_dp_level = ECORE_LEVEL_NOTICE;
+	}
+}
+
 #endif
 
 #define for_each_hwfn(p_dev, i)	for (i = 0; i < p_dev->num_hwfns; i++)
 
 #define D_TRINE(val, cond1, cond2, true1, true2, def) \
-	(val == (cond1) ? true1 : \
-	 (val == (cond2) ? true2 : def))
+	((val) == (cond1) ? (true1) : \
+	 ((val) == (cond2) ? (true2) : (def)))
 
 /* forward */
 struct ecore_ptt_pool;
@@ -210,6 +361,8 @@ struct ecore_igu_info;
 struct ecore_mcp_info;
 struct ecore_dcbx_info;
 struct ecore_llh_info;
+struct ecore_fs_info_e4;
+struct ecore_fs_info_e5;
 
 struct ecore_rt_data {
 	u32	*init_val;
@@ -233,6 +386,13 @@ enum ecore_tunn_clss {
 	MAX_ECORE_TUNN_CLSS,
 };
 
+#ifndef __EXTRACT__LINUX__IF__
+enum ecore_tcp_ip_version {
+	ECORE_TCP_IPV4,
+	ECORE_TCP_IPV6,
+};
+#endif
+
 struct ecore_tunn_update_type {
 	bool b_update_mode;
 	bool b_mode_enabled;
@@ -256,6 +416,9 @@ struct ecore_tunnel_info {
 
 	bool b_update_rx_cls;
 	bool b_update_tx_cls;
+
+	bool update_non_l2_vxlan;
+	bool non_l2_vxlan_enable;
 };
 
 /* The PCI personality is not quite synonymous to protocol ID:
@@ -279,6 +442,15 @@ struct ecore_qm_iids {
 	u32 tids;
 };
 
+/* The PCI relax ordering is either taken care by management FW or can be
+ * enable/disable by ecore client.
+ */
+enum ecore_pci_rlx_odr {
+	ECORE_DEFAULT_RLX_ODR,
+	ECORE_ENABLE_RLX_ODR,
+	ECORE_DISABLE_RLX_ODR
+};
+
 #define MAX_PF_PER_PORT 8
 
 /* HW / FW resources, output of features supported below, most information
@@ -292,12 +464,16 @@ enum ecore_resources {
 	ECORE_RL,
 	ECORE_MAC,
 	ECORE_VLAN,
+	ECORE_VF_RDMA_CNQ_RAM,
 	ECORE_RDMA_CNQ_RAM,
 	ECORE_ILT,
-	ECORE_LL2_QUEUE,
+	ECORE_LL2_RAM_QUEUE,
+	ECORE_LL2_CTX_QUEUE,
 	ECORE_CMDQS_CQS,
 	ECORE_RDMA_STATS_QUEUE,
 	ECORE_BDQ,
+	ECORE_VF_MAC_ADDR,
+	ECORE_GFS_PROFILE,
 
 	/* This is needed only internally for matching against the IGU.
 	 * In case of legacy MFW, would be set to `0'.
@@ -317,6 +493,7 @@ enum ecore_feature {
 	ECORE_EXTRA_VF_QUE,
 	ECORE_VMQ,
 	ECORE_RDMA_CNQ,
+	ECORE_VF_RDMA_CNQ,
 	ECORE_ISCSI_CQ,
 	ECORE_FCOE_CQ,
 	ECORE_VF_L2_QUE,
@@ -335,6 +512,11 @@ enum ecore_port_mode {
 	ECORE_PORT_MODE_DE_1X25G,
 	ECORE_PORT_MODE_DE_4X25G,
 	ECORE_PORT_MODE_DE_2X10G,
+	ECORE_PORT_MODE_DE_2X50G_R1,
+	ECORE_PORT_MODE_DE_4X50G_R1,
+	ECORE_PORT_MODE_DE_1X100G_R2,
+	ECORE_PORT_MODE_DE_2X100G_R2,
+	ECORE_PORT_MODE_DE_1X100G_R4,
 };
 
 enum ecore_dev_cap {
@@ -345,7 +527,7 @@ enum ecore_dev_cap {
 	ECORE_DEV_CAP_IWARP
 };
 
-#ifndef __EXTRACT__LINUX__
+#ifndef __EXTRACT__LINUX__IF__
 enum ecore_hw_err_type {
 	ECORE_HW_ERR_FAN_FAIL,
 	ECORE_HW_ERR_MFW_RESP_FAIL,
@@ -356,10 +538,9 @@ enum ecore_hw_err_type {
 };
 #endif
 
-enum ecore_db_rec_exec {
-	DB_REC_DRY_RUN,
-	DB_REC_REAL_DEAL,
-	DB_REC_ONCE,
+enum ecore_wol_support {
+	ECORE_WOL_SUPPORT_NONE,
+	ECORE_WOL_SUPPORT_PME,
 };
 
 struct ecore_hw_info {
@@ -382,7 +563,9 @@ struct ecore_hw_info {
 	((dev)->hw_info.personality == ECORE_PCI_FCOE)
 #define ECORE_IS_ISCSI_PERSONALITY(dev) \
 	((dev)->hw_info.personality == ECORE_PCI_ISCSI)
-
+#define ECORE_IS_NVMETCP_PERSONALITY(dev) \
+	((dev)->hw_info.personality == ECORE_PCI_ISCSI && \
+	 (dev)->is_nvmetcp)
 	/* Resource Allocation scheme results */
 	u32 resc_start[ECORE_MAX_RESC];
 	u32 resc_num[ECORE_MAX_RESC];
@@ -397,23 +580,22 @@ struct ecore_hw_info {
 	/* Amount of traffic classes HW supports */
 	u8 num_hw_tc;
 
-/* Amount of TCs which should be active according to DCBx or upper layer driver
- * configuration
- */
-
+/* Amount of TCs which should be active according to DCBx or upper layer driver configuration */
 	u8 num_active_tc;
 
 	/* The traffic class used by PF for it's offloaded protocol */
 	u8 offload_tc;
+	bool offload_tc_set;
+
+	bool multi_tc_roce_en;
+#define IS_ECORE_MULTI_TC_ROCE(p_hwfn) (!!((p_hwfn)->hw_info.multi_tc_roce_en))
 
 	u32 concrete_fid;
 	u16 opaque_fid;
 	u16 ovlan;
 	u32 part_num[4];
 
-	unsigned char hw_mac_addr[ETH_ALEN];
-	u64 node_wwn; /* For FCoE only */
-	u64 port_wwn; /* For FCoE only */
+	unsigned char hw_mac_addr[ECORE_ETH_ALEN];
 
 	u16 num_iscsi_conns;
 	u16 num_fcoe_conns;
@@ -424,12 +606,16 @@ struct ecore_hw_info {
 
 	u32 port_mode;
 	u32 hw_mode;
-	u32 device_capabilities;
+	u32 device_capabilities; /* @DPDK */
 
+#ifndef __EXTRACT__LINUX__THROW__
 	/* Default DCBX mode */
 	u8 dcbx_mode;
+#endif
 
 	u16 mtu;
+
+	enum ecore_wol_support		b_wol_support;
 };
 
 /* maximun size of read/write commands (HW limit) */
@@ -470,38 +656,71 @@ struct ecore_wfq_data {
 
 #define OFLD_GRP_SIZE 4
 
+struct ecore_offload_pq {
+	u8 port;
+	u8 tc;
+};
+
 struct ecore_qm_info {
 	struct init_qm_pq_params    *qm_pq_params;
 	struct init_qm_vport_params *qm_vport_params;
 	struct init_qm_port_params  *qm_port_params;
 	u16			start_pq;
-	u8			start_vport;
+	u16			start_vport;
+	u16			start_rl;
 	u16			pure_lb_pq;
-	u16			offload_pq;
+	u16			first_ofld_pq;
+	u16			first_llt_pq;
 	u16			pure_ack_pq;
 	u16			ooo_pq;
+	u16			single_vf_rdma_pq;
 	u16			first_vf_pq;
 	u16			first_mcos_pq;
 	u16			first_rl_pq;
+	u16			first_ofld_grp_pq;
 	u16			num_pqs;
 	u16			num_vf_pqs;
+	u16			ilt_pf_pqs;
 	u8			num_vports;
+	u8			num_rls;
 	u8			max_phys_tcs_per_port;
 	u8			ooo_tc;
+	bool			pq_overflow;
 	bool			pf_rl_en;
 	bool			pf_wfq_en;
 	bool			vport_rl_en;
 	bool			vport_wfq_en;
+	bool			vf_rdma_en;
+#define IS_ECORE_QM_VF_RDMA(_p_hwfn) ((_p_hwfn)->qm_info.vf_rdma_en)
 	u8			pf_wfq;
 	u32			pf_rl;
 	struct ecore_wfq_data	*wfq_data;
 	u8			num_pf_rls;
+	struct ecore_offload_pq offload_group[OFLD_GRP_SIZE];
+	u8			offload_group_count;
+#define IS_ECORE_OFLD_GRP(p_hwfn) ((p_hwfn)->qm_info.offload_group_count > 0)
+
+	/* Locks PQ getters against QM info initialization */
+	osal_spinlock_t		qm_info_lock;
 };
 
+#define ECORE_OVERFLOW_BIT	1
+
 struct ecore_db_recovery_info {
-	osal_list_t list;
-	osal_spinlock_t lock;
-	u32 db_recovery_counter;
+	osal_list_t	list;
+	osal_spinlock_t	lock;
+	u32		count;
+
+	/* PF doorbell overflow sticky indicator was cleared in the DORQ
+	 * attention callback, but still needs to execute doorbell recovery.
+	 * Full (REAL_DEAL) dorbell recovery is executed in the periodic
+	 * handler.
+	 * This value doesn't require a lock but must use atomic operations.
+	 */
+	u32		overflow; /* @DPDK*/
+
+	/* Indicates that DORQ attention was handled in ecore_int_deassertion */
+	bool		dorq_attn;
 };
 
 struct storm_stats {
@@ -553,18 +772,32 @@ enum ecore_mf_mode_bit {
 	/* Use stag for steering */
 	ECORE_MF_8021AD_TAGGING,
 
+	/* Allow DSCP to TC mapping */
+	ECORE_MF_DSCP_TO_TC_MAP,
+
 	/* Allow FIP discovery fallback */
 	ECORE_MF_FIP_SPECIAL,
+
+	/* Do not insert a vlan tag with id 0 */
+	ECORE_MF_DONT_ADD_VLAN0_TAG,
+
+	/* Allow VF RDMA */
+	ECORE_MF_VF_RDMA,
+
+	/* Allow RoCE LAG */
+	ECORE_MF_ROCE_LAG,
 };
 
 enum ecore_ufp_mode {
 	ECORE_UFP_MODE_ETS,
 	ECORE_UFP_MODE_VNIC_BW,
+	ECORE_UFP_MODE_UNKNOWN
 };
 
 enum ecore_ufp_pri_type {
 	ECORE_UFP_PRI_OS,
-	ECORE_UFP_PRI_VNIC
+	ECORE_UFP_PRI_VNIC,
+	ECORE_UFP_PRI_UNKNOWN
 };
 
 struct ecore_ufp_info {
@@ -578,16 +811,85 @@ enum BAR_ID {
 	BAR_ID_1	/* Used for doorbells */
 };
 
+#ifndef __EXTRACT__LINUX__IF__
+enum ecore_lag_type {
+	ECORE_LAG_TYPE_NONE,
+	ECORE_LAG_TYPE_ACTIVEACTIVE,
+	ECORE_LAG_TYPE_ACTIVEBACKUP
+};
+#endif
+
 struct ecore_nvm_image_info {
 	u32				num_images;
 	struct bist_nvm_image_att	*image_att;
 	bool				valid;
 };
 
+#define LAG_MAX_PORT_NUM	2
+
+struct ecore_lag_info {
+	enum ecore_lag_type	lag_type;
+	void			(*link_change_cb)(void *cxt);
+	void			*cxt;
+	u8			port_num;
+	u32			active_ports; /* @DPDK */
+	u8			first_port;
+	u8			second_port;
+	bool			is_master;
+	u8			master_pf;
+};
+
+/* PWM region specific data */
+struct ecore_dpi_info {
+	u16			wid_count;
+	u32			dpi_size;
+	u32			dpi_count;
+	u32			dpi_start_offset; /* this is used to calculate
+						   * the doorbell address
+						   */
+	u32			dpi_bit_shift_addr;
+};
+
+struct ecore_common_dpm_info {
+	u8			db_bar_no_edpm;
+	u8			mfw_no_edpm;
+	bool			vf_cfg;
+};
+
+enum ecore_hsi_def_type {
+	ECORE_HSI_DEF_MAX_NUM_VFS,
+	ECORE_HSI_DEF_MAX_NUM_L2_QUEUES,
+	ECORE_HSI_DEF_MAX_NUM_PORTS,
+	ECORE_HSI_DEF_MAX_SB_PER_PATH,
+	ECORE_HSI_DEF_MAX_NUM_PFS,
+	ECORE_HSI_DEF_MAX_NUM_VPORTS,
+	ECORE_HSI_DEF_NUM_ETH_RSS_ENGINE,
+	ECORE_HSI_DEF_MAX_QM_TX_QUEUES,
+	ECORE_HSI_DEF_NUM_PXP_ILT_RECORDS,
+	ECORE_HSI_DEF_NUM_RDMA_STATISTIC_COUNTERS,
+	ECORE_HSI_DEF_MAX_QM_GLOBAL_RLS,
+	ECORE_HSI_DEF_MAX_PBF_CMD_LINES,
+	ECORE_HSI_DEF_MAX_BTB_BLOCKS,
+	ECORE_NUM_HSI_DEFS
+};
+
+enum ecore_rx_config_flags {
+	ECORE_RX_CONF_SKIP_ACCEPT_FLAGS_UPDATE,
+	ECORE_RX_CONF_SKIP_UCAST_FILTER_UPDATE,
+	ECORE_RX_CONF_SET_LB_VPORT
+};
+
+struct ecore_rx_config {
+	u32			flags; /* @DPDK */
+	u8			loopback_dst_vport_id;
+};
+
 struct ecore_hwfn {
 	struct ecore_dev		*p_dev;
 	u8				my_id;		/* ID inside the PF */
-#define IS_LEAD_HWFN(edev)		(!((edev)->my_id))
+#define IS_LEAD_HWFN(_p_hwfn)		(!((_p_hwfn)->my_id))
+#define IS_AFFIN_HWFN(_p_hwfn) \
+	((_p_hwfn) == ECORE_AFFIN_HWFN((_p_hwfn)->p_dev))
 	u8				rel_pf_id;	/* Relative to engine*/
 	u8				abs_pf_id;
 #define ECORE_PATH_ID(_p_hwfn) \
@@ -597,10 +899,11 @@ struct ecore_hwfn {
 
 	u32				dp_module;
 	u8				dp_level;
+	u32				dp_int_module;
+	u8				dp_int_level;
 	char				name[NAME_SIZE];
 	void				*dp_ctx;
 
-	bool				first_on_engine;
 	bool				hw_init_done;
 
 	u8				num_funcs_on_engine;
@@ -612,6 +915,8 @@ struct ecore_hwfn {
 	void OSAL_IOMEM			*doorbells;
 	u64				db_phys_addr;
 	unsigned long			db_size;
+	u64				reg_offset;
+	u64				db_offset;
 
 	/* PTT pool */
 	struct ecore_ptt_pool		*p_ptt_pool;
@@ -638,6 +943,11 @@ struct ecore_hwfn {
 	struct ecore_ptt		*p_main_ptt;
 	struct ecore_ptt		*p_dpc_ptt;
 
+	/* PTP will be used only by the leading function.
+	 * Usage of all PTP-apis should be synchronized as result.
+	 */
+	struct ecore_ptt		*p_ptp_ptt;
+
 	struct ecore_sb_sp_info		*p_sp_sb;
 	struct ecore_sb_attn_info	*p_sb_attn;
 
@@ -649,6 +959,7 @@ struct ecore_hwfn {
 	struct ecore_fcoe_info		*p_fcoe_info;
 	struct ecore_rdma_info		*p_rdma_info;
 	struct ecore_pf_params		pf_params;
+	bool				is_nvmetcp;
 
 	bool				b_rdma_enabled_in_prs;
 	u32				rdma_prs_search_reg;
@@ -673,8 +984,8 @@ struct ecore_hwfn {
 	/* QM init */
 	struct ecore_qm_info		qm_info;
 
-#ifdef CONFIG_ECORE_ZIPPED_FW
 	/* Buffer for unzipping firmware data */
+#ifdef CONFIG_ECORE_ZIPPED_FW
 	void *unzip_buf;
 #endif
 
@@ -682,19 +993,12 @@ struct ecore_hwfn {
 	void				*dbg_user_info;
 	struct virt_mem_desc		dbg_arrays[MAX_BIN_DBG_BUFFER_TYPE];
 
-	struct z_stream_s		*stream;
-
-	/* PWM region specific data */
-	u32				dpi_size;
-	u32				dpi_count;
-	u32				dpi_start_offset; /* this is used to
-							   * calculate th
-							   * doorbell address
-							   */
+	struct ecore_dpi_info		dpi_info;
 
-	/* If one of the following is set then EDPM shouldn't be used */
+	struct ecore_common_dpm_info	dpm_info;
+	u8				roce_edpm_mode;
 	u8				dcbx_no_edpm;
-	u8				db_bar_no_edpm;
+	u8				num_vf_cnqs;
 
 	/* L2-related */
 	struct ecore_l2_info		*p_l2_info;
@@ -708,11 +1012,26 @@ struct ecore_hwfn {
 	 * struct ecore_hw_prepare_params by ecore client.
 	 */
 	bool b_en_pacing;
+	struct ecore_lag_info		lag_info;
 
 	/* Nvm images number and attributes */
-	struct ecore_nvm_image_info     nvm_info;
+	struct ecore_nvm_image_info	nvm_info;
+
+	/* Flow steering info */
+	union {
+		struct ecore_fs_info_e4	*e4;
+		struct ecore_fs_info_e5	*e5;
+		void			*info;
+	} fs_info;
 
-	struct phys_mem_desc            *fw_overlay_mem;
+	/* Flow steering statistics accuracy */
+	u8				fs_accuracy;
+
+	struct phys_mem_desc		*fw_overlay_mem;
+	enum _ecore_status_t		(*p_dummy_cb)
+					(struct ecore_hwfn *p_hwfn, void *cookie);
+	/* Rx configuration */
+	struct ecore_rx_config		rx_conf;
 
 	/* @DPDK */
 	struct ecore_ptt		*p_arfs_ptt;
@@ -722,18 +1041,22 @@ struct ecore_hwfn {
 	u32 iov_task_flags;
 };
 
+#ifndef __EXTRACT__LINUX__THROW__
 enum ecore_mf_mode {
 	ECORE_MF_DEFAULT,
 	ECORE_MF_OVLAN,
 	ECORE_MF_NPAR,
 	ECORE_MF_UFP,
 };
+#endif
 
+#ifndef __EXTRACT__LINUX__IF__
 enum ecore_dev_type {
 	ECORE_DEV_TYPE_BB,
 	ECORE_DEV_TYPE_AH,
 	ECORE_DEV_TYPE_E5,
 };
+#endif
 
 /* @DPDK */
 enum ecore_dbg_features {
@@ -765,7 +1088,12 @@ struct ecore_dev {
 	u8				dp_level;
 	char				name[NAME_SIZE];
 	void				*dp_ctx;
+	struct ecore_internal_trace	internal_trace;
+	u8				dp_int_level;
+	u32				dp_int_module;
 
+/* for work DP_* macros with cdev, hwfn, etc */
+	struct ecore_dev		*p_dev;
 	enum ecore_dev_type		type;
 /* Translate type/revision combo into the proper conditions */
 #define ECORE_IS_BB(dev)	((dev)->type == ECORE_DEV_TYPE_BB)
@@ -781,6 +1109,8 @@ struct ecore_dev {
 #define ECORE_IS_E4(dev)	(ECORE_IS_BB(dev) || ECORE_IS_AH(dev))
 #define ECORE_IS_E5(dev)	((dev)->type == ECORE_DEV_TYPE_E5)
 
+#define ECORE_E5_MISSING_CODE	OSAL_BUILD_BUG_ON(false)
+
 	u16 vendor_id;
 	u16 device_id;
 #define ECORE_DEV_ID_MASK	0xff00
@@ -829,21 +1159,18 @@ struct ecore_dev {
 #define CHIP_BOND_ID_MASK		0xff
 #define CHIP_BOND_ID_SHIFT		0
 
-	u8				num_engines;
 	u8				num_ports;
 	u8				num_ports_in_engine;
-	u8				num_funcs_in_port;
 
 	u8				path_id;
 
-	u32				mf_bits;
+	u32				mf_bits; /* @DPDK */
+#ifndef __EXTRACT__LINUX__THROW__
 	enum ecore_mf_mode		mf_mode;
-#define IS_MF_DEFAULT(_p_hwfn)	\
-	(((_p_hwfn)->p_dev)->mf_mode == ECORE_MF_DEFAULT)
-#define IS_MF_SI(_p_hwfn)	\
-	(((_p_hwfn)->p_dev)->mf_mode == ECORE_MF_NPAR)
-#define IS_MF_SD(_p_hwfn)	\
-	(((_p_hwfn)->p_dev)->mf_mode == ECORE_MF_OVLAN)
+#define IS_MF_DEFAULT(_p_hwfn)	(((_p_hwfn)->p_dev)->mf_mode == ECORE_MF_DEFAULT)
+#define IS_MF_SI(_p_hwfn)	(((_p_hwfn)->p_dev)->mf_mode == ECORE_MF_NPAR)
+#define IS_MF_SD(_p_hwfn)	(((_p_hwfn)->p_dev)->mf_mode == ECORE_MF_OVLAN)
+#endif
 
 	int				pcie_width;
 	int				pcie_speed;
@@ -852,7 +1179,9 @@ struct ecore_dev {
 	u8				mcp_rev;
 	u8				boot_mode;
 
-	u8				wol;
+	/* WoL related configurations */
+	u8				wol_config;
+	u8				wol_mac[ECORE_ETH_ALEN];
 
 	u32				int_mode;
 	enum ecore_coalescing_mode	int_coalescing_mode;
@@ -907,6 +1236,7 @@ struct ecore_dev {
 	u32				rdma_max_sge;
 	u32				rdma_max_inline;
 	u32				rdma_max_srq_sge;
+	u8				ilt_page_size;
 
 	struct ecore_eth_stats		*reset_stats;
 	struct ecore_fw_data		*fw_data;
@@ -916,8 +1246,7 @@ struct ecore_dev {
 	/* Recovery */
 	bool				recov_in_prog;
 
-/* Indicates whether should prevent attentions from being reasserted */
-
+	/* Indicates whether should prevent attentions from being reasserted */
 	bool				attn_clr_en;
 
 	/* Indicates whether allowing the MFW to collect a crash dump */
@@ -926,6 +1255,9 @@ struct ecore_dev {
 	/* Indicates if the reg_fifo is checked after any register access */
 	bool				chk_reg_fifo;
 
+	/* Indicates the monitored address by ecore_rd()/ecore_wr() */
+	u32				monitored_hw_addr;
+
 #ifndef ASIC_ONLY
 	bool				b_is_emul_full;
 	bool				b_is_emul_mac;
@@ -937,6 +1269,9 @@ struct ecore_dev {
 	/* Indicates whether this PF serves a storage target */
 	bool				b_is_target;
 
+	/* Instruct driver to read statistics from the specified bin id */
+	u16				stats_bin_id;
+
 #ifdef CONFIG_ECORE_BINARY_FW /* @DPDK */
 	void				*firmware;
 	u64				fw_len;
@@ -952,23 +1287,6 @@ struct ecore_dev {
 	struct rte_pci_device		*pci_dev;
 };
 
-enum ecore_hsi_def_type {
-	ECORE_HSI_DEF_MAX_NUM_VFS,
-	ECORE_HSI_DEF_MAX_NUM_L2_QUEUES,
-	ECORE_HSI_DEF_MAX_NUM_PORTS,
-	ECORE_HSI_DEF_MAX_SB_PER_PATH,
-	ECORE_HSI_DEF_MAX_NUM_PFS,
-	ECORE_HSI_DEF_MAX_NUM_VPORTS,
-	ECORE_HSI_DEF_NUM_ETH_RSS_ENGINE,
-	ECORE_HSI_DEF_MAX_QM_TX_QUEUES,
-	ECORE_HSI_DEF_NUM_PXP_ILT_RECORDS,
-	ECORE_HSI_DEF_NUM_RDMA_STATISTIC_COUNTERS,
-	ECORE_HSI_DEF_MAX_QM_GLOBAL_RLS,
-	ECORE_HSI_DEF_MAX_PBF_CMD_LINES,
-	ECORE_HSI_DEF_MAX_BTB_BLOCKS,
-	ECORE_NUM_HSI_DEFS
-};
-
 u32 ecore_get_hsi_def_val(struct ecore_dev *p_dev,
 			  enum ecore_hsi_def_type type);
 
@@ -1039,6 +1357,11 @@ int ecore_device_num_ports(struct ecore_dev *p_dev);
 void ecore_set_fw_mac_addr(__le16 *fw_msb, __le16 *fw_mid, __le16 *fw_lsb,
 			   u8 *mac);
 
+#define ECORE_TOS_ECN_SHIFT	0
+#define ECORE_TOS_ECN_MASK	0x3
+#define ECORE_TOS_DSCP_SHIFT	2
+#define ECORE_TOS_DSCP_MASK	0x3f
+
 /* Flags for indication of required queues */
 #define PQ_FLAGS_RLS	(1 << 0)
 #define PQ_FLAGS_MCOS	(1 << 1)
@@ -1046,26 +1369,50 @@ void ecore_set_fw_mac_addr(__le16 *fw_msb, __le16 *fw_mid, __le16 *fw_lsb,
 #define PQ_FLAGS_OOO	(1 << 3)
 #define PQ_FLAGS_ACK	(1 << 4)
 #define PQ_FLAGS_OFLD	(1 << 5)
-#define PQ_FLAGS_VFS	(1 << 6)
-#define PQ_FLAGS_LLT	(1 << 7)
+#define PQ_FLAGS_GRP	(1 << 6)
+#define PQ_FLAGS_VFS	(1 << 7)
+#define PQ_FLAGS_LLT	(1 << 8)
+#define PQ_FLAGS_MTC	(1 << 9)
+#define PQ_FLAGS_VFR	(1 << 10)
+#define PQ_FLAGS_VSR	(1 << 11)
 
 /* physical queue index for cm context intialization */
 u16 ecore_get_cm_pq_idx(struct ecore_hwfn *p_hwfn, u32 pq_flags);
 u16 ecore_get_cm_pq_idx_mcos(struct ecore_hwfn *p_hwfn, u8 tc);
 u16 ecore_get_cm_pq_idx_vf(struct ecore_hwfn *p_hwfn, u16 vf);
+u16 ecore_get_cm_pq_idx_vf_rdma(struct ecore_hwfn *p_hwfn, u16 vf);
+
 u16 ecore_get_cm_pq_idx_rl(struct ecore_hwfn *p_hwfn, u16 rl);
+u16 ecore_get_cm_pq_idx_grp(struct ecore_hwfn *p_hwfn, u8 idx);
+u16 ecore_get_cm_pq_idx_ofld_mtc(struct ecore_hwfn *p_hwfn, u16 idx, u8 tc);
+u16 ecore_get_cm_pq_idx_llt_mtc(struct ecore_hwfn *p_hwfn, u16 idx, u8 tc);
+u16 ecore_get_cm_pq_idx_ll2(struct ecore_hwfn *p_hwfn, u8 tc);
 
-/* qm vport for rate limit configuration */
-u16 ecore_get_qm_vport_idx_rl(struct ecore_hwfn *p_hwfn, u16 rl);
+/* qm vport/rl for rate limit configuration */
+u16 ecore_get_pq_vport_id_from_rl(struct ecore_hwfn *p_hwfn, u16 rl);
+u16 ecore_get_pq_vport_id_from_vf(struct ecore_hwfn *p_hwfn, u16 vf);
+u16 ecore_get_pq_rl_id_from_rl(struct ecore_hwfn *p_hwfn, u16 rl);
+u16 ecore_get_pq_rl_id_from_vf(struct ecore_hwfn *p_hwfn, u16 vf);
 
 const char *ecore_hw_get_resc_name(enum ecore_resources res_id);
 
 /* doorbell recovery mechanism */
 void ecore_db_recovery_dp(struct ecore_hwfn *p_hwfn);
-void ecore_db_recovery_execute(struct ecore_hwfn *p_hwfn,
-			       enum ecore_db_rec_exec);
-
-bool ecore_edpm_enabled(struct ecore_hwfn *p_hwfn);
+void ecore_db_recovery_execute(struct ecore_hwfn *p_hwfn);
+enum _ecore_status_t
+ecore_db_rec_flush_queue(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
+			 u32 usage_cnt_reg, u32 *count);
+#define ECORE_DB_REC_COUNT	1000
+#define ECORE_DB_REC_INTERVAL	100
+
+bool ecore_edpm_enabled(struct ecore_hwfn *p_hwfn,
+			struct ecore_common_dpm_info *dpm_info);
+
+enum _ecore_status_t ecore_hw_init_dpi_size(struct ecore_hwfn *p_hwfn,
+					    struct ecore_ptt *p_ptt,
+					    struct ecore_dpi_info *dpi_info,
+					    u32 pwm_region_size,
+					    u32 n_cpus);
 
 /* amount of resources used in qm init */
 u8 ecore_init_qm_get_num_tcs(struct ecore_hwfn *p_hwfn);
@@ -1074,9 +1421,18 @@ u16 ecore_init_qm_get_num_pf_rls(struct ecore_hwfn *p_hwfn);
 u16 ecore_init_qm_get_num_vports(struct ecore_hwfn *p_hwfn);
 u16 ecore_init_qm_get_num_pqs(struct ecore_hwfn *p_hwfn);
 
+void ecore_hw_info_set_offload_tc(struct ecore_hw_info *p_info, u8 tc);
+u8 ecore_get_offload_tc(struct ecore_hwfn *p_hwfn);
+
 #define MFW_PORT(_p_hwfn)	((_p_hwfn)->abs_pf_id % \
 				 ecore_device_num_ports((_p_hwfn)->p_dev))
 
+enum _ecore_status_t ecore_abs_ppfid(struct ecore_dev *p_dev, u8 rel_ppfid,
+				     u8 *p_abs_ppfid);
+enum _ecore_status_t ecore_llh_map_ppfid_to_pfid(struct ecore_hwfn *p_hwfn,
+						 struct ecore_ptt *p_ptt,
+						 u8 ppfid, u8 pfid);
+
 /* The PFID<->PPFID calculation is based on the relative index of a PF on its
  * port. In BB there is a bug in the LLH in which the PPFID is actually engine
  * based, and thus it equals the PFID.
@@ -1110,6 +1466,12 @@ enum _ecore_status_t ecore_llh_dump_all(struct ecore_dev *p_dev);
 void ecore_set_platform_str(struct ecore_hwfn *p_hwfn,
 			    char *buf_str, u32 buf_size);
 
+#define LNX_STATIC
+#define IFDEF_HAS_IFLA_VF_RATE
+#define ENDIF_HAS_IFLA_VF_RATE
+#define IFDEF_DEFINE_IFLA_VF_SPOOFCHK
+#define ENDIF_DEFINE_IFLA_VF_SPOOFCHK
+
 #define TSTORM_QZONE_START	PXP_VF_BAR0_START_SDM_ZONE_A
 #define TSTORM_QZONE_SIZE(dev) \
 	(ECORE_IS_E4(dev) ? TSTORM_QZONE_SIZE_E4 : TSTORM_QZONE_SIZE_E5)
drivers/net/qede/base/ecore_attn_values.h +2 -1
index ec773fbdd..ff4fc5c38 100644
@@ -1,7 +1,8 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (c) 2016 - 2018 Cavium Inc.
+ * Copyright (c) 2018 - 2020 Marvell Semiconductor Inc.
  * All rights reserved.
- * www.cavium.com
+ * www.marvell.com
  */
 
 #ifndef __ATTN_VALUES_H__
drivers/net/qede/base/ecore_cxt.c +893 -291

1,922 lines not on this page · raw message

drivers/net/qede/base/ecore_cxt.h +93 -47

96 lines not on this page · raw message

drivers/net/qede/base/ecore_cxt_api.h +21 -10
index 6c8b2831c..fa85a0dc8 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/base/ecore_dcbx.c +389 -135

524 lines not on this page · raw message

drivers/net/qede/base/ecore_dcbx.h +12 -4
index 519e6ceaa..57c07c59f 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/base/ecore_dcbx_api.h +28 -13

41 lines not on this page · raw message

drivers/net/qede/base/ecore_dev.c +2884 -981

3,865 lines not on this page · raw message

drivers/net/qede/base/ecore_dev_api.h +303 -51

354 lines not on this page · raw message

drivers/net/qede/base/ecore_gtt_reg_addr.h +54 -39

93 lines not on this page · raw message

drivers/net/qede/base/ecore_gtt_values.h +2 -2
index 2035bed5c..6752178b6 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/base/ecore_hsi_common.h +1 -1
index 638178c30..80812d4ce 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/base/ecore_hw.c +221 -160

381 lines not on this page · raw message

drivers/net/qede/base/ecore_hw.h +42 -13

55 lines not on this page · raw message

drivers/net/qede/base/ecore_hw_defs.h +17 -28

45 lines not on this page · raw message

drivers/net/qede/base/ecore_init_fw_funcs.c +603 -621

1,224 lines not on this page · raw message

drivers/net/qede/base/ecore_init_fw_funcs.h +229 -228

457 lines not on this page · raw message

drivers/net/qede/base/ecore_init_ops.c +82 -61

143 lines not on this page · raw message

drivers/net/qede/base/ecore_init_ops.h +5 -14
index 0cbf293b3..fb305e531 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/base/ecore_int.c +778 -535

1,313 lines not on this page · raw message

drivers/net/qede/base/ecore_int.h +35 -25

60 lines not on this page · raw message

drivers/net/qede/base/ecore_int_api.h +65 -60

125 lines not on this page · raw message

drivers/net/qede/base/ecore_iov_api.h +85 -30

115 lines not on this page · raw message

drivers/net/qede/base/ecore_iro.h +229 -198

427 lines not on this page · raw message

drivers/net/qede/base/ecore_iro_values.h +286 -177

463 lines not on this page · raw message

drivers/net/qede/base/ecore_l2.c +315 -170

485 lines not on this page · raw message

drivers/net/qede/base/ecore_l2.h +16 -2
index 8fa403029..3e72f1539 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/base/ecore_l2_api.h +140 -8

148 lines not on this page · raw message

drivers/net/qede/base/ecore_mcp.c +2029 -581

2,610 lines not on this page · raw message

drivers/net/qede/base/ecore_mcp.h +108 -16

124 lines not on this page · raw message

drivers/net/qede/base/ecore_mcp_api.h +391 -76

467 lines not on this page · raw message

drivers/net/qede/base/ecore_mng_tlv.c +379 -531

910 lines not on this page · raw message

drivers/net/qede/base/ecore_proto_if.h +57 -12

69 lines not on this page · raw message

drivers/net/qede/base/ecore_rt_defs.h +502 -393

895 lines not on this page · raw message

drivers/net/qede/base/ecore_sp_api.h +3 -3
index 4633dbebe..5d326bef9 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/base/ecore_sp_commands.c +73 -65

138 lines not on this page · raw message

drivers/net/qede/base/ecore_sp_commands.h +13 -5
index 524fe57a1..4850a60f1 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/base/ecore_spq.c +198 -132

330 lines not on this page · raw message

drivers/net/qede/base/ecore_spq.h +51 -12

63 lines not on this page · raw message

drivers/net/qede/base/ecore_sriov.c +1225 -435

1,660 lines not on this page · raw message

drivers/net/qede/base/ecore_sriov.h +138 -8

146 lines not on this page · raw message

drivers/net/qede/base/ecore_status.h +2 -2
index 01cf9fd31..0c1dc52ea 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/base/ecore_utils.h +16 -2
index 249136b08..c040d1411 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/base/ecore_vf.c +387 -159

546 lines not on this page · raw message

drivers/net/qede/base/ecore_vf.h +38 -16

54 lines not on this page · raw message

drivers/net/qede/base/ecore_vf_api.h +63 -9

72 lines not on this page · raw message

drivers/net/qede/base/ecore_vfpf_if.h +87 -30

117 lines not on this page · raw message

drivers/net/qede/base/eth_common.h +138 -156

294 lines not on this page · raw message

drivers/net/qede/base/mcp_public.h +1549 -792

2,341 lines not on this page · raw message

drivers/net/qede/base/nvm_cfg.h +2591 -2468

5,059 lines not on this page · raw message

drivers/net/qede/qede_debug.c +14 -17
index d46727c45..085d0532b 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/qede_ethdev.c +1 -1
index ab5f5b106..668821dcb 100644

Lines of this file are not shown. View the raw message.

drivers/net/qede/qede_rxtx.c +1 -1
index 6fc67d878..c91fcc1fa 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.18.0

Part of the diff is not shown here. View the raw message.

#4 lore raw

PATCH 5/7 net/qede: changes for DMA page chain allocation and free

In reply to Rasesh Mody

This patch changes the DMA page chain allocation and free mechanism used for fast path resources. It introduces addr_shadow() structure to maintain virtual address and DMA mapping. The ecore_chain_params() is used to maintain all the DMA page chain parameters.

---
 drivers/net/qede/base/ecore_chain.h   | 241 +++++++++++++++-----------
 drivers/net/qede/base/ecore_dev.c     | 119 ++++++++-----
 drivers/net/qede/base/ecore_dev_api.h |  13 +-
 drivers/net/qede/base/ecore_spq.c     |  55 +++---
 drivers/net/qede/qede_if.h            |  20 +--
 drivers/net/qede/qede_main.c          |   1 +
 drivers/net/qede/qede_rxtx.c          |  67 +++----
 7 files changed, 301 insertions(+), 215 deletions(-)
drivers/net/qede/base/ecore_chain.h +144 -97
index c69920be5..8c7971081 100644
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright (c) 2016 - 2018 Cavium Inc.
+ * Copyright (c) 2018 - 2020 Marvell Semiconductor Inc.
  * All rights reserved.
- * www.cavium.com
+ * www.marvell.com
  */
-
 #ifndef __ECORE_CHAIN_H__
 #define __ECORE_CHAIN_H__
 
@@ -24,8 +24,8 @@ enum ecore_chain_mode {
 };
 
 enum ecore_chain_use_mode {
-	ECORE_CHAIN_USE_TO_PRODUCE,	/* Chain starts empty */
-	ECORE_CHAIN_USE_TO_CONSUME,	/* Chain starts full */
+	ECORE_CHAIN_USE_TO_PRODUCE,		/* Chain starts empty */
+	ECORE_CHAIN_USE_TO_CONSUME,		/* Chain starts full */
 	ECORE_CHAIN_USE_TO_CONSUME_PRODUCE,	/* Chain starts empty */
 };
 
@@ -38,35 +38,40 @@ enum ecore_chain_cnt_type {
 };
 
 struct ecore_chain_next {
-	struct regpair next_phys;
-	void *next_virt;
+	struct regpair	next_phys;
+	void		*next_virt;
 };
 
 struct ecore_chain_pbl_u16 {
-	u16 prod_page_idx;
-	u16 cons_page_idx;
+	u16	prod_page_idx;
+	u16	cons_page_idx;
 };
 
 struct ecore_chain_pbl_u32 {
-	u32 prod_page_idx;
-	u32 cons_page_idx;
+	u32	prod_page_idx;
+	u32	cons_page_idx;
 };
 
 struct ecore_chain_ext_pbl {
-	dma_addr_t p_pbl_phys;
-	void *p_pbl_virt;
+	dma_addr_t	p_pbl_phys;
+	void		*p_pbl_virt;
 };
 
 struct ecore_chain_u16 {
 	/* Cyclic index of next element to produce/consme */
-	u16 prod_idx;
-	u16 cons_idx;
+	u16	prod_idx;
+	u16	cons_idx;
 };
 
 struct ecore_chain_u32 {
 	/* Cyclic index of next element to produce/consme */
-	u32 prod_idx;
-	u32 cons_idx;
+	u32	prod_idx;
+	u32	cons_idx;
+};
+
+struct addr_shadow {
+	void *virt_addr;
+	dma_addr_t dma_map;
 };
 
 struct ecore_chain {
@@ -74,16 +79,17 @@ struct ecore_chain {
 	 * as produce / consume.
 	 */
 	/* Point to next element to produce/consume */
-	void *p_prod_elem;
-	void *p_cons_elem;
+	void				*p_prod_elem;
+	void				*p_cons_elem;
 
 	/* Fastpath portions of the PBL [if exists] */
 
 	struct {
-		/* Table for keeping the virtual addresses of the chain pages,
-		 * respectively to the physical addresses in the pbl table.
+		/* Table for keeping the virtual and physical addresses of the
+		 * chain pages, respectively to the physical addresses
+		 * in the pbl table.
 		 */
-		void		**pp_virt_addr_tbl;
+		struct addr_shadow *shadow;
 
 		union {
 			struct ecore_chain_pbl_u16	pbl_u16;
@@ -92,8 +98,8 @@ struct ecore_chain {
 	} pbl;
 
 	union {
-		struct ecore_chain_u16 chain16;
-		struct ecore_chain_u32 chain32;
+		struct ecore_chain_u16	chain16;
+		struct ecore_chain_u32	chain32;
 	} u;
 
 	/* Capacity counts only usable elements */
@@ -106,12 +112,12 @@ struct ecore_chain {
 	enum ecore_chain_mode		mode;
 
 	/* Elements information for fast calculations */
-	u16 elem_per_page;
-	u16 elem_per_page_mask;
-	u16 elem_size;
-	u16 next_page_mask;
-	u16 usable_per_page;
-	u8 elem_unusable;
+	u16				elem_per_page;
+	u16				elem_per_page_mask;
+	u16				elem_size;
+	u16				next_page_mask;
+	u16				usable_per_page;
+	u8				elem_unusable;
 
 	u8				cnt_type;
 
@@ -119,6 +125,8 @@ struct ecore_chain {
 	 * but isn't involved in regular functionality.
 	 */
 
+	u32				page_size;
+
 	/* Base address of a pre-allocated buffer for pbl */
 	struct {
 		dma_addr_t		p_phys_table;
@@ -140,24 +148,35 @@ struct ecore_chain {
 	/* TBD - do we really need this? Couldn't find usage for it */
 	bool				b_external_pbl;
 
-	void *dp_ctx;
+	void				*dp_ctx;
+};
+
+struct ecore_chain_params {
+	enum ecore_chain_use_mode	intended_use;
+	enum ecore_chain_mode		mode;
+	enum ecore_chain_cnt_type	cnt_type;
+	u32				num_elems;
+	osal_size_t			elem_size;
+	u32				page_size;
+	struct ecore_chain_ext_pbl	*ext_pbl;
 };
 
-#define ECORE_CHAIN_PBL_ENTRY_SIZE	(8)
-#define ECORE_CHAIN_PAGE_SIZE		(0x1000)
-#define ELEMS_PER_PAGE(elem_size)	(ECORE_CHAIN_PAGE_SIZE / (elem_size))
+#define ECORE_CHAIN_PBL_ENTRY_SIZE		8
+#define ECORE_CHAIN_PAGE_SIZE			0x1000
+#define ELEMS_PER_PAGE(page_size, elem_size)	((page_size) / (elem_size))
 
-#define UNUSABLE_ELEMS_PER_PAGE(elem_size, mode)		\
-	  ((mode == ECORE_CHAIN_MODE_NEXT_PTR) ?		\
-	   (u8)(1 + ((sizeof(struct ecore_chain_next) - 1) /	\
+#define UNUSABLE_ELEMS_PER_PAGE(elem_size, mode)			\
+	  (((mode) == ECORE_CHAIN_MODE_NEXT_PTR) ?			\
+	   (u8)(1 + ((sizeof(struct ecore_chain_next) - 1) /		\
 		     (elem_size))) : 0)
 
-#define USABLE_ELEMS_PER_PAGE(elem_size, mode)		\
-	((u32)(ELEMS_PER_PAGE(elem_size) -			\
-	UNUSABLE_ELEMS_PER_PAGE(elem_size, mode)))
+#define USABLE_ELEMS_PER_PAGE(elem_size, page_size, mode)		\
+	  ((u32)(ELEMS_PER_PAGE(page_size, elem_size) -			\
+	   UNUSABLE_ELEMS_PER_PAGE(elem_size, mode)))
 
-#define ECORE_CHAIN_PAGE_CNT(elem_cnt, elem_size, mode)		\
-	DIV_ROUND_UP(elem_cnt, USABLE_ELEMS_PER_PAGE(elem_size, mode))
+#define ECORE_CHAIN_PAGE_CNT(elem_cnt, elem_size, page_size, mode)	\
+	DIV_ROUND_UP(elem_cnt,						\
+		     USABLE_ELEMS_PER_PAGE(elem_size, page_size, mode))
 
 #define is_chain_u16(p)	((p)->cnt_type == ECORE_CHAIN_CNT_TYPE_U16)
 #define is_chain_u32(p)	((p)->cnt_type == ECORE_CHAIN_CNT_TYPE_U32)
@@ -195,18 +214,41 @@ static OSAL_INLINE u32 ecore_chain_get_cons_idx_u32(struct ecore_chain *p_chain)
 #define ECORE_U16_MAX	((u16)~0U)
 #define ECORE_U32_MAX	((u32)~0U)
 
+static OSAL_INLINE u16
+ecore_chain_get_elem_used(struct ecore_chain *p_chain)
+{
+	u16 elem_per_page = p_chain->elem_per_page;
+	u32 prod = p_chain->u.chain16.prod_idx;
+	u32 cons = p_chain->u.chain16.cons_idx;
+	u16 used;
+
+	OSAL_ASSERT(is_chain_u16(p_chain));
+
+	if (prod < cons)
+		prod += (u32)ECORE_U16_MAX + 1;
+
+	used = (u16)(prod - cons);
+	if (p_chain->mode == ECORE_CHAIN_MODE_NEXT_PTR)
+		used -= prod / elem_per_page - cons / elem_per_page;
+
+	return (u16)(used);
+}
+
 static OSAL_INLINE u16 ecore_chain_get_elem_left(struct ecore_chain *p_chain)
 {
+	u16 elem_per_page = p_chain->elem_per_page;
+	u32 prod = p_chain->u.chain16.prod_idx;
+	u32 cons = p_chain->u.chain16.cons_idx;
 	u16 used;
 
 	OSAL_ASSERT(is_chain_u16(p_chain));
 
-	used = (u16)(((u32)ECORE_U16_MAX + 1 +
-		      (u32)(p_chain->u.chain16.prod_idx)) -
-		     (u32)p_chain->u.chain16.cons_idx);
+	if (prod < cons)
+		prod += (u32)ECORE_U16_MAX + 1;
+
+	used = (u16)(prod - cons);
 	if (p_chain->mode == ECORE_CHAIN_MODE_NEXT_PTR)
-		used -= p_chain->u.chain16.prod_idx / p_chain->elem_per_page -
-			p_chain->u.chain16.cons_idx / p_chain->elem_per_page;
+		used -= prod / elem_per_page - cons / elem_per_page;
 
 	return (u16)(p_chain->capacity - used);
 }
@@ -214,16 +256,19 @@ static OSAL_INLINE u16 ecore_chain_get_elem_left(struct ecore_chain *p_chain)
 static OSAL_INLINE u32
 ecore_chain_get_elem_left_u32(struct ecore_chain *p_chain)
 {
+	u16 elem_per_page = p_chain->elem_per_page;
+	u64 prod = p_chain->u.chain32.prod_idx;
+	u64 cons = p_chain->u.chain32.cons_idx;
 	u32 used;
 
 	OSAL_ASSERT(is_chain_u32(p_chain));
 
-	used = (u32)(((u64)ECORE_U32_MAX + 1 +
-		      (u64)(p_chain->u.chain32.prod_idx)) -
-		     (u64)p_chain->u.chain32.cons_idx);
+	if (prod < cons)
+		prod += (u64)ECORE_U32_MAX + 1;
+
+	used = (u32)(prod - cons);
 	if (p_chain->mode == ECORE_CHAIN_MODE_NEXT_PTR)
-		used -= p_chain->u.chain32.prod_idx / p_chain->elem_per_page -
-			p_chain->u.chain32.cons_idx / p_chain->elem_per_page;
+		used -= (u32)(prod / elem_per_page - cons / elem_per_page);
 
 	return p_chain->capacity - used;
 }
@@ -319,7 +364,7 @@ ecore_chain_advance_page(struct ecore_chain *p_chain, void **p_next_elem,
 				*(u32 *)page_to_inc = 0;
 			page_index = *(u32 *)page_to_inc;
 		}
-		*p_next_elem = p_chain->pbl.pp_virt_addr_tbl[page_index];
+		*p_next_elem = p_chain->pbl.shadow[page_index].virt_addr;
 	}
 }
 
@@ -330,24 +375,20 @@ ecore_chain_advance_page(struct ecore_chain *p_chain, void **p_next_elem,
 	(((p)->u.chain32.idx & (p)->elem_per_page_mask) == (p)->usable_per_page)
 
 #define is_unusable_next_idx(p, idx)		\
-	((((p)->u.chain16.idx + 1) &		\
-	(p)->elem_per_page_mask) == (p)->usable_per_page)
+	((((p)->u.chain16.idx + 1) & (p)->elem_per_page_mask) == (p)->usable_per_page)
 
 #define is_unusable_next_idx_u32(p, idx)	\
-	((((p)->u.chain32.idx + 1) &		\
-	(p)->elem_per_page_mask) == (p)->usable_per_page)
-
-#define test_and_skip(p, idx)						\
-	do {								\
-		if (is_chain_u16(p)) {					\
-			if (is_unusable_idx(p, idx))			\
-				(p)->u.chain16.idx +=			\
-					(p)->elem_unusable;		\
-		} else {						\
-			if (is_unusable_idx_u32(p, idx))		\
-				(p)->u.chain32.idx +=			\
-					(p)->elem_unusable;		\
-		}							\
+	((((p)->u.chain32.idx + 1) & (p)->elem_per_page_mask) == (p)->usable_per_page)
+
+#define test_and_skip(p, idx)							\
+	do {									\
+		if (is_chain_u16(p)) {						\
+			if (is_unusable_idx(p, idx))				\
+				(p)->u.chain16.idx += (p)->elem_unusable;	\
+		} else {							\
+			if (is_unusable_idx_u32(p, idx))			\
+				(p)->u.chain32.idx += (p)->elem_unusable;	\
+		}								\
 	} while (0)
 
 /**
@@ -395,7 +436,7 @@ static OSAL_INLINE void ecore_chain_return_produced(struct ecore_chain *p_chain)
  *
  * @param p_chain
  *
- * @return void*, a pointer to next element
+ * @return void *, a pointer to next element
  */
 static OSAL_INLINE void *ecore_chain_produce(struct ecore_chain *p_chain)
 {
@@ -403,7 +444,8 @@ static OSAL_INLINE void *ecore_chain_produce(struct ecore_chain *p_chain)
 
 	if (is_chain_u16(p_chain)) {
 		if ((p_chain->u.chain16.prod_idx &
-		     p_chain->elem_per_page_mask) == p_chain->next_page_mask) {
+		     p_chain->elem_per_page_mask) ==
+		    p_chain->next_page_mask) {
 			p_prod_idx = &p_chain->u.chain16.prod_idx;
 			p_prod_page_idx = &p_chain->pbl.c.pbl_u16.prod_page_idx;
 			ecore_chain_advance_page(p_chain, &p_chain->p_prod_elem,
@@ -412,7 +454,8 @@ static OSAL_INLINE void *ecore_chain_produce(struct ecore_chain *p_chain)
 		p_chain->u.chain16.prod_idx++;
 	} else {
 		if ((p_chain->u.chain32.prod_idx &
-		     p_chain->elem_per_page_mask) == p_chain->next_page_mask) {
+		     p_chain->elem_per_page_mask) ==
+		    p_chain->next_page_mask) {
 			p_prod_idx = &p_chain->u.chain32.prod_idx;
 			p_prod_page_idx = &p_chain->pbl.c.pbl_u32.prod_page_idx;
 			ecore_chain_advance_page(p_chain, &p_chain->p_prod_elem,
@@ -423,7 +466,7 @@ static OSAL_INLINE void *ecore_chain_produce(struct ecore_chain *p_chain)
 
 	p_ret = p_chain->p_prod_elem;
 	p_chain->p_prod_elem = (void *)(((u8 *)p_chain->p_prod_elem) +
-					p_chain->elem_size);
+				       p_chain->elem_size);
 
 	return p_ret;
 }
@@ -469,7 +512,7 @@ void ecore_chain_recycle_consumed(struct ecore_chain *p_chain)
  *
  * @param p_chain
  *
- * @return void*, a pointer to the next buffer written
+ * @return void *, a pointer to the next buffer written
  */
 static OSAL_INLINE void *ecore_chain_consume(struct ecore_chain *p_chain)
 {
@@ -477,7 +520,8 @@ static OSAL_INLINE void *ecore_chain_consume(struct ecore_chain *p_chain)
 
 	if (is_chain_u16(p_chain)) {
 		if ((p_chain->u.chain16.cons_idx &
-		     p_chain->elem_per_page_mask) == p_chain->next_page_mask) {
+		     p_chain->elem_per_page_mask) ==
+		    p_chain->next_page_mask) {
 			p_cons_idx = &p_chain->u.chain16.cons_idx;
 			p_cons_page_idx = &p_chain->pbl.c.pbl_u16.cons_page_idx;
 			ecore_chain_advance_page(p_chain, &p_chain->p_cons_elem,
@@ -486,7 +530,8 @@ static OSAL_INLINE void *ecore_chain_consume(struct ecore_chain *p_chain)
 		p_chain->u.chain16.cons_idx++;
 	} else {
 		if ((p_chain->u.chain32.cons_idx &
-		     p_chain->elem_per_page_mask) == p_chain->next_page_mask) {
+		     p_chain->elem_per_page_mask) ==
+		    p_chain->next_page_mask) {
 			p_cons_idx = &p_chain->u.chain32.cons_idx;
 			p_cons_page_idx = &p_chain->pbl.c.pbl_u32.cons_page_idx;
 			ecore_chain_advance_page(p_chain, &p_chain->p_cons_elem,
@@ -497,7 +542,7 @@ static OSAL_INLINE void *ecore_chain_consume(struct ecore_chain *p_chain)
 
 	p_ret = p_chain->p_cons_elem;
 	p_chain->p_cons_elem = (void *)(((u8 *)p_chain->p_cons_elem) +
-					p_chain->elem_size);
+				       p_chain->elem_size);
 
 	return p_ret;
 }
@@ -524,7 +569,7 @@ static OSAL_INLINE void ecore_chain_reset(struct ecore_chain *p_chain)
 	p_chain->p_prod_elem = p_chain->p_virt_addr;
 
 	if (p_chain->mode == ECORE_CHAIN_MODE_PBL) {
-		/* Use "page_cnt-1" as a reset value for the prod/cons page's
+		/* Use "page_cnt - 1" as a reset value for the prod/cons page's
 		 * indices, to avoid unnecessary page advancing on the first
 		 * call to ecore_chain_produce/consume. Instead, the indices
 		 * will be advanced to page_cnt and then will be wrapped to 0.
@@ -556,7 +601,7 @@ static OSAL_INLINE void ecore_chain_reset(struct ecore_chain *p_chain)
 }
 
 /**
- * @brief ecore_chain_init_params -
+ * @brief ecore_chain_init -
  *
  * Initalizes a basic chain struct
  *
@@ -569,10 +614,12 @@ static OSAL_INLINE void ecore_chain_reset(struct ecore_chain *p_chain)
  * @param dp_ctx
  */
 static OSAL_INLINE void
-ecore_chain_init_params(struct ecore_chain *p_chain, u32 page_cnt, u8 elem_size,
-			enum ecore_chain_use_mode intended_use,
-			enum ecore_chain_mode mode,
-			enum ecore_chain_cnt_type cnt_type, void *dp_ctx)
+ecore_chain_init(struct ecore_chain *p_chain,
+		 u32 page_cnt, u8 elem_size, u32 page_size,
+		 enum ecore_chain_use_mode intended_use,
+		 enum ecore_chain_mode mode,
+		 enum ecore_chain_cnt_type cnt_type,
+		 void *dp_ctx)
 {
 	/* chain fixed parameters */
 	p_chain->p_virt_addr = OSAL_NULL;
@@ -582,20 +629,22 @@ ecore_chain_init_params(struct ecore_chain *p_chain, u32 page_cnt, u8 elem_size,
 	p_chain->mode = mode;
 	p_chain->cnt_type = (u8)cnt_type;
 
-	p_chain->elem_per_page = ELEMS_PER_PAGE(elem_size);
-	p_chain->usable_per_page = USABLE_ELEMS_PER_PAGE(elem_size, mode);
+	p_chain->elem_per_page = ELEMS_PER_PAGE(page_size, elem_size);
+	p_chain->usable_per_page = USABLE_ELEMS_PER_PAGE(elem_size, page_size,
+							 mode);
 	p_chain->elem_per_page_mask = p_chain->elem_per_page - 1;
 	p_chain->elem_unusable = UNUSABLE_ELEMS_PER_PAGE(elem_size, mode);
 	p_chain->next_page_mask = (p_chain->usable_per_page &
 				   p_chain->elem_per_page_mask);
 
+	p_chain->page_size = page_size;
 	p_chain->page_cnt = page_cnt;
 	p_chain->capacity = p_chain->usable_per_page * page_cnt;
 	p_chain->size = p_chain->elem_per_page * page_cnt;
 	p_chain->b_external_pbl = false;
 	p_chain->pbl_sp.p_phys_table = 0;
 	p_chain->pbl_sp.p_virt_table = OSAL_NULL;
-	p_chain->pbl.pp_virt_addr_tbl = OSAL_NULL;
+	p_chain->pbl.shadow = OSAL_NULL;
 
 	p_chain->dp_ctx = dp_ctx;
 }
@@ -636,11 +685,11 @@ static OSAL_INLINE void ecore_chain_init_mem(struct ecore_chain *p_chain,
 static OSAL_INLINE void ecore_chain_init_pbl_mem(struct ecore_chain *p_chain,
 						 void *p_virt_pbl,
 						 dma_addr_t p_phys_pbl,
-						 void **pp_virt_addr_tbl)
+						 struct addr_shadow *shadow)
 {
 	p_chain->pbl_sp.p_phys_table = p_phys_pbl;
 	p_chain->pbl_sp.p_virt_table = p_virt_pbl;
-	p_chain->pbl.pp_virt_addr_tbl = pp_virt_addr_tbl;
+	p_chain->pbl.shadow = shadow;
 }
 
 /**
@@ -677,7 +726,7 @@ ecore_chain_init_next_ptr_elem(struct ecore_chain *p_chain, void *p_virt_curr,
  *
  * @param p_chain
  *
- * @return void*
+ * @return void *
  */
 static OSAL_INLINE void *ecore_chain_get_last_elem(struct ecore_chain *p_chain)
 {
@@ -695,9 +744,8 @@ static OSAL_INLINE void *ecore_chain_get_last_elem(struct ecore_chain *p_chain)
 		p_next = (struct ecore_chain_next *)((u8 *)p_virt_addr + size);
 		while (p_next->next_virt != p_chain->p_virt_addr) {
 			p_virt_addr = p_next->next_virt;
-			p_next =
-			    (struct ecore_chain_next *)((u8 *)p_virt_addr +
-							size);
+			p_next = (struct ecore_chain_next *)((u8 *)p_virt_addr +
+							     size);
 		}
 		break;
 	case ECORE_CHAIN_MODE_SINGLE:
@@ -705,12 +753,12 @@ static OSAL_INLINE void *ecore_chain_get_last_elem(struct ecore_chain *p_chain)
 		break;
 	case ECORE_CHAIN_MODE_PBL:
 		last_page_idx = p_chain->page_cnt - 1;
-		p_virt_addr = p_chain->pbl.pp_virt_addr_tbl[last_page_idx];
+		p_virt_addr = p_chain->pbl.shadow[last_page_idx].virt_addr;
 		break;
 	}
 	/* p_virt_addr points at this stage to the last page of the chain */
 	size = p_chain->elem_size * (p_chain->usable_per_page - 1);
-	p_virt_addr = ((u8 *)p_virt_addr + size);
+	p_virt_addr = (u8 *)p_virt_addr + size;
 out:
 	return p_virt_addr;
 }
@@ -825,8 +873,8 @@ static OSAL_INLINE void ecore_chain_pbl_zero_mem(struct ecore_chain *p_chain)
 	page_cnt = ecore_chain_get_page_cnt(p_chain);
 
 	for (i = 0; i < page_cnt; i++)
-		OSAL_MEM_ZERO(p_chain->pbl.pp_virt_addr_tbl[i],
-			      ECORE_CHAIN_PAGE_SIZE);
+		OSAL_MEM_ZERO(p_chain->pbl.shadow[i].virt_addr,
+			      p_chain->page_size);
 }
 
 int ecore_chain_print(struct ecore_chain *p_chain, char *buffer,
@@ -835,8 +883,7 @@ int ecore_chain_print(struct ecore_chain *p_chain, char *buffer,
 		      int (*func_ptr_print_element)(struct ecore_chain *p_chain,
 						    void *p_element,
 						    char *buffer),
-		      int (*func_ptr_print_metadata)(struct ecore_chain
-						     *p_chain,
+		      int (*func_ptr_print_metadata)(struct ecore_chain *p_chain,
 						     char *buffer));
 
 #endif /* __ECORE_CHAIN_H__ */
drivers/net/qede/base/ecore_dev.c +71 -48

237 lines not on this page · raw message

drivers/net/qede/base/ecore_dev_api.h +7 -6
index 1ffe286d7..2e06e77c9 100644
@@ -482,6 +482,12 @@ struct ecore_eth_stats {
 };
 #endif
 
+void ecore_chain_params_init(struct ecore_chain_params *p_params,
+			     enum ecore_chain_use_mode intended_use,
+			     enum ecore_chain_mode mode,
+			     enum ecore_chain_cnt_type cnt_type,
+			     u32 num_elems,
+			     osal_size_t elem_size);
 /**
  * @brief ecore_chain_alloc - Allocate and initialize a chain
  *
@@ -496,13 +502,8 @@ struct ecore_eth_stats {
  */
 enum _ecore_status_t
 ecore_chain_alloc(struct ecore_dev *p_dev,
-		  enum ecore_chain_use_mode intended_use,
-		  enum ecore_chain_mode mode,
-		  enum ecore_chain_cnt_type cnt_type,
-		  u32 num_elems,
-		  osal_size_t elem_size,
 		  struct ecore_chain *p_chain,
-		  struct ecore_chain_ext_pbl *ext_pbl);
+		  struct ecore_chain_params *p_params);
 
 /**
  * @brief ecore_chain_free - Free chain DMA memory
drivers/net/qede/base/ecore_spq.c +32 -23

92 lines not on this page · raw message

drivers/net/qede/qede_if.h +10 -10
index 1693a243f..daefd4b98 100644
@@ -141,16 +141,16 @@ struct qed_common_ops {
 		     struct rte_pci_device *pci_dev,
 		     uint32_t dp_module, uint8_t dp_level, bool is_vf);
 	void (*set_name)(struct ecore_dev *edev, char name[]);
-	enum _ecore_status_t
-		(*chain_alloc)(struct ecore_dev *edev,
-			       enum ecore_chain_use_mode
-			       intended_use,
-			       enum ecore_chain_mode mode,
-			       enum ecore_chain_cnt_type cnt_type,
-			       uint32_t num_elems,
-			       osal_size_t elem_size,
-			       struct ecore_chain *p_chain,
-			       struct ecore_chain_ext_pbl *ext_pbl);
+
+	void (*chain_params_init)(struct ecore_chain_params *p_params,
+				  enum ecore_chain_use_mode intended_use,
+				  enum ecore_chain_mode mode,
+				  enum ecore_chain_cnt_type cnt_type,
+				  u32 num_elems, size_t elem_size);
+
+	int (*chain_alloc)(struct ecore_dev *edev,
+			   struct ecore_chain *p_chain,
+			   struct ecore_chain_params *p_params);
 
 	void (*chain_free)(struct ecore_dev *edev,
 			   struct ecore_chain *p_chain);
drivers/net/qede/qede_main.c +1 -0
index e865d988f..4f99ab8b7 100644
@@ -781,6 +781,7 @@ const struct qed_common_ops qed_common_ops_pass = {
 	INIT_STRUCT_FIELD(update_pf_params, &qed_update_pf_params),
 	INIT_STRUCT_FIELD(slowpath_start, &qed_slowpath_start),
 	INIT_STRUCT_FIELD(set_name, &qed_set_name),
+	INIT_STRUCT_FIELD(chain_params_init, &ecore_chain_params_init),
 	INIT_STRUCT_FIELD(chain_alloc, &ecore_chain_alloc),
 	INIT_STRUCT_FIELD(chain_free, &ecore_chain_free),
 	INIT_STRUCT_FIELD(sb_init, &qed_sb_init),
drivers/net/qede/qede_rxtx.c +36 -31

105 lines not on this page · raw message

Signature · 1 line
2.18.0
#5 lore raw

PATCH 6/7 net/qede: add support for new HW

In reply to Rasesh Mody

This patch adds PMD support for new hardware (adding new PCI IDs) 50xxx family of Marvell fastlinq adapters. The PMD version is updated to 3.0.0.1.

---
 drivers/net/qede/qede_debug.c  |  3 +--
 drivers/net/qede/qede_ethdev.c |  8 +++++++-
 drivers/net/qede/qede_ethdev.h | 11 +++++++----
 3 files changed, 15 insertions(+), 7 deletions(-)
drivers/net/qede/qede_debug.c +1 -2
index 085d0532b..ca2879432 100644
@@ -8099,8 +8099,7 @@ void qed_dbg_pf_init(struct ecore_dev *edev)
 	/* Debug values are after init values.
 	 * The offset is the first dword of the file.
 	 */
-	/* TBD: change hardcoded value to offset from FW file */
-	dbg_values = (const u8 *)edev->firmware + 1337296;
+	dbg_values = (const u8 *)edev->firmware + sizeof(u32);
 
 	for_each_hwfn(edev, i) {
 		qed_dbg_set_bin_ptr(&edev->hwfns[i], dbg_values);
drivers/net/qede/qede_ethdev.c +7 -1
index 668821dcb..8b151e907 100644
@@ -374,7 +374,7 @@ static void qede_print_adapter_info(struct rte_eth_dev *dev)
 	DP_INFO(edev, "**************************************************\n");
 	DP_INFO(edev, " %-20s: %s\n", "DPDK version", rte_version());
 	DP_INFO(edev, " %-20s: %s %c%d\n", "Chip details",
-		  ECORE_IS_BB(edev) ? "BB" : "AH",
+		  ECORE_IS_E5(edev) ? "AHP" : ECORE_IS_BB(edev) ? "BB" : "AH",
 		  'A' + edev->chip_rev,
 		  (int)edev->chip_metal);
 	snprintf(ver_str, QEDE_PMD_DRV_VER_STR_SIZE, "%s",
@@ -2811,6 +2811,9 @@ static const struct rte_pci_id pci_id_qedevf_map[] = {
 	{
 		QEDEVF_RTE_PCI_DEVICE(PCI_DEVICE_ID_QLOGIC_AH_IOV)
 	},
+	{
+		QEDEVF_RTE_PCI_DEVICE(PCI_DEVICE_ID_QLOGIC_E5_IOV)
+	},
 	{.vendor_id = 0,}
 };
 
@@ -2846,6 +2849,9 @@ static const struct rte_pci_id pci_id_qede_map[] = {
 	{
 		QEDE_RTE_PCI_DEVICE(PCI_DEVICE_ID_QLOGIC_AH_25G)
 	},
+	{
+		QEDE_RTE_PCI_DEVICE(PCI_DEVICE_ID_QLOGIC_E5)
+	},
 	{.vendor_id = 0,}
 };
 
drivers/net/qede/qede_ethdev.h +7 -4
index da4b87f5e..d065069a9 100644
@@ -45,9 +45,9 @@
 /* Driver versions */
 #define QEDE_PMD_DRV_VER_STR_SIZE NAME_SIZE /* 128 */
 #define QEDE_PMD_VER_PREFIX		"QEDE PMD"
-#define QEDE_PMD_VERSION_MAJOR		2
-#define QEDE_PMD_VERSION_MINOR	        11
-#define QEDE_PMD_VERSION_REVISION       3
+#define QEDE_PMD_VERSION_MAJOR		3
+#define QEDE_PMD_VERSION_MINOR	        0
+#define QEDE_PMD_VERSION_REVISION       0
 #define QEDE_PMD_VERSION_PATCH	        1
 
 #define QEDE_PMD_DRV_VERSION qede_stringify(QEDE_PMD_VERSION_MAJOR) "."     \
@@ -109,6 +109,8 @@
 #define CHIP_NUM_AH_40G			       0x8072
 #define CHIP_NUM_AH_25G			       0x8073
 #define CHIP_NUM_AH_IOV			       0x8090
+#define CHIP_NUM_E5			       0x8170
+#define CHIP_NUM_E5_IOV			       0x8190
 
 #define PCI_DEVICE_ID_QLOGIC_NX2_57980E        CHIP_NUM_57980E
 #define PCI_DEVICE_ID_QLOGIC_NX2_57980S        CHIP_NUM_57980S
@@ -123,7 +125,8 @@
 #define PCI_DEVICE_ID_QLOGIC_AH_40G            CHIP_NUM_AH_40G
 #define PCI_DEVICE_ID_QLOGIC_AH_25G            CHIP_NUM_AH_25G
 #define PCI_DEVICE_ID_QLOGIC_AH_IOV            CHIP_NUM_AH_IOV
-
+#define PCI_DEVICE_ID_QLOGIC_E5                CHIP_NUM_E5
+#define PCI_DEVICE_ID_QLOGIC_E5_IOV            CHIP_NUM_E5_IOV
 
 
 extern char qede_fw_file[];
Signature · 1 line
2.18.0
#6 lore raw

PATCH 7/7 net/qede/base: clean unnecessary ifdef and comments

In reply to Rasesh Mody

Removed #ifdef LINUX_REMOVE, #ifndef LINUX_REMOVE, TODO comments and TBD comments. Lots of TODOs and TBDs are not relevant.

---
 drivers/net/qede/base/bcm_osal.c            |  1 -
 drivers/net/qede/base/bcm_osal.h            |  3 --
 drivers/net/qede/base/ecore.h               |  5 ---
 drivers/net/qede/base/ecore_chain.h         |  1 -
 drivers/net/qede/base/ecore_cxt.c           |  7 ----
 drivers/net/qede/base/ecore_cxt.h           |  1 -
 drivers/net/qede/base/ecore_dev.c           | 43 +-------------------
 drivers/net/qede/base/ecore_hsi_common.h    |  1 -
 drivers/net/qede/base/ecore_hsi_init_func.h |  2 -
 drivers/net/qede/base/ecore_hw.c            |  7 ----
 drivers/net/qede/base/ecore_init_fw_funcs.c |  2 -
 drivers/net/qede/base/ecore_int.c           | 11 -----
 drivers/net/qede/base/ecore_int.h           |  1 -
 drivers/net/qede/base/ecore_iov_api.h       |  5 ---
 drivers/net/qede/base/ecore_l2.c            |  6 ---
 drivers/net/qede/base/ecore_mcp.c           | 20 ---------
 drivers/net/qede/base/ecore_mcp.h           |  1 -
 drivers/net/qede/base/ecore_mcp_api.h       |  4 --
 drivers/net/qede/base/ecore_sp_commands.c   |  3 --
 drivers/net/qede/base/ecore_spq.c           |  5 ---
 drivers/net/qede/base/ecore_sriov.c         | 45 +--------------------
 drivers/net/qede/base/ecore_sriov.h         |  1 -
 drivers/net/qede/base/ecore_vf.c            |  4 --
 drivers/net/qede/base/ecore_vf.h            |  3 --
 drivers/net/qede/base/ecore_vf_api.h        |  2 -
 drivers/net/qede/base/ecore_vfpf_if.h       |  9 +----
 drivers/net/qede/base/mcp_public.h          |  2 -
 drivers/net/qede/qede_ethdev.c              |  1 -
 drivers/net/qede/qede_main.c                |  1 -
 drivers/net/qede/qede_rxtx.c                |  5 ---
 drivers/net/qede/qede_sriov.c               |  4 --
 31 files changed, 6 insertions(+), 200 deletions(-)
drivers/net/qede/base/bcm_osal.c +0 -1
index 23a84795f..8e4fe6926 100644
@@ -121,7 +121,6 @@ void qede_vf_fill_driver_data(struct ecore_hwfn *hwfn,
 			      struct ecore_vf_acquire_sw_info *vf_sw_info)
 {
 	vf_sw_info->os_type = VFPF_ACQUIRE_OS_LINUX_USERSPACE;
-	/* TODO - fill driver version */
 }
 
 void *osal_dma_alloc_coherent(struct ecore_dev *p_dev,
drivers/net/qede/base/bcm_osal.h +0 -3
index 38b7fff67..315d091e1 100644
@@ -270,7 +270,6 @@ typedef struct osal_list_t {
 #define OSAL_LIST_NEXT(entry, field, type) \
 	(type *)((&((entry)->field))->next)
 
-/* TODO: Check field, type order */
 
 #define OSAL_LIST_FOR_EACH_ENTRY(entry, list, field, type) \
 	for (entry = OSAL_LIST_FIRST_ENTRY(list, type, field); \
@@ -284,7 +283,6 @@ typedef struct osal_list_t {
 	  entry = (type *)tmp_entry,					 \
 	  tmp_entry = (entry) ? OSAL_LIST_NEXT(entry, field, type) : NULL)
 
-/* TODO: OSAL_LIST_INSERT_ENTRY_AFTER */
 #define OSAL_LIST_INSERT_ENTRY_AFTER(new_entry, entry, list) \
 	OSAL_LIST_PUSH_HEAD(new_entry, list)
 
@@ -396,7 +394,6 @@ void qede_hw_err_notify(struct ecore_hwfn *p_hwfn,
 #define OSAL_UNZIP_DATA(p_hwfn, input_len, buf, max_size, unzip_buf) \
 	qede_unzip_data(p_hwfn, input_len, buf, max_size, unzip_buf)
 
-/* TODO: */
 #define OSAL_SCHEDULE_RECOVERY_HANDLER(hwfn) nothing
 
 int qede_save_fw_dump(uint16_t port_id);
drivers/net/qede/base/ecore.h +0 -5
index 9801d5348..0c75934d2 100644
@@ -170,7 +170,6 @@ static OSAL_INLINE u32 DB_ADDR_VF_E5(u32 cid, u32 DEMS)
 	((sizeof(type_name) + (u32)(1 << (p_hwfn->p_dev->cache_shift)) - 1) & \
 	 ~((1 << (p_hwfn->p_dev->cache_shift)) - 1))
 
-#ifndef LINUX_REMOVE
 #ifndef U64_HI
 #define U64_HI(val) ((u32)(((u64)(val))  >> 32))
 #endif
@@ -178,7 +177,6 @@ static OSAL_INLINE u32 DB_ADDR_VF_E5(u32 cid, u32 DEMS)
 #ifndef U64_LO
 #define U64_LO(val) ((u32)(((u64)(val)) & 0xffffffff))
 #endif
-#endif
 
 #ifndef __EXTRACT__LINUX__IF__
 #define ECORE_INT_DEBUG_SIZE_DEF     _MB(2)
@@ -271,7 +269,6 @@ enum DP_LEVEL {
 #define ECORE_LOG_NOTICE_MASK	(0x80000000)
 
 enum DP_MODULE {
-#ifndef LINUX_REMOVE
 	ECORE_MSG_DRV		= 0x0001,
 	ECORE_MSG_PROBE		= 0x0002,
 	ECORE_MSG_LINK		= 0x0004,
@@ -287,7 +284,6 @@ enum DP_MODULE {
 	ECORE_MSG_PKTDATA	= 0x1000,
 	ECORE_MSG_HW		= 0x2000,
 	ECORE_MSG_WOL		= 0x4000,
-#endif
 	ECORE_MSG_SPQ		= 0x10000,
 	ECORE_MSG_STATS		= 0x20000,
 	ECORE_MSG_DCB		= 0x40000,
@@ -761,7 +757,6 @@ enum ecore_mf_mode_bit {
 	/* Allow Cross-PF [& child VFs] Tx-switching */
 	ECORE_MF_INTER_PF_SWITCH,
 
-	/* TODO - if we ever re-utilize any of this logic, we can rename */
 	ECORE_MF_UFP_SPECIFIC,
 
 	ECORE_MF_DISABLE_ARFS,
drivers/net/qede/base/ecore_chain.h +0 -1
index 8c7971081..78a10ce34 100644
@@ -145,7 +145,6 @@ struct ecore_chain {
 
 	u8				intended_use;
 
-	/* TBD - do we really need this? Couldn't find usage for it */
 	bool				b_external_pbl;
 
 	void				*dp_ctx;
drivers/net/qede/base/ecore_cxt.c +0 -7
index c22f97f7d..74cf77255 100644
@@ -430,7 +430,6 @@ static void ecore_ilt_get_dynamic_line_range(struct ecore_hwfn *p_hwfn,
 	struct ecore_conn_type_cfg *p_cfg;
 	u32 cxts_per_p;
 
-	/* TBD MK: ILT code should be simplified once PROTO enum is changed */
 
 	*dynamic_line_offset = 0;
 	*dynamic_line_cnt = 0;
@@ -2034,7 +2033,6 @@ static void ecore_tm_init_pf(struct ecore_hwfn *p_hwfn)
 	OSAL_MEM_ZERO(&tm_iids, sizeof(tm_iids));
 	ecore_cxt_tm_iids(p_hwfn, &tm_iids);
 
-	/* @@@TBD No pre-scan for now */
 
 	cfg_word = 0;
 	SET_FIELD(cfg_word, TM_CFG_NUM_IDS, tm_iids.per_vf_cids);
@@ -2521,11 +2519,6 @@ ecore_cxt_dynamic_ilt_alloc(struct ecore_hwfn *p_hwfn,
 			    enum ecore_cxt_elem_type elem_type,
 			    u32 iid, u8 vf_id)
 {
-	/* TODO
-	 * Check to see if we need to do anything differeny if this is
-	 * called on behalf of VF.
-	 */
-
 	u32 reg_offset, shadow_line, elem_size, hw_p_size, elems_per_p, line;
 	struct ecore_ilt_client_cfg *p_cli;
 	struct ecore_ilt_cli_blk *p_blk;
drivers/net/qede/base/ecore_cxt.h +0 -1
index fe61a8b8f..11cecb4c6 100644
@@ -368,7 +368,6 @@ struct ecore_cxt_mngr {
 	/* Maximal number of L2 steering filters */
 	u32				arfs_count;
 
-	/* TODO - VF arfs filters ? */
 
 	u16				iscsi_task_pages;
 	u16				fcoe_task_pages;
drivers/net/qede/base/ecore_dev.c +2 -41

149 lines not on this page · raw message

drivers/net/qede/base/ecore_hsi_common.h +0 -1
index 80812d4ce..4533e96a0 100644
@@ -3049,7 +3049,6 @@ struct sdm_agg_int_comp_params {
 /* 1 - set a bit in aggregated vector, 0 - dont set */
 #define SDM_AGG_INT_COMP_PARAMS_AGG_VECTOR_ENABLE_MASK  0x1
 #define SDM_AGG_INT_COMP_PARAMS_AGG_VECTOR_ENABLE_SHIFT 6
-/* Number of bit in the aggregated vector, 0-279 (TBD) */
 #define SDM_AGG_INT_COMP_PARAMS_AGG_VECTOR_BIT_MASK     0x1FF
 #define SDM_AGG_INT_COMP_PARAMS_AGG_VECTOR_BIT_SHIFT    7
 };
drivers/net/qede/base/ecore_hsi_init_func.h +0 -2
index 93b24b729..b972388db 100644
@@ -14,9 +14,7 @@
 #define NUM_OF_VLAN_PRIORITIES			8
 
 /* Size of CRC8 lookup table */
-#ifndef LINUX_REMOVE
 #define CRC8_TABLE_SIZE					256
-#endif
 
 /*
  * GFS context Descriptot QREG (0)
drivers/net/qede/base/ecore_hw.c +0 -7
index e4f9b5e85..00b496416 100644
@@ -158,7 +158,6 @@ void ecore_ptt_release(struct ecore_hwfn *p_hwfn,
 		       struct ecore_ptt *p_ptt)
 {
 	/* This PTT should not be set to pretend if it is being released */
-	/* TODO - add some pretend sanity checks, to make sure pretend isn't set on this ptt */
 
 	OSAL_SPIN_LOCK(&p_hwfn->p_ptt_pool->lock);
 	OSAL_LIST_PUSH_HEAD(&p_ptt->list_entry, &p_hwfn->p_ptt_pool->free_list);
@@ -543,7 +542,6 @@ static void ecore_dmae_opcode(struct ecore_hwfn	*p_hwfn,
 		    p_params->dst_pf_id : p_hwfn->rel_pf_id;
 	SET_FIELD(opcode, DMAE_CMD_DST_PF_ID, dst_pf_id);
 
-	/* DMAE_E4_TODO need to check which value to specify here. */
 	/* SET_FIELD(opcode, DMAE_CMD_C_DST, !b_complete_to_host);*/
 
 	/* Whether to write a completion word to the completion destination:
@@ -747,10 +745,6 @@ ecore_dmae_operation_wait(struct ecore_hwfn *p_hwfn)
 	wait_cnt_limit *= factor;
 #endif
 
-	/* DMAE_E4_TODO : TODO check if we have to call any other function
-	 * other than BARRIER to sync the completion_word since we are not
-	 * using the volatile keyword for this
-	 */
 	OSAL_BARRIER(p_hwfn->p_dev);
 	while (*p_hwfn->dmae_info.p_completion_word != DMAE_COMPLETION_VAL) {
 		OSAL_UDELAY(DMAE_MIN_WAIT_TIME);
@@ -842,7 +836,6 @@ static enum _ecore_status_t ecore_dmae_execute_sub_operation(struct ecore_hwfn *
 	ecore_status = ecore_dmae_operation_wait(p_hwfn);
 
 #ifndef __EXTRACT__LINUX__
-	/* TODO - is it true ? */
 	if (src_type == ECORE_DMAE_ADDRESS_HOST_VIRT ||
 	    src_type == ECORE_DMAE_ADDRESS_HOST_PHYS)
 		OSAL_DMA_SYNC(p_hwfn->p_dev,
drivers/net/qede/base/ecore_init_fw_funcs.c +0 -2
index 575ba8070..ba23e2c4e 100644
@@ -1873,9 +1873,7 @@ u32 ecore_get_mstorm_eth_vf_prods_offset(struct ecore_hwfn *p_hwfn, u8 vf_id, u8
 	return offset;
 }
 
-#ifndef LINUX_REMOVE
 #define CRC8_INIT_VALUE 0xFF
-#endif
 static u8 cdu_crc8_table[CRC8_TABLE_SIZE];
 
 /* Calculate and return CDU validation byte per connection type/region/cid */
drivers/net/qede/base/ecore_int.c +0 -11
index e56d5dba7..4d3d0ac6e 100644
@@ -195,9 +195,6 @@ static enum _ecore_status_t ecore_pswhst_attn_cb(struct ecore_hwfn *p_hwfn)
 			data);
 	}
 
-	/* TODO - We know 'some' of these are legal due to virtualization,
-	 * but is it true for all of them?
-	 */
 	return ECORE_SUCCESS;
 }
 
@@ -1746,7 +1743,6 @@ static void _ecore_int_cau_conf_pi(struct ecore_hwfn *p_hwfn,
 	u32 sb_offset, pi_offset;
 
 	if (IS_VF(p_hwfn->p_dev))
-		return;/* @@@TBD MichalK- VF CAU... */
 
 	sb_offset = igu_sb_id * (ECORE_IS_E4(p_hwfn->p_dev) ? PIS_PER_SB_E4
 							    : PIS_PER_SB_E5);
@@ -2401,7 +2397,6 @@ void ecore_int_igu_init_pure_rt(struct ecore_hwfn *p_hwfn,
 	u16 igu_sb_id = 0;
 	u32 val = 0;
 
-	/* @@@TBD MichalK temporary... should be moved to init-tool... */
 	val = ecore_rd(p_hwfn, p_ptt, IGU_REG_BLOCK_CONFIGURATION);
 	val |= IGU_REG_BLOCK_CONFIGURATION_VF_CLEANUP_EN;
 	val &= ~IGU_REG_BLOCK_CONFIGURATION_PXP_TPH_INTERFACE_EN;
@@ -2459,7 +2454,6 @@ int ecore_int_igu_reset_cam(struct ecore_hwfn *p_hwfn,
 			p_info->usage.cnt = RESC_NUM(p_hwfn, ECORE_SB) - 1;
 		}
 
-		/* TODO - how do we learn about VF SBs from MFW? */
 		if (IS_PF_SRIOV(p_hwfn)) {
 			u16 vfs = p_hwfn->p_dev->p_iov_info->total_vfs;
 
@@ -2586,7 +2580,6 @@ int ecore_int_igu_reset_cam_default(struct ecore_hwfn *p_hwfn,
 	p_cnt->orig = 0;
 	p_cnt->iov_orig = 0;
 
-	/* TODO - we probably need to re-configure the CAU as well... */
 	return ecore_int_igu_reset_cam(p_hwfn, p_ptt);
 }
 
@@ -2789,10 +2782,6 @@ ecore_int_igu_relocate_sb(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
 		p_info->usage.iov_cnt++;
 		p_info->usage.free_cnt_iov++;
 
-		/* TODO - if SBs aren't really the limiting factor,
-		 * then it might not be accurate [in the since that
-		 * we might not need decrement the feature].
-		 */
 		p_hwfn->hw_info.feat_num[ECORE_PF_L2_QUE]--;
 		p_hwfn->hw_info.feat_num[ECORE_VF_L2_QUE]++;
 	} else {
drivers/net/qede/base/ecore_int.h +0 -1
index 6d72d5ced..24bbaab75 100644
@@ -92,7 +92,6 @@ u16 ecore_get_igu_sb_id(struct ecore_hwfn *p_hwfn, u16 sb_id);
 struct ecore_igu_block *
 ecore_get_igu_free_sb(struct ecore_hwfn *p_hwfn, bool b_is_pf);
 
-/* TODO Names of function may change... */
 void ecore_int_igu_init_pure_rt(struct ecore_hwfn	*p_hwfn,
 				 struct ecore_ptt	*p_ptt,
 				 bool			b_set,
drivers/net/qede/base/ecore_iov_api.h +0 -5
index 329b30b7b..422de71c7 100644
@@ -35,9 +35,7 @@
 #define IS_PF_SRIOV(p_hwfn)	(0)
 #endif
 #define IS_PF_SRIOV_ALLOC(p_hwfn)	(!!((p_hwfn)->pf_iov_info))
-#define IS_PF_PDA(p_hwfn)	0 /* @@TBD Michalk */
 
-/* @@@ TBD MichalK - what should this number be*/
 #define ECORE_MAX_QUEUE_VF_CHAINS_PER_PF 16
 #define ECORE_MAX_CNQ_VF_CHAINS_PER_PF 16
 #define ECORE_MAX_VF_CHAINS_PER_PF	\
@@ -108,7 +106,6 @@ struct ecore_iov_vf_init_params {
 	/* Number of requested Queues; Currently, don't support different
 	 * number of Rx/Tx queues.
 	 */
-	/* TODO - remove this limitation */
 	u8 num_queues;
 	u8 num_cnqs;
 
@@ -210,7 +207,6 @@ enum _ecore_status_t ecore_iov_pci_enable_prolog(struct ecore_hwfn *p_hwfn,
 enum _ecore_status_t ecore_iov_pci_disable_epilog(struct ecore_hwfn *p_hwfn,
 						  struct ecore_ptt *p_ptt);
 
-#ifndef LINUX_REMOVE
 /**
  * @brief mark/clear all VFs before/after an incoming PCIe sriov
  *        disable.
@@ -357,7 +353,6 @@ void ecore_iov_get_link(struct ecore_hwfn *p_hwfn,
  */
 bool ecore_iov_is_vf_pending_flr(struct ecore_hwfn *p_hwfn,
 				 u16 rel_vf_id);
-#endif
 
 /**
  * @brief Check if given VF ID @vfid is valid
drivers/net/qede/base/ecore_l2.c +0 -6
index 646cf07cb..ac3d0f44d 100644
@@ -133,7 +133,6 @@ void ecore_l2_free(struct ecore_hwfn *p_hwfn)
 	p_hwfn->p_l2_info = OSAL_NULL;
 }
 
-/* TODO - we'll need locking around these... */
 static bool ecore_eth_queue_qid_usage_add(struct ecore_hwfn *p_hwfn,
 					  struct ecore_queue_cid *p_cid)
 {
@@ -1268,11 +1267,6 @@ ecore_eth_pf_tx_queue_start(struct ecore_hwfn *p_hwfn,
 	enum _ecore_status_t rc;
 	u16 pq_id;
 
-	/* TODO - set tc in the pq_params for multi-cos.
-	 * If pacing is enabled then select queue according to
-	 * rate limiter availability otherwise select queue based
-	 * on multi cos.
-	 */
 	if (IS_ECORE_PACING(p_hwfn))
 		pq_id = ecore_get_cm_pq_idx_rl(p_hwfn, p_cid->rel.queue_id);
 	else
drivers/net/qede/base/ecore_mcp.c +0 -20
index 2e945556c..eda95dba7 100644
@@ -263,14 +263,6 @@ enum _ecore_status_t ecore_load_mcp_offsets(struct ecore_hwfn *p_hwfn,
 					      OFFSETOF(struct public_mfw_mb,
 						       sup_msgs));
 
-	/* @@@TBD:
-	 * The driver can notify that there was an MCP reset, and might read the
-	 * SHMEM values before the MFW has completed initializing them.
-	 * As a temporary solution, the "sup_msgs" field in the MFW mailbox is
-	 * used as a data ready indication.
-	 * This should be replaced with an actual indication when it is provided
-	 * by the MFW.
-	 */
 	if (!p_info->recovery_mode) {
 		while (!p_info->mfw_mb_length && --cnt) {
 			OSAL_MSLEEP(msec);
@@ -1551,12 +1543,6 @@ static void ecore_read_pf_bandwidth(struct ecore_hwfn *p_hwfn,
 
 	p_info = &p_hwfn->mcp_info->func_info;
 
-	/* TODO - bandwidth min/max should have valid values of 1-100,
-	 * as well as some indication that the feature is disabled.
-	 * Until MFW/qlediag enforce those limitations, Assume THERE IS ALWAYS
-	 * limit and correct value to min `1' and max `100' if limit isn't in
-	 * range.
-	 */
 	p_info->bandwidth_min = GET_MFW_FIELD(p_shmem_info->config,
 					      FUNC_MF_CFG_MIN_BW);
 	if (p_info->bandwidth_min < 1 || p_info->bandwidth_min > 100) {
@@ -1918,7 +1904,6 @@ u32 ecore_get_process_kill_counter(struct ecore_hwfn *p_hwfn,
 {
 	u32 path_offsize_addr, path_offsize, path_addr, proc_kill_cnt;
 
-	/* TODO - Add support for VFs */
 	if (IS_VF(p_hwfn->p_dev))
 		return ECORE_INVAL;
 
@@ -2928,7 +2913,6 @@ enum _ecore_status_t ecore_mcp_get_media_type(struct ecore_hwfn *p_hwfn,
 {
 	*p_media_type = MEDIA_UNSPECIFIED;
 
-	/* TODO - Add support for VFs */
 	if (IS_VF(p_hwfn->p_dev))
 		return ECORE_INVAL;
 
@@ -2968,7 +2952,6 @@ enum _ecore_status_t ecore_mcp_get_transceiver_data(struct ecore_hwfn *p_hwfn,
 	*p_transceiver_type = ETH_TRANSCEIVER_TYPE_NONE;
 	*p_transceiver_state = ETH_TRANSCEIVER_STATE_UPDATING;
 
-	/* TODO - Add support for VFs */
 	if (IS_VF(p_hwfn->p_dev))
 		return ECORE_INVAL;
 
@@ -3144,7 +3127,6 @@ enum _ecore_status_t ecore_mcp_get_board_config(struct ecore_hwfn *p_hwfn,
 {
 	u32 nvm_cfg_addr, nvm_cfg1_offset, port_cfg_addr;
 
-	/* TODO - Add support for VFs */
 	if (IS_VF(p_hwfn->p_dev))
 		return ECORE_INVAL;
 
@@ -3306,11 +3288,9 @@ enum _ecore_status_t ecore_mcp_fill_shmem_func_info(struct ecore_hwfn *p_hwfn,
 		OSAL_MEMCPY(p_hwfn->p_dev->wol_mac, info->mac, ECORE_ETH_ALEN);
 
 	} else {
-		/* TODO - are there protocols for which there's no MAC? */
 		DP_NOTICE(p_hwfn, false, "MAC is 0 in shmem\n");
 	}
 
-	/* TODO - are these calculations true for BE machine? */
 	info->wwn_port = (u64)shmem_info.fcoe_wwn_port_name_lower |
 			 (((u64)shmem_info.fcoe_wwn_port_name_upper) << 32);
 	info->wwn_node = (u64)shmem_info.fcoe_wwn_node_name_lower |
drivers/net/qede/base/ecore_mcp.h +0 -1
index 81d3dc04a..60e2b8307 100644
@@ -15,7 +15,6 @@
 
 /* Using hwfn number (and not pf_num) is required since in CMT mode,
  * same pf_num may be used by two different hwfn
- * TODO - this shouldn't really be in .h file, but until all fields
  * required during hw-init will be placed in their correct place in shmem
  * we need it in ecore_dev.c [for readin the nvram reflection in shmem].
  */
drivers/net/qede/base/ecore_mcp_api.h +0 -4
index 800a23fb1..3c5d8b2aa 100644
@@ -787,7 +787,6 @@ enum _ecore_status_t ecore_mcp_cmd(struct ecore_hwfn *p_hwfn,
 enum _ecore_status_t ecore_mcp_drain(struct ecore_hwfn *p_hwfn,
 				     struct ecore_ptt *p_ptt);
 
-#ifndef LINUX_REMOVE
 /**
  * @brief - return the mcp function info of the hw function
  *
@@ -797,9 +796,7 @@ enum _ecore_status_t ecore_mcp_drain(struct ecore_hwfn *p_hwfn,
  */
 const struct ecore_mcp_function_info
 *ecore_mcp_get_function_info(struct ecore_hwfn *p_hwfn);
-#endif
 
-#ifndef LINUX_REMOVE
 /**
  * @brief - count number of function with a matching personality on engine.
  *
@@ -813,7 +810,6 @@ const struct ecore_mcp_function_info
 int ecore_mcp_get_personality_cnt(struct ecore_hwfn *p_hwfn,
 				  struct ecore_ptt *p_ptt,
 				  u32 personalities);
-#endif
 
 /**
  * @brief Get the flash size value
drivers/net/qede/base/ecore_sp_commands.c +0 -3
index 3a507843a..3ba6d3f19 100644
@@ -413,9 +413,6 @@ enum _ecore_status_t ecore_sp_pf_start(struct ecore_hwfn *p_hwfn,
 		p_ramrod->base_vf_id = (u8)p_iov->first_vf_in_pf;
 		p_ramrod->num_vfs = (u8)p_iov->total_vfs;
 	}
-	/* @@@TBD - update also the "ROCE_VER_KEY" entries when the FW RoCE HSI
-	 * version is available.
-	 */
 	p_ramrod->hsi_fp_ver.major_ver_arr[ETH_VER_KEY] = ETH_HSI_VER_MAJOR;
 	p_ramrod->hsi_fp_ver.minor_ver_arr[ETH_VER_KEY] = ETH_HSI_VER_MINOR;
 
drivers/net/qede/base/ecore_spq.c +0 -5
index dda36c995..08ecb7979 100644
@@ -262,7 +262,6 @@ static void ecore_spq_hw_initialize(struct ecore_hwfn *p_hwfn,
 			&p_cxt_e5->xstorm_st_context.consolid_base_addr;
 	}
 
-	/* @@@TBD we zero the context until we have ilt_reset implemented. */
 	OSAL_MEM_ZERO(p_cxt, core_conn_context_size);
 
 	SET_FIELD(*p_flags10, XSTORM_CORE_CONN_AG_CTX_DQ_CF_EN, 1);
@@ -858,10 +857,6 @@ static enum _ecore_status_t ecore_spq_post_list(struct ecore_hwfn *p_hwfn,
 	struct ecore_spq	*p_spq = p_hwfn->p_spq;
 	enum _ecore_status_t	rc;
 
-	/* TODO - implementation might be wasteful; will always keep room
-	 * for an additional high priority ramrod (even if one is already
-	 * pending FW)
-	 */
 	while (ecore_chain_get_elem_left(&p_spq->chain) > keep_reserve &&
 	       !OSAL_LIST_IS_EMPTY(head)) {
 		struct ecore_spq_entry  *p_ent =
drivers/net/qede/base/ecore_sriov.c +2 -43

201 lines not on this page · raw message

drivers/net/qede/base/ecore_sriov.h +0 -1
index 8d8a12b92..3fada4ba8 100644
@@ -192,7 +192,6 @@ struct ecore_vf_info {
 
 	u16			igu_sbs[ECORE_MAX_VF_CHAINS_PER_PF];
 
-	/* TODO - Only windows is using it - should be removed */
 	u8 was_malicious;
 	u8 num_active_rxqs;
 	void *ctx;
drivers/net/qede/base/ecore_vf.c +0 -4
index 9b99e9281..8879b6722 100644
@@ -113,7 +113,6 @@ ecore_send_msg2pf(struct ecore_hwfn *p_hwfn,
 					   p_hwfn->vf_iov_info->pf2vf_reply,
 					   sizeof(union vfpf_tlvs),
 					   resp_size);
-		/* TODO - no prints about message ? */
 		return rc;
 	}
 #endif
@@ -335,7 +334,6 @@ enum _ecore_status_t ecore_vf_pf_acquire(struct ecore_hwfn *p_hwfn)
 	req = ecore_vf_pf_prep(p_hwfn, CHANNEL_TLV_ACQUIRE, sizeof(*req));
 	p_resc = &req->resc_request;
 
-	/* @@@ TBD: PF may not be ready bnx2x_get_vf_id... */
 	req->vfdev_info.opaque_fid = p_hwfn->hw_info.opaque_fid;
 
 	p_resc->num_rxqs = ECORE_MAX_QUEUE_VF_CHAINS_PER_PF;
@@ -1143,8 +1141,6 @@ enum _ecore_status_t ecore_vf_pf_rxqs_update(struct ecore_hwfn *p_hwfn,
 
 	/* Starting with CHANNEL_TLV_QID and the need for additional queue
 	 * information, this API stopped supporting multiple rxqs.
-	 * TODO - remove this and change the API to accept a single queue-cid
-	 * in a follow-up patch.
 	 */
 	if (num_rxqs != 1) {
 		DP_NOTICE(p_hwfn, true,
drivers/net/qede/base/ecore_vf.h +0 -3
index 098cbe6b3..6da949fe8 100644
@@ -185,9 +185,7 @@ enum _ecore_status_t ecore_vf_pf_rxq_stop(struct ecore_hwfn *p_hwfn,
 enum _ecore_status_t ecore_vf_pf_txq_stop(struct ecore_hwfn *p_hwfn,
 					  struct ecore_queue_cid *p_cid);
 
-/* TODO - fix all the !SRIOV prototypes */
 
-#ifndef LINUX_REMOVE
 /**
  * @brief VF - update the RX queue by sending a message to the
  *        PF
@@ -205,7 +203,6 @@ enum _ecore_status_t ecore_vf_pf_rxqs_update(struct ecore_hwfn *p_hwfn,
 					     u8 num_rxqs,
 					     u8 comp_cqe_flg,
 					     u8 comp_event_flg);
-#endif
 
 /**
  * @brief VF - send a vport update command
drivers/net/qede/base/ecore_vf_api.h +0 -2
index b664dafbd..5f638aede 100644
@@ -150,7 +150,6 @@ bool ecore_vf_check_mac(struct ecore_hwfn *p_hwfn, u8 *mac);
  */
 void ecore_vf_init_admin_mac(struct ecore_hwfn *p_hwfn, u8 *p_mac);
 
-#ifndef LINUX_REMOVE
 /**
  * @brief Copy forced MAC address from bulletin board
  *
@@ -192,7 +191,6 @@ bool ecore_vf_get_pre_fp_hsi(struct ecore_hwfn *p_hwfn);
  */
 void ecore_vf_db_recovery_execute(struct ecore_hwfn *p_hwfn);
 
-#endif
 
 /**
  * @brief Set firmware version information in dev_info from VFs acquire response tlv
drivers/net/qede/base/ecore_vfpf_if.h +2 -7
index e03db7c2b..45a0ae429 100644
@@ -7,8 +7,8 @@
 #ifndef __ECORE_VF_PF_IF_H__
 #define __ECORE_VF_PF_IF_H__
 
-#define T_ETH_INDIRECTION_TABLE_SIZE 128 /* @@@ TBD MichalK this should be HSI? */
-#define T_ETH_RSS_KEY_SIZE 10 /* @@@ TBD this should be HSI? */
+#define T_ETH_INDIRECTION_TABLE_SIZE 128
+#define T_ETH_RSS_KEY_SIZE 10
 
 /***********************************************
  *
@@ -94,20 +94,17 @@ struct vfpf_acquire_tlv {
 	struct vfpf_first_tlv first_tlv;
 
 	struct vf_pf_vfdev_info {
-#ifndef LINUX_REMOVE
 	/* First bit was used on 8.7.x and 8.8.x versions, which had different
 	 * FWs used but with the same faspath HSI. As this was prior to the
 	 * fastpath versioning, wanted to have ability to override fw matching
 	 * and allow them to interact.
 	 */
-#endif
 #define VFPF_ACQUIRE_CAP_PRE_FP_HSI	(1 << 0) /* VF pre-FP hsi version */
 #define VFPF_ACQUIRE_CAP_100G		(1 << 1) /* VF can support 100g */
 
 	/* A requirement for supporting multi-Tx queues on a single queue-zone,
 	 * VF would pass qids as additional information whenever passing queue
 	 * references.
-	 * TODO - due to the CID limitations in Bar0, VFs currently don't pass
 	 * this, and use the legacy CID scheme.
 	 */
 #define VFPF_ACQUIRE_CAP_QUEUE_QIDS	(1 << 2)
@@ -203,11 +200,9 @@ struct pfvf_acquire_resp_tlv {
  * To overcome this, PFs now indicate that they're past that point and the new
  * VFs would fail probe on the older PFs that fail to do so.
  */
-#ifndef LINUX_REMOVE
 /* Said bug was in quest/serpens; Can't be certain no official release included
  * the bug since the fix arrived very late in the programs.
  */
-#endif
 #define PFVF_ACQUIRE_CAP_POST_FW_OVERRIDE	(1 << 2)
 
 	/* PF expects queues to be received with additional qids */
drivers/net/qede/base/mcp_public.h +0 -2
index 437482422..aace40dc5 100644
@@ -367,7 +367,6 @@ struct lldp_config_params_s {
 
 struct lldp_status_params_s {
 	u32 prefix_seq_num;
-	u32 status; /* TBD */
 	/* Holds remote Chassis ID TLV header, subtype and 9B of payload. */
 	u32 peer_chassis_id[LLDP_CHASSIS_ID_STAT_LEN];
 	/* Holds remote Port ID TLV header, subtype and 9B of payload. */
@@ -605,7 +604,6 @@ enum _attribute_commands_e {
 struct public_global {
 	u32 max_path;	/* 32bit is wasty, but this will be used often */
 	u32 max_ports;	/* (Global) 32bit is wasty, but this will be used often */
-#define MODE_1P	1		/* TBD - NEED TO THINK OF A BETTER NAME */
 #define MODE_2P	2
 #define MODE_3P	3
 #define MODE_4P	4
drivers/net/qede/qede_ethdev.c +0 -1
index 8b151e907..93c39c5b9 100644
@@ -1193,7 +1193,6 @@ static int qede_dev_stop(struct rte_eth_dev *eth_dev)
 	qede_stop_queues(eth_dev);
 
 	/* Disable traffic */
-	ecore_hw_stop_fastpath(edev); /* TBD - loop */
 
 	DP_INFO(edev, "Device is stopped\n");
 
drivers/net/qede/qede_main.c +0 -1
index 4f99ab8b7..ae32f1e86 100644
@@ -433,7 +433,6 @@ qed_fill_eth_dev_info(struct ecore_dev *edev, struct qed_dev_eth_info *info)
 
 	memset(info, 0, sizeof(*info));
 
-	info->num_tc = 1 /* @@@TBD aelior MULTI_COS */;
 
 	if (IS_PF(edev)) {
 		int max_vf_vlan_filters = 0;
drivers/net/qede/qede_rxtx.c +0 -5
index b6ff59457..ebc010d2d 100644
@@ -1395,7 +1395,6 @@ qede_rx_process_tpa_end_cqe(struct qede_dev *qdev,
 					     cqe->len_list[0]);
 	/* Update total length and frags based on end TPA */
 	rx_mb = rxq->tpa_info[cqe->tpa_agg_index].tpa_head;
-	/* TODO:  Add Sanity Checks */
 	rx_mb->nb_segs = cqe->num_of_bds;
 	rx_mb->pkt_len = cqe->total_packet_len;
 
@@ -2172,7 +2171,6 @@ qede_xmit_prep_pkts(__rte_unused void *p_txq, struct rte_mbuf **tx_pkts,
 				rte_errno = EINVAL;
 				break;
 			}
-			/* TBD: confirm its ~9700B for both ? */
 			if (m->tso_segsz > ETH_TX_MAX_NON_LSO_PKT_LEN) {
 				rte_errno = EINVAL;
 				break;
@@ -2529,9 +2527,6 @@ qede_xmit_pkts(void *p_txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 							1 << ETH_TX_DATA_2ND_BD_L4_UDP_SHIFT;
 					}
 
-					/* TODO other pseudo checksum modes are
-					 * not supported
-					 */
 					bd2_bf1 |=
 					ETH_L4_PSEUDO_CSUM_CORRECT_LENGTH <<
 					ETH_TX_DATA_2ND_BD_L4_PSEUDO_CSUM_MODE_SHIFT;
drivers/net/qede/qede_sriov.c +0 -4
index 0b99a8d6f..9fa227cc4 100644
@@ -138,10 +138,6 @@ static void qed_handle_bulletin_post(struct ecore_hwfn *hwfn)
 		return;
 	}
 
-	/* TODO - at the moment update bulletin board of all VFs.
-	 * if this proves to costly, we can mark VFs that need their
-	 * bulletins updated.
-	 */
 	ecore_for_each_vf(hwfn, i)
 		ecore_iov_post_vf_bulletin(hwfn, i, ptt);
 
Signature · 1 line
2.18.0
#7 lore raw
In reply to Rasesh Mody
Quoted 106 lines

From: Rasesh Mody <[email protected]>
Sent: Friday, February 19, 2021 3:44 PM

Hi,

This patch series adds support for new HW while modifying existing driver to continue supporting previous HWs.
Highlights of changes:
- Registers, HW specific and initialization updates for new HW
- FW upgrade
- Base driver upgrade, other optimizations and cleanup

The new 50xxx family of Marvell QLogic fastlinq adapters will bring in support for higher speeds, will increase max PPS rates significantly.
This family will eventually support flexible flow steering and various in-device switching modes.

At the same time, that’s the same architecture and design, as with previous QEDE driver. Thus, a lot of fast path and slow path code is expected to be the same.

Please note for checkpatch 100 character max_line_length was used.

Thanks,
Rasesh

Rasesh Mody (7):
net/qede/base: update and add register definitions net/qede/base: changes for HSI to support new HW net/qede/base: add OS abstracted changes net/qede/base: update base driver to 8.62.4.0 net/qede: changes for DMA page chain allocation and free net/qede: add support for new HW
net/qede/base: clean unnecessary ifdef and comments

 drivers/net/qede/base/bcm_osal.c              |      1 -
 drivers/net/qede/base/bcm_osal.h              |     42 +-
 drivers/net/qede/base/common_hsi.h            |   1752 +-
 drivers/net/qede/base/ecore.h                 |    575 +-
 drivers/net/qede/base/ecore_attn_values.h     |      3 +-
 drivers/net/qede/base/ecore_chain.h           |    242 +-
 drivers/net/qede/base/ecore_cxt.c             |   1234 +-
 drivers/net/qede/base/ecore_cxt.h             |    149 +-
 drivers/net/qede/base/ecore_cxt_api.h         |     31 +-
 drivers/net/qede/base/ecore_dcbx.c            |    526 +-
 drivers/net/qede/base/ecore_dcbx.h            |     16 +-
 drivers/net/qede/base/ecore_dcbx_api.h        |     41 +-
 drivers/net/qede/base/ecore_dev.c             |   4083 +-
 drivers/net/qede/base/ecore_dev_api.h         |    367 +-
 drivers/net/qede/base/ecore_gtt_reg_addr.h    |     93 +-
 drivers/net/qede/base/ecore_gtt_values.h      |      4 +-
 drivers/net/qede/base/ecore_hsi_common.h      |   2722 +-
 drivers/net/qede/base/ecore_hsi_debug_tools.h |    426 +-
 drivers/net/qede/base/ecore_hsi_eth.h         |   4541 +-
 drivers/net/qede/base/ecore_hsi_func_common.h |      5 +-
 drivers/net/qede/base/ecore_hsi_init_func.h   |    707 +-
 drivers/net/qede/base/ecore_hsi_init_tool.h   |    254 +-
 drivers/net/qede/base/ecore_hw.c              |    386 +-
 drivers/net/qede/base/ecore_hw.h              |     55 +-
 drivers/net/qede/base/ecore_hw_defs.h         |     45 +-
 drivers/net/qede/base/ecore_init_fw_funcs.c   |   1365 +-
 drivers/net/qede/base/ecore_init_fw_funcs.h   |    457 +-
 drivers/net/qede/base/ecore_init_ops.c        |    159 +-
 drivers/net/qede/base/ecore_init_ops.h        |     19 +-
 drivers/net/qede/base/ecore_int.c             |   1363 +-
 drivers/net/qede/base/ecore_int.h             |     65 +-
 drivers/net/qede/base/ecore_int_api.h         |    127 +-
 drivers/net/qede/base/ecore_iov_api.h         |    118 +-
 drivers/net/qede/base/ecore_iro.h             |    427 +-
 drivers/net/qede/base/ecore_iro_values.h      |    463 +-
 drivers/net/qede/base/ecore_l2.c              |    497 +-
 drivers/net/qede/base/ecore_l2.h              |     18 +-
 drivers/net/qede/base/ecore_l2_api.h          |    148 +-
 drivers/net/qede/base/ecore_mcp.c             |   2631 +-
 drivers/net/qede/base/ecore_mcp.h             |    125 +-
 drivers/net/qede/base/ecore_mcp_api.h         |    471 +-
 drivers/net/qede/base/ecore_mng_tlv.c         |    910 +-
 drivers/net/qede/base/ecore_proto_if.h        |     69 +-
 drivers/net/qede/base/ecore_rt_defs.h         |    895 +-
 drivers/net/qede/base/ecore_sp_api.h          |      6 +-
 drivers/net/qede/base/ecore_sp_commands.c     |    141 +-
 drivers/net/qede/base/ecore_sp_commands.h     |     18 +-
 drivers/net/qede/base/ecore_spq.c             |    431 +-
 drivers/net/qede/base/ecore_spq.h             |     65 +-
 drivers/net/qede/base/ecore_sriov.c           |   1700 +-
 drivers/net/qede/base/ecore_sriov.h           |    147 +-
 drivers/net/qede/base/ecore_status.h          |      4 +-
 drivers/net/qede/base/ecore_utils.h           |     18 +-
 drivers/net/qede/base/ecore_vf.c              |    550 +-
 drivers/net/qede/base/ecore_vf.h              |     57 +-
 drivers/net/qede/base/ecore_vf_api.h          |     74 +-
 drivers/net/qede/base/ecore_vfpf_if.h         |    122 +-
 drivers/net/qede/base/eth_common.h            |    300 +-
 drivers/net/qede/base/mcp_public.h            |   2343 +-
 drivers/net/qede/base/nvm_cfg.h               |   5059 +-
 drivers/net/qede/base/reg_addr.h              | 190590 ++++++++++++++-
 drivers/net/qede/qede_debug.c                 |    117 +-
 drivers/net/qede/qede_ethdev.c                |     11 +-
 drivers/net/qede/qede_ethdev.h                |     11 +-
 drivers/net/qede/qede_if.h                    |     20 +-
 drivers/net/qede/qede_main.c                  |      4 +-
 drivers/net/qede/qede_rxtx.c                  |     89 +-
 drivers/net/qede/qede_sriov.c                 |      4 -
 lib/librte_eal/include/rte_bitops.h           |     54 +-
 69 files changed, 215373 insertions(+), 15189 deletions(-)
Quoted 1 line

--

Please discard this v1 patch set due to the size issues encountered. We'll send a v2 series.

Thanks!
Rasesh