net/bnxt: support Thor template

Template adds non-VF representor based support.
Item matches supported:
- DMAC, SIP, DIP, Proto, Sport, Dport
- SIP, DIP, Proto, Sport, Dport
Actions supported:
- count, drop

Signed-off-by: Mike Baucom <michael.baucom@broadcom.com>
Signed-off-by: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>
Reviewed-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>

diff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_enum.h b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_enum.h
index a38fdda..b6db49c 100644 (file)
--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_enum.h
+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_enum.h
@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 
-/* date: Wed Apr 14 09:56:27 2021 */
+/* date: Thu May 13 18:15:56 2021 */
 
 #ifndef ULP_TEMPLATE_DB_H_
 #define ULP_TEMPLATE_DB_H_
@@ -26,10 +26,10 @@
 #define BNXT_ULP_ACT_HID_SHFTR 27
 #define BNXT_ULP_ACT_HID_SHFTL 26
 #define BNXT_ULP_ACT_HID_MASK 2047
-#define BNXT_ULP_APP_RESOURCE_RESV_LIST_MAX_SZ 4
-#define BNXT_ULP_GLB_RESOURCE_TBL_MAX_SZ 33
-#define BNXT_ULP_APP_GLB_RESOURCE_TBL_MAX_SZ 38
-#define BNXT_ULP_RESOURCE_RESV_LIST_MAX_SZ 205
+#define BNXT_ULP_APP_RESOURCE_RESV_LIST_MAX_SZ 8
+#define BNXT_ULP_GLB_RESOURCE_TBL_MAX_SZ 43
+#define BNXT_ULP_APP_GLB_RESOURCE_TBL_MAX_SZ 50
+#define BNXT_ULP_RESOURCE_RESV_LIST_MAX_SZ 204
 #define BNXT_ULP_APP_CAP_TBL_MAX_SZ 6
 #define BNXT_ULP_COND_GOTO_REJECT 1023
 #define BNXT_ULP_COND_GOTO_RF 0x10000
@@ -44,11 +44,11 @@
 #define ULP_WH_PLUS_CLASS_RESULT_FIELD_LIST_SIZE 546
 #define ULP_WH_PLUS_CLASS_COND_LIST_SIZE 43
 #define ULP_THOR_CLASS_TMPL_LIST_SIZE 5
-#define ULP_THOR_CLASS_TBL_LIST_SIZE 13
-#define ULP_THOR_CLASS_KEY_INFO_LIST_SIZE 0
-#define ULP_THOR_CLASS_IDENT_LIST_SIZE 0
-#define ULP_THOR_CLASS_RESULT_FIELD_LIST_SIZE 102
-#define ULP_THOR_CLASS_COND_LIST_SIZE 1
+#define ULP_THOR_CLASS_TBL_LIST_SIZE 33
+#define ULP_THOR_CLASS_KEY_INFO_LIST_SIZE 242
+#define ULP_THOR_CLASS_IDENT_LIST_SIZE 8
+#define ULP_THOR_CLASS_RESULT_FIELD_LIST_SIZE 259
+#define ULP_THOR_CLASS_COND_LIST_SIZE 13
 #define ULP_WH_PLUS_ACT_TMPL_LIST_SIZE 7
 #define ULP_WH_PLUS_ACT_TBL_LIST_SIZE 35
 #define ULP_WH_PLUS_ACT_KEY_INFO_LIST_SIZE 2
@@ -56,11 +56,11 @@
 #define ULP_WH_PLUS_ACT_RESULT_FIELD_LIST_SIZE 512
 #define ULP_WH_PLUS_ACT_COND_LIST_SIZE 39
 #define ULP_THOR_ACT_TMPL_LIST_SIZE 7
-#define ULP_THOR_ACT_TBL_LIST_SIZE 0
+#define ULP_THOR_ACT_TBL_LIST_SIZE 2
 #define ULP_THOR_ACT_KEY_INFO_LIST_SIZE 0
 #define ULP_THOR_ACT_IDENT_LIST_SIZE 0
-#define ULP_THOR_ACT_RESULT_FIELD_LIST_SIZE 0
-#define ULP_THOR_ACT_COND_LIST_SIZE 0
+#define ULP_THOR_ACT_RESULT_FIELD_LIST_SIZE 18
+#define ULP_THOR_ACT_COND_LIST_SIZE 5
 
 enum bnxt_ulp_act_bit {
        BNXT_ULP_ACT_BIT_MARK                = 0x0000000000000001,
@@ -199,7 +199,8 @@ enum bnxt_ulp_cf_idx {
        BNXT_ULP_CF_IDX_FLOW_SIG_ID = 60,
        BNXT_ULP_CF_IDX_WC_MATCH = 61,
        BNXT_ULP_CF_IDX_WC_IS_HA_HIGH_REG = 62,
-       BNXT_ULP_CF_IDX_LAST = 63
+       BNXT_ULP_CF_IDX_F1_DMAC = 63,
+       BNXT_ULP_CF_IDX_LAST = 64
 };
 
 enum bnxt_ulp_cond_list_opc {
@@ -345,23 +346,31 @@ enum bnxt_ulp_glb_rf_idx {
        BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID = 3,
        BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID = 4,
        BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR = 5,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 = 6,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1 = 7,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_2 = 8,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 = 9,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 = 10,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_0 = 11,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_1 = 12,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 = 13,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1 = 14,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2 = 15,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_KEY_ID_0 = 16,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_KEY_ID_1 = 17,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0 = 18,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_1 = 19,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0 = 20,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1 = 21,
-       BNXT_ULP_GLB_RF_IDX_LAST = 22
+       BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0 = 6,
+       BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1 = 7,
+       BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0 = 8,
+       BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_1 = 9,
+       BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0 = 10,
+       BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1 = 11,
+       BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_0 = 12,
+       BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_1 = 13,
+       BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 = 14,
+       BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1 = 15,
+       BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_2 = 16,
+       BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 = 17,
+       BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 = 18,
+       BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_0 = 19,
+       BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_1 = 20,
+       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 = 21,
+       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1 = 22,
+       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2 = 23,
+       BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_KEY_ID_0 = 24,
+       BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_KEY_ID_1 = 25,
+       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0 = 26,
+       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_1 = 27,
+       BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0 = 28,
+       BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1 = 29,
+       BNXT_ULP_GLB_RF_IDX_LAST = 30
 };
 
 enum bnxt_ulp_hdr_type {

diff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.c b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.c
index 7573cf6..6664353 100644 (file)
--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.c
+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.c
@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 
-/* date: Wed Apr 14 09:56:27 2021 */
+/* date: Thu May 13 18:15:56 2021 */
 
 #include "ulp_template_db_enum.h"
 #include "ulp_template_db_field.h"
@@ -36,7 +36,7 @@ struct bnxt_ulp_generic_tbl_params ulp_generic_tbl_params[] = {
                BNXT_ULP_DIRECTION_INGRESS] = {
        .name                    = "INGRESS GENERIC_TABLE_PROFILE_TCAM",
        .result_num_entries      = 16384,
-       .result_num_bytes        = 16,
+       .result_num_bytes        = 18,
        .key_num_bytes           = 0,
        .num_buckets             = 0,
        .hash_tbl_entries        = 0,
@@ -46,7 +46,7 @@ struct bnxt_ulp_generic_tbl_params ulp_generic_tbl_params[] = {
                BNXT_ULP_DIRECTION_EGRESS] = {
        .name                    = "EGRESS GENERIC_TABLE_PROFILE_TCAM",
        .result_num_entries      = 16384,
-       .result_num_bytes        = 16,
+       .result_num_bytes        = 18,
        .key_num_bytes           = 0,
        .num_buckets             = 0,
        .hash_tbl_entries        = 0,
@@ -167,6 +167,8 @@ const struct bnxt_ulp_template_device_tbls ulp_template_thor_tbls[] = {
        .tmpl_list_size          = ULP_THOR_ACT_TMPL_LIST_SIZE,
        .tbl_list                = ulp_thor_act_tbl_list,
        .tbl_list_size           = ULP_THOR_ACT_TBL_LIST_SIZE,
+       .cond_list               = ulp_thor_act_cond_list,
+       .cond_list_size          = ULP_THOR_ACT_COND_LIST_SIZE,
        .result_field_list       = ulp_thor_act_result_field_list,
        .result_field_list_size  = ULP_THOR_ACT_RESULT_FIELD_LIST_SIZE
        }
@@ -188,7 +190,7 @@ struct bnxt_ulp_device_params ulp_device_params[BNXT_ULP_DEVICE_ID_LAST] = {
        .num_phy_ports           = 2,
        .ext_cntr_table_type     = 0,
        .byte_count_mask         = 0x0000000fffffffff,
-       .packet_count_mask       = 0xffffffff00000000,
+       .packet_count_mask       = 0xfffffff000000000,
        .byte_count_shift        = 0,
        .packet_count_shift      = 36,
        .dynamic_pad_en          = 0,
@@ -207,17 +209,17 @@ struct bnxt_ulp_device_params ulp_device_params[BNXT_ULP_DEVICE_ID_LAST] = {
        .num_resources_per_flow  = 8,
        .num_phy_ports           = 2,
        .ext_cntr_table_type     = 0,
-       .byte_count_mask         = 0x0000000fffffffff,
-       .packet_count_mask       = 0xffffffff00000000,
+       .byte_count_mask         = 0x00000007ffffffff,
+       .packet_count_mask       = 0xfffffff800000000,
        .byte_count_shift        = 0,
-       .packet_count_shift      = 36,
+       .packet_count_shift      = 35,
        .dynamic_pad_en          = 1,
        .em_blk_size_bits        = 100,
        .em_blk_align_bits       = 128,
        .em_key_align_bytes      = 80,
        .wc_slice_width          = 160,
        .wc_max_slices           = 4,
-       .wc_mode_list       = {0x0000000c, 0x0000000e, 0x0000000f, 0x0000000f},
+       .wc_mode_list            = {0x0000000c, 0x0000000e, 0x0000000f, 0x0000000f},
        .wc_mod_list_max_size    = 4,
        .wc_ctl_size_bits        = 32,
        .dev_tbls                = ulp_template_thor_tbls
@@ -252,28 +254,40 @@ struct bnxt_ulp_app_capabilities_info ulp_app_cap_info_list[] = {
        .app_id                  = 1,
        .device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
        .flags                   = BNXT_ULP_APP_CAP_SHARED_EN |
-                               BNXT_ULP_APP_CAP_HOT_UPGRADE_EN
+                                  BNXT_ULP_APP_CAP_HOT_UPGRADE_EN |
+                                  BNXT_ULP_APP_CAP_UNICAST_ONLY
        },
        {
        .app_id                  = 1,
        .device_id               = BNXT_ULP_DEVICE_ID_THOR,
        .flags                   = BNXT_ULP_APP_CAP_SHARED_EN |
-                               BNXT_ULP_APP_CAP_HOT_UPGRADE_EN
+                                  BNXT_ULP_APP_CAP_HOT_UPGRADE_EN |
+                                  BNXT_ULP_APP_CAP_UNICAST_ONLY
        },
        {
        .app_id                  = 2,
        .device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-       .flags                   = BNXT_ULP_APP_CAP_SHARED_EN
+       .flags                   = BNXT_ULP_APP_CAP_SHARED_EN |
+                                  BNXT_ULP_APP_CAP_UNICAST_ONLY
        },
        {
        .app_id                  = 2,
        .device_id               = BNXT_ULP_DEVICE_ID_THOR,
-       .flags                   = BNXT_ULP_APP_CAP_SHARED_EN
+       .flags                   = BNXT_ULP_APP_CAP_SHARED_EN |
+                                  BNXT_ULP_APP_CAP_UNICAST_ONLY
        }
 };
 
 /* List of unnamed app tf resources required to be reserved per app/device */
 struct bnxt_ulp_resource_resv_info ulp_app_resource_resv_list[] = {
+       {
+       .app_id                  = 1,
+       .device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
+       .direction               = TF_DIR_RX,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
+       .resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
+       .count                   = 2
+       },
        {
        .app_id                  = 1,
        .device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
@@ -287,8 +301,24 @@ struct bnxt_ulp_resource_resv_info ulp_app_resource_resv_list[] = {
        .device_id               = BNXT_ULP_DEVICE_ID_THOR,
        .direction               = TF_DIR_RX,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
+       .resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
+       .count                   = 2
+       },
+       {
+       .app_id                  = 1,
+       .device_id               = BNXT_ULP_DEVICE_ID_THOR,
+       .direction               = TF_DIR_RX,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
        .resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-       .count                   = 512
+       .count                   = 1024
+       },
+       {
+       .app_id                  = 2,
+       .device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
+       .direction               = TF_DIR_RX,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
+       .resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
+       .count                   = 2
        },
        {
        .app_id                  = 2,
@@ -303,8 +333,16 @@ struct bnxt_ulp_resource_resv_info ulp_app_resource_resv_list[] = {
        .device_id               = BNXT_ULP_DEVICE_ID_THOR,
        .direction               = TF_DIR_RX,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
+       .resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
+       .count                   = 2
+       },
+       {
+       .app_id                  = 2,
+       .device_id               = BNXT_ULP_DEVICE_ID_THOR,
+       .direction               = TF_DIR_RX,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
        .resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-       .count                   = 512
+       .count                   = 1024
        }
 };
 
@@ -322,6 +360,22 @@ struct bnxt_ulp_glb_resource_info ulp_app_glb_resource_tbl[] = {
        .app_id                  = 1,
        .device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+       .resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+       .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1,
+       .direction               = TF_DIR_RX
+       },
+       {
+       .app_id                  = 1,
+       .device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+       .resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+       .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_2,
+       .direction               = TF_DIR_RX
+       },
+       {
+       .app_id                  = 1,
+       .device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
        .resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
        .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0,
        .direction               = TF_DIR_RX
@@ -361,6 +415,14 @@ struct bnxt_ulp_glb_resource_info ulp_app_glb_resource_tbl[] = {
        {
        .app_id                  = 1,
        .device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+       .resource_type           = TF_IDENT_TYPE_WC_PROF,
+       .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2,
+       .direction               = TF_DIR_RX
+       },
+       {
+       .app_id                  = 1,
+       .device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
        .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0,
@@ -386,6 +448,22 @@ struct bnxt_ulp_glb_resource_info ulp_app_glb_resource_tbl[] = {
        .app_id                  = 1,
        .device_id               = BNXT_ULP_DEVICE_ID_THOR,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+       .resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+       .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1,
+       .direction               = TF_DIR_RX
+       },
+       {
+       .app_id                  = 1,
+       .device_id               = BNXT_ULP_DEVICE_ID_THOR,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+       .resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+       .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_2,
+       .direction               = TF_DIR_RX
+       },
+       {
+       .app_id                  = 1,
+       .device_id               = BNXT_ULP_DEVICE_ID_THOR,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
        .resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
        .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0,
        .direction               = TF_DIR_RX
@@ -425,6 +503,14 @@ struct bnxt_ulp_glb_resource_info ulp_app_glb_resource_tbl[] = {
        {
        .app_id                  = 1,
        .device_id               = BNXT_ULP_DEVICE_ID_THOR,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+       .resource_type           = TF_IDENT_TYPE_WC_PROF,
+       .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2,
+       .direction               = TF_DIR_RX
+       },
+       {
+       .app_id                  = 1,
+       .device_id               = BNXT_ULP_DEVICE_ID_THOR,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type           = TF_TBL_TYPE_EM_FKB,
        .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_KEY_ID_0,
@@ -474,6 +560,22 @@ struct bnxt_ulp_glb_resource_info ulp_app_glb_resource_tbl[] = {
        .app_id                  = 2,
        .device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+       .resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+       .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1,
+       .direction               = TF_DIR_RX
+       },
+       {
+       .app_id                  = 2,
+       .device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+       .resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+       .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_2,
+       .direction               = TF_DIR_RX
+       },
+       {
+       .app_id                  = 2,
+       .device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
        .resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
        .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0,
        .direction               = TF_DIR_RX
@@ -513,6 +615,14 @@ struct bnxt_ulp_glb_resource_info ulp_app_glb_resource_tbl[] = {
        {
        .app_id                  = 2,
        .device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+       .resource_type           = TF_IDENT_TYPE_WC_PROF,
+       .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2,
+       .direction               = TF_DIR_RX
+       },
+       {
+       .app_id                  = 2,
+       .device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
        .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0,
@@ -538,6 +648,22 @@ struct bnxt_ulp_glb_resource_info ulp_app_glb_resource_tbl[] = {
        .app_id                  = 2,
        .device_id               = BNXT_ULP_DEVICE_ID_THOR,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+       .resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+       .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1,
+       .direction               = TF_DIR_RX
+       },
+       {
+       .app_id                  = 2,
+       .device_id               = BNXT_ULP_DEVICE_ID_THOR,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+       .resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+       .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_2,
+       .direction               = TF_DIR_RX
+       },
+       {
+       .app_id                  = 2,
+       .device_id               = BNXT_ULP_DEVICE_ID_THOR,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
        .resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
        .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0,
        .direction               = TF_DIR_RX
@@ -577,6 +703,14 @@ struct bnxt_ulp_glb_resource_info ulp_app_glb_resource_tbl[] = {
        {
        .app_id                  = 2,
        .device_id               = BNXT_ULP_DEVICE_ID_THOR,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+       .resource_type           = TF_IDENT_TYPE_WC_PROF,
+       .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2,
+       .direction               = TF_DIR_RX
+       },
+       {
+       .app_id                  = 2,
+       .device_id               = BNXT_ULP_DEVICE_ID_THOR,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type           = TF_TBL_TYPE_EM_FKB,
        .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_KEY_ID_0,
@@ -684,6 +818,22 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {
        },
        {
        .app_id                  = 0,
+       .device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+       .resource_type           = TF_IDENT_TYPE_EM_PROF,
+       .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
+       .direction               = TF_DIR_RX
+       },
+       {
+       .app_id                  = 0,
+       .device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+       .resource_type           = TF_IDENT_TYPE_WC_PROF,
+       .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
+       .direction               = TF_DIR_RX
+       },
+       {
+       .app_id                  = 0,
        .device_id               = BNXT_ULP_DEVICE_ID_THOR,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
        .resource_type           = TF_IDENT_TYPE_PROF_FUNC,
@@ -707,6 +857,70 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {
        .direction               = TF_DIR_TX
        },
        {
+       .app_id                  = 0,
+       .device_id               = BNXT_ULP_DEVICE_ID_THOR,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+       .resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+       .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
+       .direction               = TF_DIR_RX
+       },
+       {
+       .app_id                  = 0,
+       .device_id               = BNXT_ULP_DEVICE_ID_THOR,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+       .resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+       .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
+       .direction               = TF_DIR_TX
+       },
+       {
+       .app_id                  = 0,
+       .device_id               = BNXT_ULP_DEVICE_ID_THOR,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+       .resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+       .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
+       .direction               = TF_DIR_RX
+       },
+       {
+       .app_id                  = 0,
+       .device_id               = BNXT_ULP_DEVICE_ID_THOR,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+       .resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
+       .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
+       .direction               = TF_DIR_RX
+       },
+       {
+       .app_id                  = 0,
+       .device_id               = BNXT_ULP_DEVICE_ID_THOR,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+       .resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
+       .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
+       .direction               = TF_DIR_TX
+       },
+       {
+       .app_id                  = 0,
+       .device_id               = BNXT_ULP_DEVICE_ID_THOR,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+       .resource_type           = TF_IDENT_TYPE_EM_PROF,
+       .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
+       .direction               = TF_DIR_RX
+       },
+       {
+       .app_id                  = 0,
+       .device_id               = BNXT_ULP_DEVICE_ID_THOR,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+       .resource_type           = TF_IDENT_TYPE_WC_PROF,
+       .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
+       .direction               = TF_DIR_RX
+       },
+       {
+       .app_id                  = 0,
+       .device_id               = BNXT_ULP_DEVICE_ID_THOR,
+       .resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+       .resource_type           = TF_TBL_TYPE_WC_FKB,
+       .glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
+       .direction               = TF_DIR_RX
+       },
+       {
        .app_id                  = 1,
        .device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
@@ -1196,7 +1410,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
        .direction               = TF_DIR_RX,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
        .resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-       .count                   = 26
+       .count                   = 422
        },
        {
        .app_id                  = 0,
@@ -1252,7 +1466,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
        .direction               = TF_DIR_RX,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-       .count                   = 14
+       .count                   = 5
        },
        {
        .app_id                  = 0,
@@ -1268,7 +1482,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
        .direction               = TF_DIR_RX,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type           = TF_TBL_TYPE_WC_FKB,
-       .count                   = 32
+       .count                   = 31
        },
        {
        .app_id                  = 0,
@@ -1316,7 +1530,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
        .direction               = TF_DIR_RX,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
        .resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-       .count                   = 112
+       .count                   = 2048
        },
        {
        .app_id                  = 0,
@@ -1372,7 +1586,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
        .direction               = TF_DIR_TX,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-       .count                   = 1024
+       .count                   = 1023
        },
        {
        .app_id                  = 0,
@@ -1388,7 +1602,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
        .direction               = TF_DIR_TX,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-       .count                   = 14
+       .count                   = 5
        },
        {
        .app_id                  = 0,
@@ -1426,14 +1640,6 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
        .app_id                  = 0,
        .device_id               = BNXT_ULP_DEVICE_ID_THOR,
        .direction               = TF_DIR_TX,
-       .resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-       .resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-       .count                   = 1
-       },
-       {
-       .app_id                  = 0,
-       .device_id               = BNXT_ULP_DEVICE_ID_THOR,
-       .direction               = TF_DIR_TX,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
        .resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
        .count                   = 200
@@ -1460,7 +1666,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
        .direction               = TF_DIR_TX,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
        .resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-       .count                   = 128
+       .count                   = 2048
        },
        {
        .app_id                  = 0,
@@ -1772,7 +1978,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
        .direction               = TF_DIR_RX,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
        .resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-       .count                   = 32
+       .count                   = 16
        },
        {
        .app_id                  = 1,
@@ -1788,7 +1994,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
        .direction               = TF_DIR_RX,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-       .count                   = 512
+       .count                   = 528
        },
        {
        .app_id                  = 1,
@@ -1876,7 +2082,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
        .direction               = TF_DIR_TX,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
        .resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-       .count                   = 26
+       .count                   = 32
        },
        {
        .app_id                  = 1,
@@ -2300,7 +2506,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
        .direction               = TF_DIR_RX,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
        .resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-       .count                   = 32
+       .count                   = 16
        },
        {
        .app_id                  = 2,
@@ -2316,7 +2522,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
        .direction               = TF_DIR_RX,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-       .count                   = 512
+       .count                   = 528
        },
        {
        .app_id                  = 2,
@@ -2388,7 +2594,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
        .direction               = TF_DIR_RX,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
        .resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-       .count                   = 256
+       .count                   = 512
        },
        {
        .app_id                  = 2,
@@ -2404,7 +2610,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
        .direction               = TF_DIR_TX,
        .resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
        .resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-       .count                   = 26
+       .count                   = 32
        },
        {
        .app_id                  = 2,

diff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_act.c b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_act.c
index a60dfae..ce5a70b 100644 (file)
--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_act.c
+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_act.c
@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 
-/* date: Mon Apr  5 11:35:38 2021 */
+/* date: Thu May 13 18:15:56 2021 */
 
 #include "ulp_template_db_enum.h"
 #include "ulp_template_db_field.h"
@@ -12,20 +12,20 @@
 
 /* Mapper templates for header act list */
 struct bnxt_ulp_mapper_tmpl_info ulp_thor_act_tmpl_list[] = {
-       /* act_tid: 1, thor, ingress */
+       /* act_tid: 1, ingress */
        [1] = {
        .device_name = BNXT_ULP_DEVICE_ID_THOR,
        .num_tbls = 2,
        .start_tbl_idx = 0,
        .reject_info = {
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
+               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
                .cond_start_idx = 0,
-               .cond_nums = 0 }
+               .cond_nums = 4 }
        }
 };
 
 struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
-       { /* act_tid: 1, thor, table: int_flow_counter_tbl.0 */
+       { /* act_tid: 1, , table: int_flow_counter_tbl.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_STATS_64,
        .resource_sub_type =
@@ -35,7 +35,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
                .cond_true_goto  = 1,
                .cond_false_goto = 1,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-               .cond_start_idx = 0,
+               .cond_start_idx = 4,
                .cond_nums = 1 },
        .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
        .tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
@@ -46,7 +46,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
        .result_bit_size = 64,
        .result_num_fields = 1
        },
-       { /* act_tid: 1, thor, table: int_full_act_record.0 */
+       { /* act_tid: 1, , table: int_full_act_record.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
        .resource_sub_type =
@@ -56,7 +56,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
                .cond_true_goto  = 0,
                .cond_false_goto = 0,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 1,
+               .cond_start_idx = 5,
                .cond_nums = 0 },
        .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
        .tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
@@ -70,6 +70,23 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 };
 
 struct bnxt_ulp_mapper_cond_info ulp_thor_act_cond_list[] = {
+       /* cond_reject: thor, act_tid: 1 */
+       {
+       .cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+       .cond_operand = BNXT_ULP_ACT_BIT_POP_VLAN
+       },
+       {
+       .cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+       .cond_operand = BNXT_ULP_ACT_BIT_DEC_TTL
+       },
+       {
+       .cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+       .cond_operand = BNXT_ULP_ACT_BIT_VXLAN_DECAP
+       },
+       {
+       .cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+       .cond_operand = BNXT_ULP_ACT_BIT_SHARED_SAMPLE
+       },
        /* cond_execute: act_tid: 1, int_flow_counter_tbl.0 */
        {
        .cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
@@ -78,14 +95,14 @@ struct bnxt_ulp_mapper_cond_info ulp_thor_act_cond_list[] = {
 };
 
 struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {
-       /* act_tid: 1, thor, table: int_flow_counter_tbl.0 */
+       /* act_tid: 1, , table: int_flow_counter_tbl.0 */
        {
        .description = "count",
        .field_bit_size = 64,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 1, thor, table: int_full_act_record.0 */
+       /* act_tid: 1, , table: int_full_act_record.0 */
        {
        .description = "sp_rec_ptr",
        .field_bit_size = 16,
@@ -180,7 +197,16 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {
        .description = "drop",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+       .field_opr1 = {
+       ((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 56) & 0xff,
+       ((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 48) & 0xff,
+       ((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 40) & 0xff,
+       ((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 32) & 0xff,
+       ((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 24) & 0xff,
+       ((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 16) & 0xff,
+       ((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 8) & 0xff,
+       (uint64_t)BNXT_ULP_ACT_BIT_DROP & 0xff}
        },
        {
        .description = "hit",

diff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_class.c b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_class.c
index 4502573..83f6152 100644 (file)
--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_class.c
+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_class.c
@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 
-/* date: Mon Apr  5 11:35:38 2021 */
+/* date: Thu May 13 18:15:56 2021 */
 
 #include "ulp_template_db_enum.h"
 #include "ulp_template_db_field.h"
@@ -12,50 +12,40 @@
 
 /* Mapper templates for header class list */
 struct bnxt_ulp_mapper_tmpl_info ulp_thor_class_tmpl_list[] = {
-       /* class_tid: 1, thor, ingress */
+       /* class_tid: 1, ingress */
        [1] = {
        .device_name = BNXT_ULP_DEVICE_ID_THOR,
-       .num_tbls = 47,
+       .num_tbls = 12,
        .start_tbl_idx = 0,
        .reject_info = {
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
+               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
                .cond_start_idx = 0,
-               .cond_nums = 0 }
+               .cond_nums = 4 }
        },
-       /* class_tid: 2, thor, ingress */
-       [2] = {
-       .device_name = BNXT_ULP_DEVICE_ID_THOR,
-       .num_tbls = 13,
-       .start_tbl_idx = 47,
-       .reject_info = {
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-               .cond_start_idx = 17,
-               .cond_nums = 0 }
-       },
-       /* class_tid: 3, thor, ingress */
+       /* class_tid: 3, ingress */
        [3] = {
        .device_name = BNXT_ULP_DEVICE_ID_THOR,
-       .num_tbls = 1,
-       .start_tbl_idx = 60,
+       .num_tbls = 15,
+       .start_tbl_idx = 12,
        .reject_info = {
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-               .cond_start_idx = 20,
-               .cond_nums = 0 }
+               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+               .cond_start_idx = 8,
+               .cond_nums = 1 }
        },
-       /* class_tid: 4, thor, ingress */
+       /* class_tid: 4, egress */
        [4] = {
        .device_name = BNXT_ULP_DEVICE_ID_THOR,
-       .num_tbls = 9,
-       .start_tbl_idx = 61,
+       .num_tbls = 6,
+       .start_tbl_idx = 27,
        .reject_info = {
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-               .cond_start_idx = 20,
-               .cond_nums = 0 }
+               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+               .cond_start_idx = 12,
+               .cond_nums = 1 }
        }
 };
 
 struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
-       { /* class_tid: 1, thor, table: port_table.rd */
+       { /* class_tid: 1, , table: port_table.rd */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PORT_TABLE,
@@ -64,7 +54,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
                .cond_true_goto  = 1,
                .cond_false_goto = 1,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 0,
+               .cond_start_idx = 4,
                .cond_nums = 0 },
        .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
        .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
@@ -77,54 +67,65 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
        .ident_start_idx = 0,
        .ident_nums = 3
        },
-       { /* class_tid: 1, thor, table: control.check_gre */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+       { /* class_tid: 1, , table: l2_cntxt_tcam_cache.rd */
+       .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+       .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
+       .resource_sub_type =
+               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
        .direction = TF_DIR_RX,
        .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 17,
+               .cond_true_goto  = 5,
+               .cond_false_goto = 1,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-               .cond_start_idx = 0,
+               .cond_start_idx = 4,
                .cond_nums = 1 },
-       .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE
+       .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
+       .key_start_idx = 1,
+       .blob_key_bit_size = 8,
+       .key_bit_size = 8,
+       .key_num_fields = 1,
+       .ident_start_idx = 3,
+       .ident_nums = 1
        },
-       { /* class_tid: 1, thor, table: l2_cntxt_tcam_cache.gre_rd */
+       { /* class_tid: 1, , table: mac_addr_cache.rd */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_sub_type =
-               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
+               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MAC_ADDR_CACHE,
        .direction = TF_DIR_RX,
        .execute_info = {
                .cond_true_goto  = 1,
                .cond_false_goto = 1,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 1,
+               .cond_start_idx = 5,
                .cond_nums = 0 },
        .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
-       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
        .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 1,
-       .blob_key_bit_size = 8,
-       .key_bit_size = 8,
-       .key_num_fields = 1,
-       .ident_start_idx = 3,
-       .ident_nums = 0
+       .key_start_idx = 2,
+       .blob_key_bit_size = 73,
+       .key_bit_size = 73,
+       .key_num_fields = 5,
+       .ident_start_idx = 4,
+       .ident_nums = 1
        },
-       { /* class_tid: 1, thor, table: control.gre_hit */
+       { /* class_tid: 1, , table: control.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
        .direction = TF_DIR_RX,
        .execute_info = {
                .cond_true_goto  = 1,
-               .cond_false_goto = 42,
+               .cond_false_goto = 3,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-               .cond_start_idx = 1,
+               .cond_start_idx = 5,
                .cond_nums = 1 },
        .fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
        .fdb_operand = BNXT_ULP_RF_IDX_RID,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE
        },
-       { /* class_tid: 1, thor, table: l2_cntxt_tcam.gre */
+       { /* class_tid: 1, , table: l2_cntxt_tcam.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
        .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
        .direction = TF_DIR_RX,
@@ -132,7 +133,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
                .cond_true_goto  = 1,
                .cond_false_goto = 1,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 2,
+               .cond_start_idx = 6,
                .cond_nums = 0 },
        .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
        .tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
@@ -141,40 +142,75 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
        .pri_opcode  = BNXT_ULP_PRI_OPC_CONST,
        .pri_operand = 0,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 2,
+       .key_start_idx = 7,
        .blob_key_bit_size = 213,
        .key_bit_size = 213,
        .key_num_fields = 21,
        .result_start_idx = 0,
        .result_bit_size = 43,
        .result_num_fields = 6,
-       .ident_start_idx = 3,
+       .ident_start_idx = 5,
        .ident_nums = 1
        },
-       { /* class_tid: 1, thor, table: l2_cntxt_tcam_cache.gre_wr */
+       { /* class_tid: 1, , table: mac_addr_cache.wr */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_sub_type =
-               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
+               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MAC_ADDR_CACHE,
        .direction = TF_DIR_RX,
        .execute_info = {
                .cond_true_goto  = 1,
                .cond_false_goto = 1,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 2,
+               .cond_start_idx = 6,
                .cond_nums = 0 },
        .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
-       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
        .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 23,
-       .blob_key_bit_size = 8,
-       .key_bit_size = 8,
-       .key_num_fields = 1,
+       .key_start_idx = 28,
+       .blob_key_bit_size = 73,
+       .key_bit_size = 73,
+       .key_num_fields = 5,
        .result_start_idx = 6,
        .result_bit_size = 62,
        .result_num_fields = 4
        },
-       { /* class_tid: 1, thor, table: fkb_select.gre */
+       { /* class_tid: 1, , table: profile_tcam_cache.l3_l4_rd */
+       .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+       .resource_sub_type =
+               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM,
+       .direction = TF_DIR_RX,
+       .execute_info = {
+               .cond_true_goto  = 1,
+               .cond_false_goto = 1,
+               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+               .cond_start_idx = 6,
+               .cond_nums = 0 },
+       .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
+       .key_start_idx = 33,
+       .blob_key_bit_size = 14,
+       .key_bit_size = 14,
+       .key_num_fields = 3,
+       .ident_start_idx = 6,
+       .ident_nums = 0
+       },
+       { /* class_tid: 1, , table: control.l3_l4 */
+       .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+       .direction = TF_DIR_RX,
+       .execute_info = {
+               .cond_true_goto  = 1,
+               .cond_false_goto = 4,
+               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+               .cond_start_idx = 6,
+               .cond_nums = 1 },
+       .fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
+       .fdb_operand = BNXT_ULP_RF_IDX_RID,
+       .byte_order = BNXT_ULP_BYTE_ORDER_LE
+       },
+       { /* class_tid: 1, , table: fkb_select.l3_l4_wm */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_WC_FKB,
        .direction = TF_DIR_RX,
@@ -182,17 +218,17 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
                .cond_true_goto  = 1,
                .cond_false_goto = 1,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 2,
+               .cond_start_idx = 7,
                .cond_nums = 0 },
        .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE,
-       .tbl_operand = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0,
+       .tbl_operand = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
        .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE,
        .result_start_idx = 10,
        .result_bit_size = 106,
        .result_num_fields = 106
        },
-       { /* class_tid: 1, thor, table: profile_tcam.gre */
+       { /* class_tid: 1, , table: profile_tcam.l3_l4 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
        .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,
        .direction = TF_DIR_RX,
@@ -200,120 +236,164 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
                .cond_true_goto  = 1,
                .cond_false_goto = 1,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 2,
+               .cond_start_idx = 7,
                .cond_nums = 0 },
        .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
        .tbl_operand = BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+       .fdb_operand = BNXT_ULP_RF_IDX_RID,
        .pri_opcode  = BNXT_ULP_PRI_OPC_CONST,
        .pri_operand = 0,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
        .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 24,
+       .key_start_idx = 36,
        .blob_key_bit_size = 94,
        .key_bit_size = 94,
        .key_num_fields = 43,
        .result_start_idx = 116,
        .result_bit_size = 33,
        .result_num_fields = 8,
-       .ident_start_idx = 4,
+       .ident_start_idx = 6,
        .ident_nums = 0
        },
-       { /* class_tid: 1, thor, table: wm.gre */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-       .resource_type = TF_TCAM_TBL_TYPE_WC_TCAM_HIGH,
+       { /* class_tid: 1, , table: profile_tcam_cache.l3_l4_wr */
+       .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+       .resource_sub_type =
+               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM,
        .direction = TF_DIR_RX,
        .execute_info = {
-               .cond_true_goto  = 2,
+               .cond_true_goto  = 1,
                .cond_false_goto = 1,
+               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+               .cond_start_idx = 7,
+               .cond_nums = 0 },
+       .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
+       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
+       .key_start_idx = 79,
+       .blob_key_bit_size = 14,
+       .key_bit_size = 14,
+       .key_num_fields = 3,
+       .result_start_idx = 124,
+       .result_bit_size = 138,
+       .result_num_fields = 7
+       },
+       { /* class_tid: 1, , table: wm.l3_l4 */
+       .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
+       .resource_type = TF_TCAM_TBL_TYPE_WC_TCAM,
+       .direction = TF_DIR_RX,
+       .execute_info = {
+               .cond_true_goto  = 0,
+               .cond_false_goto = 0,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-               .cond_start_idx = 2,
+               .cond_start_idx = 7,
                .cond_nums = 1 },
        .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
        .tbl_operand = BNXT_ULP_RF_IDX_WC_TCAM_INDEX_0,
        .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+       .pri_opcode  = BNXT_ULP_PRI_OPC_CONST,
+       .pri_operand = 0,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-       .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,
-       .shared_session = BNXT_ULP_SHARED_SESSION_YES,
+       .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
        .byte_order = BNXT_ULP_BYTE_ORDER_BE,
-       .key_start_idx = 67,
+       .key_start_idx = 82,
        .blob_key_bit_size = 0,
        .key_bit_size = 0,
        .key_num_fields = 114,
-       .result_start_idx = 124,
+       .result_start_idx = 131,
        .result_bit_size = 38,
        .result_num_fields = 5
        },
-       { /* class_tid: 1, thor, table: wm.gre_low */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-       .resource_type = TF_TCAM_TBL_TYPE_WC_TCAM_LOW,
+       { /* class_tid: 3, , table: int_full_act_record.0 */
+       .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+       .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
+       .resource_sub_type =
+               BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
        .direction = TF_DIR_RX,
        .execute_info = {
                .cond_true_goto  = 1,
                .cond_false_goto = 1,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 3,
+               .cond_start_idx = 9,
                .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-       .tbl_operand = BNXT_ULP_RF_IDX_WC_TCAM_INDEX_0,
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR,
        .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-       .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,
-       .shared_session = BNXT_ULP_SHARED_SESSION_YES,
-       .byte_order = BNXT_ULP_BYTE_ORDER_BE,
-       .key_start_idx = 181,
-       .blob_key_bit_size = 0,
-       .key_bit_size = 0,
-       .key_num_fields = 114,
-       .result_start_idx = 129,
-       .result_bit_size = 38,
+       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
+       .result_start_idx = 136,
+       .result_bit_size = 128,
+       .result_num_fields = 17
+       },
+       { /* class_tid: 3, , table: port_table.wr_0 */
+       .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+       .resource_sub_type =
+               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PORT_TABLE,
+       .direction = TF_DIR_RX,
+       .execute_info = {
+               .cond_true_goto  = 1,
+               .cond_false_goto = 1,
+               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+               .cond_start_idx = 9,
+               .cond_nums = 0 },
+       .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
+       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
+       .key_start_idx = 196,
+       .blob_key_bit_size = 10,
+       .key_bit_size = 10,
+       .key_num_fields = 1,
+       .result_start_idx = 153,
+       .result_bit_size = 152,
        .result_num_fields = 5
        },
-       { /* class_tid: 1, thor, table: mac_addr_cache.gre_frag_rd */
+       { /* class_tid: 3, , table: l2_cntxt_tcam_cache.ing_rd */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_sub_type =
-               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MAC_ADDR_CACHE,
+               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
        .direction = TF_DIR_RX,
        .execute_info = {
                .cond_true_goto  = 1,
                .cond_false_goto = 1,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 3,
+               .cond_start_idx = 9,
                .cond_nums = 0 },
        .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
-       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
+       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
        .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 295,
-       .blob_key_bit_size = 73,
-       .key_bit_size = 73,
-       .key_num_fields = 5,
-       .ident_start_idx = 4,
+       .key_start_idx = 197,
+       .blob_key_bit_size = 8,
+       .key_bit_size = 8,
+       .key_num_fields = 1,
+       .ident_start_idx = 6,
        .ident_nums = 0
        },
-       { /* class_tid: 1, thor, table: control.gre_frag_mac_hit */
+       { /* class_tid: 3, , table: control.ing_0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
        .direction = TF_DIR_RX,
        .execute_info = {
                .cond_true_goto  = 1,
-               .cond_false_goto = 4,
+               .cond_false_goto = 3,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-               .cond_start_idx = 3,
+               .cond_start_idx = 9,
                .cond_nums = 1 },
        .fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
        .fdb_operand = BNXT_ULP_RF_IDX_RID,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE
        },
-       { /* class_tid: 1, thor, table: l2_cntxt_tcam.0 */
+       { /* class_tid: 3, , table: l2_cntxt_tcam.ing_0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-       .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
+       .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
        .direction = TF_DIR_RX,
        .execute_info = {
                .cond_true_goto  = 1,
                .cond_false_goto = 1,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 4,
+               .cond_start_idx = 10,
                .cond_nums = 0 },
        .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
        .tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
@@ -321,27675 +401,4470 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
        .fdb_operand = BNXT_ULP_RF_IDX_RID,
        .pri_opcode  = BNXT_ULP_PRI_OPC_CONST,
        .pri_operand = 0,
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+       .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 300,
+       .key_start_idx = 198,
        .blob_key_bit_size = 213,
        .key_bit_size = 213,
        .key_num_fields = 21,
-       .result_start_idx = 134,
+       .result_start_idx = 158,
        .result_bit_size = 43,
        .result_num_fields = 6,
-       .ident_start_idx = 4,
-       .ident_nums = 0
+       .ident_start_idx = 6,
+       .ident_nums = 1
        },
-       { /* class_tid: 1, thor, table: mac_addr_cache.gre_frag_wr */
+       { /* class_tid: 3, , table: l2_cntxt_tcam_cache.ing_wr */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_sub_type =
-               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MAC_ADDR_CACHE,
+               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
        .direction = TF_DIR_RX,
        .execute_info = {
                .cond_true_goto  = 1,
                .cond_false_goto = 1,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 4,
+               .cond_start_idx = 10,
                .cond_nums = 0 },
        .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
-       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
+       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
        .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 321,
-       .blob_key_bit_size = 73,
-       .key_bit_size = 73,
-       .key_num_fields = 5,
-       .result_start_idx = 140,
+       .key_start_idx = 219,
+       .blob_key_bit_size = 8,
+       .key_bit_size = 8,
+       .key_num_fields = 1,
+       .result_start_idx = 164,
        .result_bit_size = 62,
        .result_num_fields = 4
        },
-       { /* class_tid: 1, thor, table: fkb_select.gre_frag */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-       .resource_type = TF_TBL_TYPE_WC_FKB,
+       { /* class_tid: 3, , table: parif_def_arec_ptr.ing_0 */
+       .resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
+       .resource_type = TF_IF_TBL_TYPE_PROF_PARIF_DFLT_ACT_REC_PTR,
        .direction = TF_DIR_RX,
        .execute_info = {
                .cond_true_goto  = 1,
                .cond_false_goto = 1,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 4,
+               .cond_start_idx = 10,
                .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE,
-       .tbl_operand = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0,
+       .tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
+       .tbl_operand = BNXT_ULP_CF_IDX_PHY_PORT_PARIF,
        .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .result_start_idx = 144,
-       .result_bit_size = 106,
-       .result_num_fields = 106
+       .result_start_idx = 168,
+       .result_bit_size = 32,
+       .result_num_fields = 1
        },
-       { /* class_tid: 1, thor, table: profile_tcam.gre_frag */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-       .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,
+       { /* class_tid: 3, , table: parif_def_err_arec_ptr.ing_0 */
+       .resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
+       .resource_type = TF_IF_TBL_TYPE_PROF_PARIF_ERR_ACT_REC_PTR,
        .direction = TF_DIR_RX,
        .execute_info = {
                .cond_true_goto  = 1,
                .cond_false_goto = 1,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 4,
+               .cond_start_idx = 10,
                .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-       .tbl_operand = BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-       .pri_opcode  = BNXT_ULP_PRI_OPC_CONST,
-       .pri_operand = 0,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-       .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,
+       .tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
+       .tbl_operand = BNXT_ULP_CF_IDX_PHY_PORT_PARIF,
+       .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 326,
-       .blob_key_bit_size = 94,
-       .key_bit_size = 94,
-       .key_num_fields = 43,
-       .result_start_idx = 250,
-       .result_bit_size = 33,
-       .result_num_fields = 8,
-       .ident_start_idx = 4,
-       .ident_nums = 0
+       .result_start_idx = 169,
+       .result_bit_size = 32,
+       .result_num_fields = 1
        },
-       { /* class_tid: 1, thor, table: wm.gre_frag */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-       .resource_type = TF_TCAM_TBL_TYPE_WC_TCAM_HIGH,
+       { /* class_tid: 3, , table: control.egr_0 */
+       .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
        .direction = TF_DIR_RX,
        .execute_info = {
-               .cond_true_goto  = 29,
-               .cond_false_goto = 1,
+               .cond_true_goto  = 1,
+               .cond_false_goto = 0,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-               .cond_start_idx = 4,
+               .cond_start_idx = 10,
                .cond_nums = 1 },
-       .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-       .tbl_operand = BNXT_ULP_RF_IDX_WC_TCAM_INDEX_0,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-       .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
-       .shared_session = BNXT_ULP_SHARED_SESSION_YES,
-       .byte_order = BNXT_ULP_BYTE_ORDER_BE,
-       .key_start_idx = 369,
-       .blob_key_bit_size = 0,
-       .key_bit_size = 0,
-       .key_num_fields = 114,
-       .result_start_idx = 258,
-       .result_bit_size = 38,
-       .result_num_fields = 5
+       .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+       .byte_order = BNXT_ULP_BYTE_ORDER_LE
        },
-       { /* class_tid: 1, thor, table: wm.gre_frag_low */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-       .resource_type = TF_TCAM_TBL_TYPE_WC_TCAM_LOW,
-       .direction = TF_DIR_RX,
+       { /* class_tid: 3, , table: int_full_act_record.egr_0 */
+       .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+       .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
+       .resource_sub_type =
+               BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_VFR_CFA_ACTION,
+       .direction = TF_DIR_TX,
        .execute_info = {
-               .cond_true_goto  = 28,
+               .cond_true_goto  = 1,
                .cond_false_goto = 1,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 5,
+               .cond_start_idx = 11,
                .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-       .tbl_operand = BNXT_ULP_RF_IDX_WC_TCAM_INDEX_0,
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
        .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-       .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
-       .shared_session = BNXT_ULP_SHARED_SESSION_YES,
-       .byte_order = BNXT_ULP_BYTE_ORDER_BE,
-       .key_start_idx = 483,
-       .blob_key_bit_size = 0,
-       .key_bit_size = 0,
-       .key_num_fields = 114,
-       .result_start_idx = 263,
-       .result_bit_size = 38,
-       .result_num_fields = 5
+       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
+       .result_start_idx = 170,
+       .result_bit_size = 128,
+       .result_num_fields = 17,
+       .encap_num_fields = 0
        },
-       { /* class_tid: 1, thor, table: mac_addr_cache.non_gre_rd */
+       { /* class_tid: 3, , table: l2_cntxt_tcam_cache.egr_rd */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_sub_type =
-               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MAC_ADDR_CACHE,
-       .direction = TF_DIR_RX,
+               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
+       .direction = TF_DIR_TX,
        .execute_info = {
                .cond_true_goto  = 1,
                .cond_false_goto = 1,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 5,
+               .cond_start_idx = 11,
                .cond_nums = 0 },
        .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
-       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
+       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
        .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 597,
-       .blob_key_bit_size = 73,
-       .key_bit_size = 73,
-       .key_num_fields = 5,
-       .ident_start_idx = 4,
+       .key_start_idx = 220,
+       .blob_key_bit_size = 8,
+       .key_bit_size = 8,
+       .key_num_fields = 1,
+       .ident_start_idx = 7,
        .ident_nums = 0
        },
-       { /* class_tid: 1, thor, table: control.non_gre_mac */
+       { /* class_tid: 3, , table: control.egr_1 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
        .direction = TF_DIR_RX,
        .execute_info = {
                .cond_true_goto  = 1,
-               .cond_false_goto = 3,
+               .cond_false_goto = 2,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-               .cond_start_idx = 5,
+               .cond_start_idx = 11,
                .cond_nums = 1 },
        .fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
        .fdb_operand = BNXT_ULP_RF_IDX_RID,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE
        },
-       { /* class_tid: 1, thor, table: l2_cntxt_tcam.0 */
+       { /* class_tid: 3, , table: l2_cntxt_tcam.egr_0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-       .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-       .direction = TF_DIR_RX,
+       .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
+       .direction = TF_DIR_TX,
        .execute_info = {
                .cond_true_goto  = 1,
                .cond_false_goto = 1,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 6,
+               .cond_start_idx = 12,
                .cond_nums = 0 },
        .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
        .tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
        .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
        .fdb_operand = BNXT_ULP_RF_IDX_RID,
-       .pri_opcode  = BNXT_ULP_PRI_OPC_CONST,
-       .pri_operand = 0,
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+       .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 602,
+       .key_start_idx = 221,
        .blob_key_bit_size = 213,
        .key_bit_size = 213,
        .key_num_fields = 21,
-       .result_start_idx = 268,
+       .result_start_idx = 187,
        .result_bit_size = 43,
        .result_num_fields = 6,
-       .ident_start_idx = 4,
-       .ident_nums = 0
+       .ident_start_idx = 7,
+       .ident_nums = 1
        },
-       { /* class_tid: 1, thor, table: mac_addr_cache.wr */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
-       .resource_sub_type =
-               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MAC_ADDR_CACHE,
-       .direction = TF_DIR_RX,
+       { /* class_tid: 3, , table: parif_def_arec_ptr.egr_0 */
+       .resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
+       .resource_type = TF_IF_TBL_TYPE_PROF_PARIF_DFLT_ACT_REC_PTR,
+       .direction = TF_DIR_TX,
        .execute_info = {
                .cond_true_goto  = 1,
                .cond_false_goto = 1,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 6,
+               .cond_start_idx = 12,
                .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
-       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
+       .tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
+       .tbl_operand = BNXT_ULP_CF_IDX_DRV_FUNC_PARIF,
        .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 623,
-       .blob_key_bit_size = 73,
-       .key_bit_size = 73,
-       .key_num_fields = 5,
-       .result_start_idx = 274,
-       .result_bit_size = 62,
-       .result_num_fields = 4
-       },
-       { /* class_tid: 1, thor, table: control.icmpv4_test */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 8,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-               .cond_start_idx = 6,
-               .cond_nums = 2 },
-       .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE
+       .result_start_idx = 193,
+       .result_bit_size = 32,
+       .result_num_fields = 1
        },
-       { /* class_tid: 1, thor, table: profile_tcam_cache.icmpv4_rd */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
-       .resource_sub_type =
-               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM,
-       .direction = TF_DIR_RX,
+       { /* class_tid: 3, , table: parif_def_err_arec_ptr.egr_0 */
+       .resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
+       .resource_type = TF_IF_TBL_TYPE_PROF_PARIF_ERR_ACT_REC_PTR,
+       .direction = TF_DIR_TX,
        .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
+               .cond_true_goto  = 0,
+               .cond_false_goto = 0,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 8,
+               .cond_start_idx = 12,
                .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
-       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+       .tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
+       .tbl_operand = BNXT_ULP_CF_IDX_DRV_FUNC_PARIF,
        .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 628,
-       .blob_key_bit_size = 14,
-       .key_bit_size = 14,
-       .key_num_fields = 3,
-       .ident_start_idx = 4,
-       .ident_nums = 0
-       },
-       { /* class_tid: 1, thor, table: control.icmpv4 */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 4,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-               .cond_start_idx = 8,
-               .cond_nums = 1 },
-       .fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
-       .fdb_operand = BNXT_ULP_RF_IDX_RID,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE
+       .result_start_idx = 194,
+       .result_bit_size = 32,
+       .result_num_fields = 1
        },
-       { /* class_tid: 1, thor, table: fkb_select.icmpv4 */
+       { /* class_tid: 4, , table: int_full_act_record.loopback */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-       .resource_type = TF_TBL_TYPE_WC_FKB,
-       .direction = TF_DIR_RX,
+       .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
+       .resource_sub_type =
+               BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_VFR_CFA_ACTION,
+       .direction = TF_DIR_TX,
        .execute_info = {
                .cond_true_goto  = 1,
                .cond_false_goto = 1,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 9,
+               .cond_start_idx = 13,
                .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE,
-       .tbl_operand = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0,
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_GLB_REGFILE,
+       .tbl_operand = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
        .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .result_start_idx = 278,
-       .result_bit_size = 106,
-       .result_num_fields = 106
-       },
-       { /* class_tid: 1, thor, table: profile_tcam.icmpv4 */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-       .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 9,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-       .tbl_operand = BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
-       .fdb_operand = BNXT_ULP_RF_IDX_RID,
-       .pri_opcode  = BNXT_ULP_PRI_OPC_CONST,
-       .pri_operand = 0,
        .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 631,
-       .blob_key_bit_size = 94,
-       .key_bit_size = 94,
-       .key_num_fields = 43,
-       .result_start_idx = 384,
-       .result_bit_size = 33,
-       .result_num_fields = 8,
-       .ident_start_idx = 4,
-       .ident_nums = 1
+       .result_start_idx = 195,
+       .result_bit_size = 128,
+       .result_num_fields = 17,
+       .encap_num_fields = 0
        },
-       { /* class_tid: 1, thor, table: profile_tcam_cache.icmpv4_wr */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
-       .resource_sub_type =
-               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM,
-       .direction = TF_DIR_RX,
+       { /* class_tid: 4, , table: parif_def_arec_ptr.vf_egr */
+       .resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
+       .resource_type = TF_IF_TBL_TYPE_PROF_PARIF_DFLT_ACT_REC_PTR,
+       .direction = TF_DIR_TX,
        .execute_info = {
                .cond_true_goto  = 1,
                .cond_false_goto = 1,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 9,
+               .cond_start_idx = 13,
                .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
-       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+       .tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_CONST,
+       .tbl_operand = ULP_THOR_SYM_LOOPBACK_PARIF,
        .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 674,
-       .blob_key_bit_size = 14,
-       .key_bit_size = 14,
-       .key_num_fields = 3,
-       .result_start_idx = 392,
-       .result_bit_size = 82,
-       .result_num_fields = 7
-       },
-       { /* class_tid: 1, thor, table: wm.icmpv4 */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-       .resource_type = TF_TCAM_TBL_TYPE_WC_TCAM_HIGH,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 17,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-               .cond_start_idx = 9,
-               .cond_nums = 1 },
-       .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-       .tbl_operand = BNXT_ULP_RF_IDX_WC_TCAM_INDEX_0,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-       .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
-       .shared_session = BNXT_ULP_SHARED_SESSION_YES,
-       .byte_order = BNXT_ULP_BYTE_ORDER_BE,
-       .key_start_idx = 677,
-       .blob_key_bit_size = 0,
-       .key_bit_size = 0,
-       .key_num_fields = 114,
-       .result_start_idx = 399,
-       .result_bit_size = 38,
-       .result_num_fields = 5
+       .result_start_idx = 212,
+       .result_bit_size = 32,
+       .result_num_fields = 1
        },
-       { /* class_tid: 1, thor, table: wm.icmpv4_low */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-       .resource_type = TF_TCAM_TBL_TYPE_WC_TCAM_LOW,
-       .direction = TF_DIR_RX,
+       { /* class_tid: 4, , table: parif_def_err_arec_ptr.vf_egr */
+       .resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
+       .resource_type = TF_IF_TBL_TYPE_PROF_PARIF_ERR_ACT_REC_PTR,
+       .direction = TF_DIR_TX,
        .execute_info = {
-               .cond_true_goto  = 16,
+               .cond_true_goto  = 1,
                .cond_false_goto = 1,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 10,
+               .cond_start_idx = 13,
                .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-       .tbl_operand = BNXT_ULP_RF_IDX_WC_TCAM_INDEX_0,
+       .tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_CONST,
+       .tbl_operand = ULP_THOR_SYM_LOOPBACK_PARIF,
        .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-       .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
-       .shared_session = BNXT_ULP_SHARED_SESSION_YES,
-       .byte_order = BNXT_ULP_BYTE_ORDER_BE,
-       .key_start_idx = 791,
-       .blob_key_bit_size = 0,
-       .key_bit_size = 0,
-       .key_num_fields = 114,
-       .result_start_idx = 404,
-       .result_bit_size = 38,
-       .result_num_fields = 5
-       },
-       { /* class_tid: 1, thor, table: control.icmpv6_test */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 8,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-               .cond_start_idx = 10,
-               .cond_nums = 2 },
-       .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE
+       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
+       .result_start_idx = 213,
+       .result_bit_size = 32,
+       .result_num_fields = 1
        },
-       { /* class_tid: 1, thor, table: profile_tcam_cache.icmpv6_rd */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+       { /* class_tid: 4, , table: int_full_act_record.vf_ing */
+       .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+       .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
        .resource_sub_type =
-               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM,
+               BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
        .direction = TF_DIR_RX,
        .execute_info = {
                .cond_true_goto  = 1,
                .cond_false_goto = 1,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 12,
+               .cond_start_idx = 13,
                .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
-       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
        .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_AND_SET_VFR_FLAG,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 905,
-       .blob_key_bit_size = 14,
-       .key_bit_size = 14,
-       .key_num_fields = 3,
-       .ident_start_idx = 5,
-       .ident_nums = 0
-       },
-       { /* class_tid: 1, thor, table: control.icmpv6 */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 4,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-               .cond_start_idx = 12,
-               .cond_nums = 1 },
-       .fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
-       .fdb_operand = BNXT_ULP_RF_IDX_RID,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE
+       .result_start_idx = 214,
+       .result_bit_size = 128,
+       .result_num_fields = 17,
+       .encap_num_fields = 0
        },
-       { /* class_tid: 1, thor, table: fkb_select.icmpv6 */
+       { /* class_tid: 4, , table: vtag_encap_record.vfr_egr0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-       .resource_type = TF_TBL_TYPE_WC_FKB,
-       .direction = TF_DIR_RX,
+       .resource_type = TF_TBL_TYPE_ACT_ENCAP_8B,
+       .resource_sub_type =
+               BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+       .direction = TF_DIR_TX,
        .execute_info = {
                .cond_true_goto  = 1,
                .cond_false_goto = 1,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
                .cond_start_idx = 13,
                .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE,
-       .tbl_operand = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
+       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .result_start_idx = 409,
-       .result_bit_size = 106,
-       .result_num_fields = 106
+       .result_start_idx = 231,
+       .result_bit_size = 0,
+       .result_num_fields = 0,
+       .encap_num_fields = 11
        },
-       { /* class_tid: 1, thor, table: profile_tcam.icmpv6 */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-       .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,
-       .direction = TF_DIR_RX,
+       { /* class_tid: 4, , table: int_full_act_record.vfr_egr0 */
+       .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+       .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
+       .resource_sub_type =
+               BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_VFR_CFA_ACTION,
+       .direction = TF_DIR_TX,
        .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
+               .cond_true_goto  = 0,
+               .cond_false_goto = 0,
                .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
                .cond_start_idx = 13,
                .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-       .tbl_operand = BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
-       .fdb_operand = BNXT_ULP_RF_IDX_RID,
-       .pri_opcode  = BNXT_ULP_PRI_OPC_CONST,
-       .pri_operand = 0,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 908,
-       .blob_key_bit_size = 94,
-       .key_bit_size = 94,
-       .key_num_fields = 43,
-       .result_start_idx = 515,
-       .result_bit_size = 33,
-       .result_num_fields = 8,
-       .ident_start_idx = 5,
-       .ident_nums = 1
-       },
-       { /* class_tid: 1, thor, table: profile_tcam_cache.icmpv6_wr */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
-       .resource_sub_type =
-               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 13,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
-       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 951,
-       .blob_key_bit_size = 14,
-       .key_bit_size = 14,
-       .key_num_fields = 3,
-       .result_start_idx = 523,
-       .result_bit_size = 82,
-       .result_num_fields = 7
-       },
-       { /* class_tid: 1, thor, table: wm.icmpv6 */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-       .resource_type = TF_TCAM_TBL_TYPE_WC_TCAM_HIGH,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 9,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-               .cond_start_idx = 13,
-               .cond_nums = 1 },
-       .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-       .tbl_operand = BNXT_ULP_RF_IDX_WC_TCAM_INDEX_0,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-       .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
-       .shared_session = BNXT_ULP_SHARED_SESSION_YES,
-       .byte_order = BNXT_ULP_BYTE_ORDER_BE,
-       .key_start_idx = 954,
-       .blob_key_bit_size = 0,
-       .key_bit_size = 0,
-       .key_num_fields = 114,
-       .result_start_idx = 530,
-       .result_bit_size = 38,
-       .result_num_fields = 5
-       },
-       { /* class_tid: 1, thor, table: wm.icmpv6_low */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-       .resource_type = TF_TCAM_TBL_TYPE_WC_TCAM_LOW,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 8,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 14,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-       .tbl_operand = BNXT_ULP_RF_IDX_WC_TCAM_INDEX_0,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-       .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
-       .shared_session = BNXT_ULP_SHARED_SESSION_YES,
-       .byte_order = BNXT_ULP_BYTE_ORDER_BE,
-       .key_start_idx = 1068,
-       .blob_key_bit_size = 0,
-       .key_bit_size = 0,
-       .key_num_fields = 114,
-       .result_start_idx = 535,
-       .result_bit_size = 38,
-       .result_num_fields = 5
-       },
-       { /* class_tid: 1, thor, table: profile_tcam_cache.l3_l4_rd */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
-       .resource_sub_type =
-               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 14,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
-       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 1182,
-       .blob_key_bit_size = 14,
-       .key_bit_size = 14,
-       .key_num_fields = 3,
-       .ident_start_idx = 6,
-       .ident_nums = 0
-       },
-       { /* class_tid: 1, thor, table: control.l3_l4 */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 4,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-               .cond_start_idx = 14,
-               .cond_nums = 1 },
-       .fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
-       .fdb_operand = BNXT_ULP_RF_IDX_RID,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE
-       },
-       { /* class_tid: 1, thor, table: fkb_select.l3_l4_wm */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-       .resource_type = TF_TBL_TYPE_WC_FKB,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 15,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE,
-       .tbl_operand = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .result_start_idx = 540,
-       .result_bit_size = 106,
-       .result_num_fields = 106
-       },
-       { /* class_tid: 1, thor, table: profile_tcam.l3_l4 */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-       .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 15,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-       .tbl_operand = BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
-       .fdb_operand = BNXT_ULP_RF_IDX_RID,
-       .pri_opcode  = BNXT_ULP_PRI_OPC_CONST,
-       .pri_operand = 0,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-       .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 1185,
-       .blob_key_bit_size = 94,
-       .key_bit_size = 94,
-       .key_num_fields = 43,
-       .result_start_idx = 646,
-       .result_bit_size = 33,
-       .result_num_fields = 8,
-       .ident_start_idx = 6,
-       .ident_nums = 0
-       },
-       { /* class_tid: 1, thor, table: profile_tcam_cache.wr */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
-       .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,
-       .resource_sub_type =
-               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 15,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
-       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 1228,
-       .blob_key_bit_size = 14,
-       .key_bit_size = 14,
-       .key_num_fields = 3,
-       .result_start_idx = 654,
-       .result_bit_size = 82,
-       .result_num_fields = 7
-       },
-       { /* class_tid: 1, thor, table: wm.l4 */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-       .resource_type = TF_TCAM_TBL_TYPE_WC_TCAM_HIGH,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 2,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-               .cond_start_idx = 15,
-               .cond_nums = 1 },
-       .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-       .tbl_operand = BNXT_ULP_RF_IDX_WC_TCAM_INDEX_0,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-       .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
-       .shared_session = BNXT_ULP_SHARED_SESSION_YES,
-       .byte_order = BNXT_ULP_BYTE_ORDER_BE,
-       .key_start_idx = 1231,
-       .blob_key_bit_size = 0,
-       .key_bit_size = 0,
-       .key_num_fields = 114,
-       .result_start_idx = 661,
-       .result_bit_size = 38,
-       .result_num_fields = 5
-       },
-       { /* class_tid: 1, thor, table: wm.l4_low */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-       .resource_type = TF_TCAM_TBL_TYPE_WC_TCAM_LOW,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 16,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-       .tbl_operand = BNXT_ULP_RF_IDX_WC_TCAM_INDEX_0,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-       .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
-       .shared_session = BNXT_ULP_SHARED_SESSION_YES,
-       .byte_order = BNXT_ULP_BYTE_ORDER_BE,
-       .key_start_idx = 1345,
-       .blob_key_bit_size = 0,
-       .key_bit_size = 0,
-       .key_num_fields = 114,
-       .result_start_idx = 666,
-       .result_bit_size = 38,
-       .result_num_fields = 5
-       },
-       { /* class_tid: 1, thor, table: control.check_rss_action */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 0,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-               .cond_start_idx = 16,
-               .cond_nums = 1 },
-       .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE
-       },
-       { /* class_tid: 1, thor, table: control.rss_config */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 0,
-               .cond_false_goto = 0,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 17,
-               .cond_nums = 0 },
-       .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-       .func_info = {
-               .func_opc = BNXT_ULP_FUNC_OPC_RSS_CONFIG,
-               .func_dst_opr = BNXT_ULP_RF_IDX_CC },
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE
-       },
-       { /* class_tid: 2, thor, table: port_table.rd */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
-       .resource_sub_type =
-               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PORT_TABLE,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 17,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
-       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 1459,
-       .blob_key_bit_size = 10,
-       .key_bit_size = 10,
-       .key_num_fields = 1,
-       .ident_start_idx = 6,
-       .ident_nums = 3
-       },
-       { /* class_tid: 2, thor, table: mac_addr_cache.rd */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
-       .resource_sub_type =
-               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MAC_ADDR_CACHE,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 17,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
-       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 1460,
-       .blob_key_bit_size = 73,
-       .key_bit_size = 73,
-       .key_num_fields = 5,
-       .ident_start_idx = 9,
-       .ident_nums = 0
-       },
-       { /* class_tid: 2, thor, table: control.0 */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 3,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-               .cond_start_idx = 17,
-               .cond_nums = 1 },
-       .fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
-       .fdb_operand = BNXT_ULP_RF_IDX_RID,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE
-       },
-       { /* class_tid: 2, thor, table: l2_cntxt_tcam.0 */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-       .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 18,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-       .tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
-       .fdb_operand = BNXT_ULP_RF_IDX_RID,
-       .pri_opcode  = BNXT_ULP_PRI_OPC_CONST,
-       .pri_operand = 0,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 1465,
-       .blob_key_bit_size = 213,
-       .key_bit_size = 213,
-       .key_num_fields = 21,
-       .result_start_idx = 671,
-       .result_bit_size = 43,
-       .result_num_fields = 6,
-       .ident_start_idx = 9,
-       .ident_nums = 1
-       },
-       { /* class_tid: 2, thor, table: mac_addr_cache.wr */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
-       .resource_sub_type =
-               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MAC_ADDR_CACHE,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 18,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
-       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 1486,
-       .blob_key_bit_size = 73,
-       .key_bit_size = 73,
-       .key_num_fields = 5,
-       .result_start_idx = 677,
-       .result_bit_size = 62,
-       .result_num_fields = 4
-       },
-       { /* class_tid: 2, thor, table: profile_tcam_cache.l3_l4_rd */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
-       .resource_sub_type =
-               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 18,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
-       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 1491,
-       .blob_key_bit_size = 14,
-       .key_bit_size = 14,
-       .key_num_fields = 3,
-       .ident_start_idx = 10,
-       .ident_nums = 0
-       },
-       { /* class_tid: 2, thor, table: control.l3_l4 */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 4,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-               .cond_start_idx = 18,
-               .cond_nums = 1 },
-       .fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
-       .fdb_operand = BNXT_ULP_RF_IDX_RID,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE
-       },
-       { /* class_tid: 2, thor, table: fkb_select.l3_l4_wm */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-       .resource_type = TF_TBL_TYPE_WC_FKB,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 19,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE,
-       .tbl_operand = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .result_start_idx = 681,
-       .result_bit_size = 106,
-       .result_num_fields = 106
-       },
-       { /* class_tid: 2, thor, table: profile_tcam.l3_l4 */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-       .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 19,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-       .tbl_operand = BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
-       .fdb_operand = BNXT_ULP_RF_IDX_RID,
-       .pri_opcode  = BNXT_ULP_PRI_OPC_CONST,
-       .pri_operand = 0,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-       .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 1494,
-       .blob_key_bit_size = 94,
-       .key_bit_size = 94,
-       .key_num_fields = 43,
-       .result_start_idx = 787,
-       .result_bit_size = 33,
-       .result_num_fields = 8,
-       .ident_start_idx = 10,
-       .ident_nums = 0
-       },
-       { /* class_tid: 2, thor, table: profile_tcam_cache.wr */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
-       .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,
-       .resource_sub_type =
-               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 19,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
-       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 1537,
-       .blob_key_bit_size = 14,
-       .key_bit_size = 14,
-       .key_num_fields = 3,
-       .result_start_idx = 795,
-       .result_bit_size = 82,
-       .result_num_fields = 7
-       },
-       { /* class_tid: 2, thor, table: wm.l4 */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-       .resource_type = TF_TCAM_TBL_TYPE_WC_TCAM,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 19,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-       .tbl_operand = BNXT_ULP_RF_IDX_WC_TCAM_INDEX_0,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-       .pri_opcode  = BNXT_ULP_PRI_OPC_CONST,
-       .pri_operand = 0,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-       .critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
-       .byte_order = BNXT_ULP_BYTE_ORDER_BE,
-       .key_start_idx = 1540,
-       .blob_key_bit_size = 0,
-       .key_bit_size = 0,
-       .key_num_fields = 114,
-       .result_start_idx = 802,
-       .result_bit_size = 38,
-       .result_num_fields = 5
-       },
-       { /* class_tid: 2, thor, table: control.check_rss_action */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 0,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-               .cond_start_idx = 19,
-               .cond_nums = 1 },
-       .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE
-       },
-       { /* class_tid: 2, thor, table: control.rss_config */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 0,
-               .cond_false_goto = 0,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 20,
-               .cond_nums = 0 },
-       .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-       .func_info = {
-               .func_opc = BNXT_ULP_FUNC_OPC_RSS_CONFIG,
-               .func_dst_opr = BNXT_ULP_RF_IDX_CC },
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE
-       },
-       { /* class_tid: 3, thor, table: control.0 */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 0,
-               .cond_false_goto = 0,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 20,
-               .cond_nums = 0 },
-       .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE
-       },
-       { /* class_tid: 4, thor, table: control.get_parent_mac_addr */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 20,
-               .cond_nums = 0 },
-       .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-       .func_info = {
-               .func_opc = BNXT_ULP_FUNC_OPC_GET_PARENT_MAC_ADDR,
-               .func_dst_opr = BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC },
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE
-       },
-       { /* class_tid: 4, thor, table: control.0 */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 3,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-               .cond_start_idx = 20,
-               .cond_nums = 1 },
-       .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-       .func_info = {
-               .func_opc = BNXT_ULP_FUNC_OPC_EQ,
-               .func_src1 = BNXT_ULP_FUNC_SRC_COMP_FIELD,
-               .func_opr1 = BNXT_ULP_CF_IDX_PHY_PORT_VPORT,
-               .func_src2 = BNXT_ULP_FUNC_SRC_CONST,
-               .func_opr2 = 1,
-               .func_dst_opr = BNXT_ULP_RF_IDX_CC },
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE
-       },
-       { /* class_tid: 4, thor, table: int_full_act_record.0 */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-       .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
-       .resource_sub_type =
-               BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 21,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE,
-       .tbl_operand = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-       .shared_session = BNXT_ULP_SHARED_SESSION_YES,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .result_start_idx = 807,
-       .result_bit_size = 128,
-       .result_num_fields = 17
-       },
-       { /* class_tid: 4, thor, table: port_table.wr_0 */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
-       .resource_sub_type =
-               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PORT_TABLE,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 3,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 21,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
-       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 1654,
-       .blob_key_bit_size = 10,
-       .key_bit_size = 10,
-       .key_num_fields = 1,
-       .result_start_idx = 824,
-       .result_bit_size = 152,
-       .result_num_fields = 5
-       },
-       { /* class_tid: 4, thor, table: int_full_act_record.1 */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-       .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
-       .resource_sub_type =
-               BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 21,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE,
-       .tbl_operand = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-       .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-       .shared_session = BNXT_ULP_SHARED_SESSION_YES,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .result_start_idx = 829,
-       .result_bit_size = 128,
-       .result_num_fields = 17
-       },
-       { /* class_tid: 4, thor, table: port_table.wr_1 */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
-       .resource_sub_type =
-               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PORT_TABLE,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 21,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
-       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 1655,
-       .blob_key_bit_size = 10,
-       .key_bit_size = 10,
-       .key_num_fields = 1,
-       .result_start_idx = 846,
-       .result_bit_size = 152,
-       .result_num_fields = 5
-       },
-       { /* class_tid: 4, thor, table: port_table.rd */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
-       .resource_sub_type =
-               BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PORT_TABLE,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 21,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
-       .gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .key_start_idx = 1656,
-       .blob_key_bit_size = 10,
-       .key_bit_size = 10,
-       .key_num_fields = 1,
-       .ident_start_idx = 10,
-       .ident_nums = 1
-       },
-       { /* class_tid: 4, thor, table: parif_def_arec_ptr.ing_0 */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
-       .resource_type = TF_IF_TBL_TYPE_PROF_PARIF_DFLT_ACT_REC_PTR,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 1,
-               .cond_false_goto = 1,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 21,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
-       .tbl_operand = BNXT_ULP_CF_IDX_PHY_PORT_PARIF,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .result_start_idx = 851,
-       .result_bit_size = 32,
-       .result_num_fields = 1
-       },
-       { /* class_tid: 4, thor, table: parif_def_err_arec_ptr.ing_0 */
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
-       .resource_type = TF_IF_TBL_TYPE_PROF_PARIF_ERR_ACT_REC_PTR,
-       .direction = TF_DIR_RX,
-       .execute_info = {
-               .cond_true_goto  = 0,
-               .cond_false_goto = 0,
-               .cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-               .cond_start_idx = 21,
-               .cond_nums = 0 },
-       .tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
-       .tbl_operand = BNXT_ULP_CF_IDX_PHY_PORT_PARIF,
-       .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
-       .result_start_idx = 852,
-       .result_bit_size = 32,
-       .result_num_fields = 1
-       }
-};
-
-struct bnxt_ulp_mapper_cond_info ulp_thor_class_cond_list[] = {
-       /* cond_execute: class_tid: 1, control.check_gre */
-       {
-       .cond_opcode = BNXT_ULP_COND_OPC_HDR_BIT_IS_SET,
-       .cond_operand = BNXT_ULP_HDR_BIT_T_GRE
-       },
-       /* cond_execute: class_tid: 1, control.gre_hit */
-       {
-       .cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
-       .cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
-       },
-       /* cond_execute: class_tid: 1, wm.gre */
-       {
-       .cond_opcode = BNXT_ULP_COND_OPC_CF_IS_SET,
-       .cond_operand = BNXT_ULP_CF_IDX_WC_IS_HA_HIGH_REG
-       },
-       /* cond_execute: class_tid: 1, control.gre_frag_mac_hit */
-       {
-       .cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
-       .cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
-       },
-       /* cond_execute: class_tid: 1, wm.gre_frag */
-       {
-       .cond_opcode = BNXT_ULP_COND_OPC_CF_IS_SET,
-       .cond_operand = BNXT_ULP_CF_IDX_WC_IS_HA_HIGH_REG
-       },
-       /* cond_execute: class_tid: 1, control.non_gre_mac */
-       {
-       .cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
-       .cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
-       },
-       /* cond_execute: class_tid: 1, control.icmpv4_test */
-       {
-       .cond_opcode = BNXT_ULP_COND_OPC_HDR_BIT_IS_SET,
-       .cond_operand = BNXT_ULP_HDR_BIT_O_IPV4
-       },
-       {
-       .cond_opcode = BNXT_ULP_COND_OPC_HDR_BIT_IS_SET,
-       .cond_operand = BNXT_ULP_HDR_BIT_O_ICMP
-       },
-       /* cond_execute: class_tid: 1, control.icmpv4 */
-       {
-       .cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
-       .cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
-       },
-       /* cond_execute: class_tid: 1, wm.icmpv4 */
-       {
-       .cond_opcode = BNXT_ULP_COND_OPC_CF_IS_SET,
-       .cond_operand = BNXT_ULP_CF_IDX_WC_IS_HA_HIGH_REG
-       },
-       /* cond_execute: class_tid: 1, control.icmpv6_test */
-       {
-       .cond_opcode = BNXT_ULP_COND_OPC_HDR_BIT_IS_SET,
-       .cond_operand = BNXT_ULP_HDR_BIT_O_IPV6
-       },
-       {
-       .cond_opcode = BNXT_ULP_COND_OPC_HDR_BIT_IS_SET,
-       .cond_operand = BNXT_ULP_HDR_BIT_O_ICMP
-       },
-       /* cond_execute: class_tid: 1, control.icmpv6 */
-       {
-       .cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
-       .cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
-       },
-       /* cond_execute: class_tid: 1, wm.icmpv6 */
-       {
-       .cond_opcode = BNXT_ULP_COND_OPC_CF_IS_SET,
-       .cond_operand = BNXT_ULP_CF_IDX_WC_IS_HA_HIGH_REG
-       },
-       /* cond_execute: class_tid: 1, control.l3_l4 */
-       {
-       .cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
-       .cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
-       },
-       /* cond_execute: class_tid: 1, wm.l4 */
-       {
-       .cond_opcode = BNXT_ULP_COND_OPC_CF_IS_SET,
-       .cond_operand = BNXT_ULP_CF_IDX_WC_IS_HA_HIGH_REG
-       },
-       /* cond_execute: class_tid: 1, control.check_rss_action */
-       {
-       .cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-       .cond_operand = BNXT_ULP_ACT_BIT_RSS
-       },
-       /* cond_execute: class_tid: 2, control.0 */
-       {
-       .cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
-       .cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
-       },
-       /* cond_execute: class_tid: 2, control.l3_l4 */
-       {
-       .cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
-       .cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
-       },
-       /* cond_execute: class_tid: 2, control.check_rss_action */
-       {
-       .cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-       .cond_operand = BNXT_ULP_ACT_BIT_RSS
-       },
-       /* cond_execute: class_tid: 4, control.0 */
-       {
-       .cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
-       .cond_operand = BNXT_ULP_RF_IDX_CC
-       }
-};
-
-struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
-       /* class_tid: 1, thor, table: port_table.rd */
-       {
-       .field_info_mask = {
-               .description = "dev.port_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff,
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "dev.port_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
-               .field_opr1 = {
-               (BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,
-               BNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}
-               }
-       },
-       /* class_tid: 1, thor, table: l2_cntxt_tcam_cache.gre_rd */
-       {
-       .field_info_mask = {
-               .description = "svif",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               },
-       .field_info_spec = {
-               .description = "svif",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               }
-       },
-       /* class_tid: 1, thor, table: l2_cntxt_tcam.gre */
-       {
-       .field_info_mask = {
-               .description = "etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivlan_tpid_sel",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_ivlan_tpid_sel",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivlan_vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_ivlan_vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovlan_tpid_sel",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_ovlan_tpid_sel",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovlan_vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_ovlan_vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "mac1_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "mac1_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "mac0_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "mac0_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tunnel_id",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tunnel_id",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_TUN_HDR_TYPE_GRE}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "llc",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "llc",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "roce",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "roce",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "metadata",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "metadata",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               },
-       .field_info_spec = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "mpass_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "mpass_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               1}
-               },
-       .field_info_spec = {
-               .description = "valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               1}
-               }
-       },
-       /* class_tid: 1, thor, table: l2_cntxt_tcam_cache.gre_wr */
-       {
-       .field_info_mask = {
-               .description = "svif",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               },
-       .field_info_spec = {
-               .description = "svif",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               }
-       },
-       /* class_tid: 1, thor, table: profile_tcam.gre */
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "ieh",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "ieh",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_flags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_flags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_err",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_err",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "hrec_next",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "hrec_next",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "agg_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "agg_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "metadata",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "metadata",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "pkt_type_0",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "pkt_type_0",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "pkt_type_1",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "pkt_type_1",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               1}
-               },
-       .field_info_spec = {
-               .description = "valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               1}
-               }
-       },
-       /* class_tid: 1, thor, table: wm.gre */
-       {
-       .field_info_mask = {
-               .description = "wc_profile_id",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "wc_profile_id",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_cntxt_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff,
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l2_cntxt_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr1 = {
-               (BNXT_ULP_RF_IDX_PHY_PORT >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_PHY_PORT & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 >> 8) & 0xff,
-                       BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr3 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "lcos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "lcos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "meta",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "meta",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "rcyc_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "rcyc_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "tl3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               47}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.l3err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.l3err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tuntype",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tuntype",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tflags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tflags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tids",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tids",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tid",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tid",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tctxts",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tctxts",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tctxt",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tctxt",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tqos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tqos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "terr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "terr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3err.ipv4",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3err.ipv4",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3err.ipv6",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3err.ipv6",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.ack",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.ack",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.win",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.win",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.tsval",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.tsval",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.txecr",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.txecr",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       /* class_tid: 1, thor, table: wm.gre_low */
-       {
-       .field_info_mask = {
-               .description = "wc_profile_id",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "wc_profile_id",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_cntxt_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff,
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l2_cntxt_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr1 = {
-               (BNXT_ULP_RF_IDX_PHY_PORT >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_PHY_PORT & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 >> 8) & 0xff,
-                       BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr3 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "lcos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "lcos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "meta",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "meta",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "rcyc_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "rcyc_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "tl3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               47}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.l3err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.l3err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tuntype",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tuntype",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tflags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tflags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tids",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tids",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tid",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tid",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tctxts",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tctxts",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tctxt",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tctxt",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tqos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tqos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "terr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "terr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3err.ipv4",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3err.ipv4",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3err.ipv6",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3err.ipv6",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.ack",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.ack",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.win",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.win",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.tsval",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.tsval",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.txecr",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.txecr",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       /* class_tid: 1, thor, table: mac_addr_cache.gre_frag_rd */
-       {
-       .field_info_mask = {
-               .description = "svif",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               },
-       .field_info_spec = {
-               .description = "svif",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
-               },
-       .field_info_spec = {
-               .description = "tun_hdr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "one_tag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "one_tag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "mac_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff,
-                       0xff,
-                       0xff,
-                       0xff,
-                       0xff,
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "mac_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr1 = {
-               (BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC & 0xff}
-               }
-       },
-       /* class_tid: 1, thor, table: l2_cntxt_tcam.0 */
-       {
-       .field_info_mask = {
-               .description = "etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivlan_tpid_sel",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_ivlan_tpid_sel",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivlan_vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_ivlan_vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovlan_tpid_sel",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_ovlan_tpid_sel",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovlan_vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_ovlan_vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "mac1_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "mac1_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "mac0_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff,
-                       0xff,
-                       0xff,
-                       0xff,
-                       0xff,
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "mac0_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-                       BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr3 = {
-               (BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tunnel_id",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tunnel_id",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "llc",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "llc",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "roce",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "roce",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "metadata",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "metadata",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               },
-       .field_info_spec = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "mpass_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               2}
-               },
-       .field_info_spec = {
-               .description = "mpass_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               1}
-               },
-       .field_info_spec = {
-               .description = "valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               1}
-               }
-       },
-       /* class_tid: 1, thor, table: mac_addr_cache.gre_frag_wr */
-       {
-       .field_info_mask = {
-               .description = "svif",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               },
-       .field_info_spec = {
-               .description = "svif",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
-               },
-       .field_info_spec = {
-               .description = "tun_hdr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "one_tag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "one_tag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "mac_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff,
-                       0xff,
-                       0xff,
-                       0xff,
-                       0xff,
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "mac_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr1 = {
-               (BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC & 0xff}
-               }
-       },
-       /* class_tid: 1, thor, table: profile_tcam.gre_frag */
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "ieh",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               16}
-               },
-       .field_info_spec = {
-               .description = "ieh",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               16}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_L2_HDR_VALID_YES}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_flags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_flags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_err",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_err",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "tl2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "hrec_next",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "hrec_next",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "agg_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "agg_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "metadata",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "metadata",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "pkt_type_0",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "pkt_type_0",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "pkt_type_1",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "pkt_type_1",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               1}
-               },
-       .field_info_spec = {
-               .description = "valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               1}
-               }
-       },
-       /* class_tid: 1, thor, table: wm.gre_frag */
-       {
-       .field_info_mask = {
-               .description = "wc_profile_id",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "wc_profile_id",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_cntxt_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff,
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l2_cntxt_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr1 = {
-               (BNXT_ULP_RF_IDX_PHY_PORT >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_PHY_PORT & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 >> 8) & 0xff,
-                       BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr3 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "lcos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "lcos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "meta",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "meta",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "rcyc_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "rcyc_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.l3err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.l3err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tuntype",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tuntype",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tflags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tflags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tids",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tids",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tid",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tid",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tctxts",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tctxts",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tctxt",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tctxt",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tqos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tqos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "terr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "terr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               47}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3err.ipv4",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3err.ipv4",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3err.ipv6",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3err.ipv6",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.ack",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.ack",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.win",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.win",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.tsval",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.tsval",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.txecr",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.txecr",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       /* class_tid: 1, thor, table: wm.gre_frag_low */
-       {
-       .field_info_mask = {
-               .description = "wc_profile_id",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "wc_profile_id",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_cntxt_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff,
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l2_cntxt_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr1 = {
-               (BNXT_ULP_RF_IDX_PHY_PORT >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_PHY_PORT & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 >> 8) & 0xff,
-                       BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr3 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "lcos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "lcos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "meta",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "meta",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "rcyc_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "rcyc_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.l3err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.l3err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tuntype",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tuntype",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tflags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tflags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tids",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tids",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tid",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tid",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tctxts",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tctxts",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tctxt",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tctxt",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tqos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tqos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "terr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "terr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               47}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3err.ipv4",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3err.ipv4",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3err.ipv6",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3err.ipv6",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.ack",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.ack",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.win",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.win",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.tsval",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.tsval",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.txecr",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.txecr",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       /* class_tid: 1, thor, table: mac_addr_cache.non_gre_rd */
-       {
-       .field_info_mask = {
-               .description = "svif",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               },
-       .field_info_spec = {
-               .description = "svif",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
-               },
-       .field_info_spec = {
-               .description = "tun_hdr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "one_tag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "one_tag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "mac_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-                       BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr3 = {
-               (BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC & 0xff}
-               },
-       .field_info_spec = {
-               .description = "mac_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-                       BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr3 = {
-               (BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC & 0xff}
-               }
-       },
-       /* class_tid: 1, thor, table: l2_cntxt_tcam.0 */
-       {
-       .field_info_mask = {
-               .description = "etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivlan_tpid_sel",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_ivlan_tpid_sel",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivlan_vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_ivlan_vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovlan_tpid_sel",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_ovlan_tpid_sel",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovlan_vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_ovlan_vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "mac1_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "mac1_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "mac0_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff,
-                       0xff,
-                       0xff,
-                       0xff,
-                       0xff,
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "mac0_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-                       BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr3 = {
-               (BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tunnel_id",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tunnel_id",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "llc",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "llc",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "roce",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "roce",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "metadata",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "metadata",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               },
-       .field_info_spec = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "mpass_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               2}
-               },
-       .field_info_spec = {
-               .description = "mpass_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               1}
-               },
-       .field_info_spec = {
-               .description = "valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               1}
-               }
-       },
-       /* class_tid: 1, thor, table: mac_addr_cache.wr */
-       {
-       .field_info_mask = {
-               .description = "svif",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               },
-       .field_info_spec = {
-               .description = "svif",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
-               },
-       .field_info_spec = {
-               .description = "tun_hdr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "one_tag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "one_tag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "mac_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-                       BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr3 = {
-               (BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC & 0xff}
-               },
-       .field_info_spec = {
-               .description = "mac_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-                       BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr3 = {
-               (BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC & 0xff}
-               }
-       },
-       /* class_tid: 1, thor, table: profile_tcam_cache.icmpv4_rd */
-       {
-       .field_info_mask = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "hdr_sig_id",
-               .field_bit_size = 5,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "hdr_sig_id",
-               .field_bit_size = 5,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
-               .field_opr1 = {
-               (BNXT_ULP_CF_IDX_HDR_SIG_ID >> 8) & 0xff,
-               BNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}
-               }
-       },
-       /* class_tid: 1, thor, table: profile_tcam.icmpv4 */
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_L4_HDR_TYPE_ICMP}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_L4_HDR_VALID_YES}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "ieh",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "ieh",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_L3_HDR_VALID_YES}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_L2_HDR_VALID_YES}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_flags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_flags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_err",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_err",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "tl2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "hrec_next",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "hrec_next",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "agg_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "agg_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "metadata",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "metadata",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "pkt_type_0",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "pkt_type_0",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "pkt_type_1",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "pkt_type_1",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               1}
-               },
-       .field_info_spec = {
-               .description = "valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               1}
-               }
-       },
-       /* class_tid: 1, thor, table: profile_tcam_cache.icmpv4_wr */
-       {
-       .field_info_mask = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "hdr_sig_id",
-               .field_bit_size = 5,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "hdr_sig_id",
-               .field_bit_size = 5,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
-               .field_opr1 = {
-               (BNXT_ULP_CF_IDX_HDR_SIG_ID >> 8) & 0xff,
-               BNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}
-               }
-       },
-       /* class_tid: 1, thor, table: wm.icmpv4 */
-       {
-       .field_info_mask = {
-               .description = "wc_profile_id",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "wc_profile_id",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_cntxt_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff,
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l2_cntxt_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr1 = {
-               (BNXT_ULP_RF_IDX_PHY_PORT >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_PHY_PORT & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 >> 8) & 0xff,
-                       BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr3 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "lcos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "lcos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "meta",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "meta",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "rcyc_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "rcyc_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.l3err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.l3err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tuntype",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tuntype",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tflags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tflags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tids",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tids",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tid",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tid",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tctxts",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tctxts",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tctxt",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tctxt",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tqos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tqos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "terr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "terr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-               .field_opr1 = {
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
-               (uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr2 = {
-                       1},
-               .field_src3 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr3 = {
-               58}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3err.ipv4",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3err.ipv4",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3err.ipv6",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3err.ipv6",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.ack",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.ack",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.win",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.win",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.tsval",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.tsval",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.txecr",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.txecr",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       /* class_tid: 1, thor, table: wm.icmpv4_low */
-       {
-       .field_info_mask = {
-               .description = "wc_profile_id",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "wc_profile_id",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_cntxt_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff,
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l2_cntxt_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr1 = {
-               (BNXT_ULP_RF_IDX_PHY_PORT >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_PHY_PORT & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 >> 8) & 0xff,
-                       BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr3 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "lcos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "lcos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "meta",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "meta",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "rcyc_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "rcyc_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.l3err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.l3err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tuntype",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tuntype",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tflags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tflags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tids",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tids",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tid",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tid",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tctxts",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tctxts",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tctxt",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tctxt",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tqos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tqos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "terr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "terr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-               .field_opr1 = {
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
-               (uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr2 = {
-                       1},
-               .field_src3 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr3 = {
-               58}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3err.ipv4",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3err.ipv4",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3err.ipv6",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3err.ipv6",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.ack",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.ack",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.win",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.win",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.tsval",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.tsval",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.txecr",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.txecr",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       /* class_tid: 1, thor, table: profile_tcam_cache.icmpv6_rd */
-       {
-       .field_info_mask = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "hdr_sig_id",
-               .field_bit_size = 5,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "hdr_sig_id",
-               .field_bit_size = 5,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
-               .field_opr1 = {
-               (BNXT_ULP_CF_IDX_HDR_SIG_ID >> 8) & 0xff,
-               BNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}
-               }
-       },
-       /* class_tid: 1, thor, table: profile_tcam.icmpv6 */
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_L4_HDR_TYPE_ICMP}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_L4_HDR_VALID_YES}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "ieh",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "ieh",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_L3_HDR_TYPE_IPV6}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_L3_HDR_VALID_YES}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_L2_HDR_VALID_YES}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_flags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_flags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_err",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_err",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "tl2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "hrec_next",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "hrec_next",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "agg_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "agg_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "metadata",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "metadata",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "pkt_type_0",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "pkt_type_0",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "pkt_type_1",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "pkt_type_1",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               1}
-               },
-       .field_info_spec = {
-               .description = "valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               1}
-               }
-       },
-       /* class_tid: 1, thor, table: profile_tcam_cache.icmpv6_wr */
-       {
-       .field_info_mask = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "hdr_sig_id",
-               .field_bit_size = 5,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "hdr_sig_id",
-               .field_bit_size = 5,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
-               .field_opr1 = {
-               (BNXT_ULP_CF_IDX_HDR_SIG_ID >> 8) & 0xff,
-               BNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}
-               }
-       },
-       /* class_tid: 1, thor, table: wm.icmpv6 */
-       {
-       .field_info_mask = {
-               .description = "wc_profile_id",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "wc_profile_id",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_cntxt_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff,
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l2_cntxt_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr1 = {
-               (BNXT_ULP_RF_IDX_PHY_PORT >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_PHY_PORT & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 >> 8) & 0xff,
-                       BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr3 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "lcos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "lcos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "meta",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "meta",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "rcyc_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "rcyc_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.l3err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.l3err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tuntype",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tuntype",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tflags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tflags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tids",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tids",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tid",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tid",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tctxts",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tctxts",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tctxt",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tctxt",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tqos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tqos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "terr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "terr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-               .field_opr1 = {
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
-               (uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr2 = {
-                       1},
-               .field_src3 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr3 = {
-               58}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3err.ipv4",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3err.ipv4",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3err.ipv6",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3err.ipv6",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.ack",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.ack",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.win",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.win",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.tsval",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.tsval",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.txecr",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.txecr",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       /* class_tid: 1, thor, table: wm.icmpv6_low */
-       {
-       .field_info_mask = {
-               .description = "wc_profile_id",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "wc_profile_id",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_cntxt_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff,
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l2_cntxt_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr1 = {
-               (BNXT_ULP_RF_IDX_PHY_PORT >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_PHY_PORT & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 >> 8) & 0xff,
-                       BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr3 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "lcos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "lcos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "meta",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "meta",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "rcyc_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "rcyc_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.l3err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.l3err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tuntype",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tuntype",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tflags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tflags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tids",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tids",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tid",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tid",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tctxts",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tctxts",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tctxt",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tctxt",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tqos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tqos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "terr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "terr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-               .field_opr1 = {
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
-               (uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr2 = {
-                       1},
-               .field_src3 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr3 = {
-               58}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3err.ipv4",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3err.ipv4",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3err.ipv6",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3err.ipv6",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.ack",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.ack",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.win",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.win",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.tsval",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.tsval",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.txecr",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.txecr",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       /* class_tid: 1, thor, table: profile_tcam_cache.l3_l4_rd */
-       {
-       .field_info_mask = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "hdr_sig_id",
-               .field_bit_size = 5,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "hdr_sig_id",
-               .field_bit_size = 5,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
-               .field_opr1 = {
-               (BNXT_ULP_CF_IDX_HDR_SIG_ID >> 8) & 0xff,
-               BNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}
-               }
-       },
-       /* class_tid: 1, thor, table: profile_tcam.l3_l4 */
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-               .field_opr1 = {
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-               (uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr2 = {
-                       ULP_THOR_SYM_L4_HDR_TYPE_TCP},
-               .field_src3 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr3 = {
-               ULP_THOR_SYM_L4_HDR_TYPE_UDP}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_L4_HDR_VALID_YES}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "ieh",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "ieh",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-               .field_opr1 = {
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
-               (uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr2 = {
-                       ULP_THOR_SYM_L3_HDR_TYPE_IPV4},
-               .field_src3 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr3 = {
-               ULP_THOR_SYM_L3_HDR_TYPE_IPV6}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_L3_HDR_VALID_YES}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_L2_HDR_VALID_YES}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_flags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_flags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_err",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_err",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "tl2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "hrec_next",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "hrec_next",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "agg_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "agg_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "metadata",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "metadata",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "pkt_type_0",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "pkt_type_0",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "pkt_type_1",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "pkt_type_1",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               1}
-               },
-       .field_info_spec = {
-               .description = "valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               1}
-               }
-       },
-       /* class_tid: 1, thor, table: profile_tcam_cache.wr */
-       {
-       .field_info_mask = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "hdr_sig_id",
-               .field_bit_size = 5,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "hdr_sig_id",
-               .field_bit_size = 5,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
-               .field_opr1 = {
-               (BNXT_ULP_CF_IDX_HDR_SIG_ID >> 8) & 0xff,
-               BNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}
-               }
-       },
-       /* class_tid: 1, thor, table: wm.l4 */
-       {
-       .field_info_mask = {
-               .description = "wc_profile_id",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "wc_profile_id",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-               .field_opr1 = {
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
-               (uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr2 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 >> 8) & 0xff,
-                       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr3 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_cntxt_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff,
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l2_cntxt_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr1 = {
-               (BNXT_ULP_RF_IDX_PHY_PORT >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_PHY_PORT & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 >> 8) & 0xff,
-                       BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr3 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "lcos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "lcos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "meta",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "meta",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "rcyc_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "rcyc_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.l3err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.l3err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tuntype",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tuntype",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tflags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tflags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tids",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tids",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tid",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tid",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tctxts",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tctxts",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tctxt",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tctxt",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tqos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tqos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "terr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "terr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-               .field_opr1 = {
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-               (uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr2 = {
-                       ULP_THOR_SYM_IP_PROTO_TCP},
-               .field_src3 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr3 = {
-               ULP_THOR_SYM_IP_PROTO_UDP}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3err.ipv4",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3err.ipv4",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3err.ipv6",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3err.ipv6",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-               .field_opr1 = {
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-               (uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-                       BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr3 = {
-               (BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
-               },
-       .field_info_spec = {
-               .description = "l4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-               .field_opr1 = {
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-               (uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-                       BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr3 = {
-               (BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.ack",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.ack",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.win",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.win",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.tsval",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.tsval",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.txecr",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.txecr",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       /* class_tid: 1, thor, table: wm.l4_low */
-       {
-       .field_info_mask = {
-               .description = "wc_profile_id",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "wc_profile_id",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-               .field_opr1 = {
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
-               (uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr2 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 >> 8) & 0xff,
-                       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr3 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_cntxt_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff,
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l2_cntxt_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr1 = {
-               (BNXT_ULP_RF_IDX_PHY_PORT >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_PHY_PORT & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 >> 8) & 0xff,
-                       BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr3 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "lcos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "lcos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "meta",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "meta",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "rcyc_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "rcyc_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.l3err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.l3err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tuntype",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tuntype",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tflags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tflags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tids",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tids",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tid",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tid",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tctxts",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tctxts",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tctxt",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tctxt",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tqos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tqos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "terr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "terr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-               .field_opr1 = {
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-               (uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr2 = {
-                       ULP_THOR_SYM_IP_PROTO_TCP},
-               .field_src3 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr3 = {
-               ULP_THOR_SYM_IP_PROTO_UDP}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3err.ipv4",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3err.ipv4",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3err.ipv6",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3err.ipv6",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-               .field_opr1 = {
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-               (uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-                       BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr3 = {
-               (BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
-               },
-       .field_info_spec = {
-               .description = "l4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-               .field_opr1 = {
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-               (uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-                       BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr3 = {
-               (BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.ack",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.ack",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.win",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.win",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.tsval",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.tsval",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.txecr",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.txecr",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       /* class_tid: 2, thor, table: port_table.rd */
-       {
-       .field_info_mask = {
-               .description = "dev.port_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff,
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "dev.port_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
-               .field_opr1 = {
-               (BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,
-               BNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}
-               }
-       },
-       /* class_tid: 2, thor, table: mac_addr_cache.rd */
-       {
-       .field_info_mask = {
-               .description = "svif",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               },
-       .field_info_spec = {
-               .description = "svif",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
-               },
-       .field_info_spec = {
-               .description = "tun_hdr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "one_tag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "one_tag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "mac_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-                       BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr3 = {
-               (BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC & 0xff}
-               },
-       .field_info_spec = {
-               .description = "mac_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-                       BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr3 = {
-               (BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC & 0xff}
-               }
-       },
-       /* class_tid: 2, thor, table: l2_cntxt_tcam.0 */
-       {
-       .field_info_mask = {
-               .description = "etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivlan_tpid_sel",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_ivlan_tpid_sel",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivlan_vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_ivlan_vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovlan_tpid_sel",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_ovlan_tpid_sel",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovlan_vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_ovlan_vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "mac1_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "mac1_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "mac0_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff,
-                       0xff,
-                       0xff,
-                       0xff,
-                       0xff,
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "mac0_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-                       BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr3 = {
-               (BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tunnel_id",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tunnel_id",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "llc",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "llc",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "roce",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "roce",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "metadata",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "metadata",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               },
-       .field_info_spec = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "mpass_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               2}
-               },
-       .field_info_spec = {
-               .description = "mpass_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               1}
-               },
-       .field_info_spec = {
-               .description = "valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               1}
-               }
-       },
-       /* class_tid: 2, thor, table: mac_addr_cache.wr */
-       {
-       .field_info_mask = {
-               .description = "svif",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               },
-       .field_info_spec = {
-               .description = "svif",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
-               },
-       .field_info_spec = {
-               .description = "tun_hdr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "one_tag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "one_tag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "vid",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "mac_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-                       BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr3 = {
-               (BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC & 0xff}
-               },
-       .field_info_spec = {
-               .description = "mac_addr",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
-                       BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr3 = {
-               (BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC & 0xff}
-               }
-       },
-       /* class_tid: 2, thor, table: profile_tcam_cache.l3_l4_rd */
-       {
-       .field_info_mask = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "hdr_sig_id",
-               .field_bit_size = 5,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "hdr_sig_id",
-               .field_bit_size = 5,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
-               .field_opr1 = {
-               (BNXT_ULP_CF_IDX_HDR_SIG_ID >> 8) & 0xff,
-               BNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}
-               }
-       },
-       /* class_tid: 2, thor, table: profile_tcam.l3_l4 */
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-               .field_opr1 = {
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-               (uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr2 = {
-                       ULP_THOR_SYM_L4_HDR_TYPE_TCP},
-               .field_src3 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr3 = {
-               ULP_THOR_SYM_L4_HDR_TYPE_UDP}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_L4_HDR_VALID_YES}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "ieh",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "ieh",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-               .field_opr1 = {
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
-               (uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr2 = {
-                       ULP_THOR_SYM_L3_HDR_TYPE_IPV4},
-               .field_src3 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr3 = {
-               ULP_THOR_SYM_L3_HDR_TYPE_IPV6}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_L3_HDR_VALID_YES}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "l2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l2_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_THOR_SYM_L2_HDR_VALID_YES}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_flags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_flags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_err",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_err",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tun_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "tun_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_is_udp_tcp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "tl4_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_ipv6_cmp_dst",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_ipv6_cmp_src",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_isIP",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "tl3_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_two_vtags",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_vtag_present",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_uc_mc_bc",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl2_hdr_type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "tl2_hdr_valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "hrec_next",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "hrec_next",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "agg_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "agg_error",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "metadata",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "metadata",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "pkt_type_0",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "pkt_type_0",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "pkt_type_1",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "pkt_type_1",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               1}
-               },
-       .field_info_spec = {
-               .description = "valid",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               1}
-               }
-       },
-       /* class_tid: 2, thor, table: profile_tcam_cache.wr */
-       {
-       .field_info_mask = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "recycle_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "prof_func_id",
-               .field_bit_size = 7,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr1 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "hdr_sig_id",
-               .field_bit_size = 5,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "hdr_sig_id",
-               .field_bit_size = 5,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
-               .field_opr1 = {
-               (BNXT_ULP_CF_IDX_HDR_SIG_ID >> 8) & 0xff,
-               BNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}
-               }
-       },
-       /* class_tid: 2, thor, table: wm.l4 */
-       {
-       .field_info_mask = {
-               .description = "wc_profile_id",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "wc_profile_id",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-               .field_opr1 = {
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
-               (uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr2 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 >> 8) & 0xff,
-                       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr3 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_cntxt_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff,
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l2_cntxt_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-               .field_opr1 = {
-               (BNXT_ULP_RF_IDX_PHY_PORT >> 8) & 0xff,
-               BNXT_ULP_RF_IDX_PHY_PORT & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 >> 8) & 0xff,
-                       BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
-               .field_opr3 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "parif",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "spif",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "svif",
-               .field_bit_size = 11,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "lcos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "lcos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "meta",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "meta",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "rcyc_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "rcyc_cnt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "loopback",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               },
-       .field_info_spec = {
-               .description = "tl3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl3.l3err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl3.l3err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tl4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tl4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tuntype",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tuntype",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tflags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tflags",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tids",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tids",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tid",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tid",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tctxts",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tctxts",
-               .field_bit_size = 24,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tctxt",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tctxt",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "tqos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "tqos",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "terr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "terr",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_l2type",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_dmac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_smac",
-               .field_bit_size = 48,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_dt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_sa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_nvt",
-               .field_bit_size = 2,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ovt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivp",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivd",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivv",
-               .field_bit_size = 12,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_ivt",
-               .field_bit_size = 3,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l2_etype",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.sip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip.ipv4",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip.ipv6",
-               .field_bit_size = 128,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.dip_selcmp.ipv6",
-               .field_bit_size = 72,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ttl",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "l3.prot",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-               .field_opr1 = {
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-               (uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr2 = {
-                       ULP_THOR_SYM_IP_PROTO_TCP},
-               .field_src3 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr3 = {
-               ULP_THOR_SYM_IP_PROTO_UDP}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.fid.ipv4",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.fid.ipv6",
-               .field_bit_size = 20,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.qos",
-               .field_bit_size = 8,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_nonext",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_esp",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_auth",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_dest",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_rthdr",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_hop",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.ieh_1frag",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.df",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3err.ipv4",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3err.ipv4",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l3.l3err.ipv6",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l3.l3err.ipv6",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.l4type",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.src",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-               .field_opr1 = {
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-               (uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-                       BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr3 = {
-               (BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
-               },
-       .field_info_spec = {
-               .description = "l4.dst",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-               .field_opr1 = {
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
-               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
-               (uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
-               .field_src2 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr2 = {
-                       (BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
-                       BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
-               .field_src3 = BNXT_ULP_FIELD_SRC_HF,
-               .field_opr3 = {
-               (BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
-               BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.flags",
-               .field_bit_size = 9,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.seq",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.ack",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.ack",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.win",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.win",
-               .field_bit_size = 16,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.pa",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.opt",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.tcpts",
-               .field_bit_size = 1,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.tsval",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.tsval",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.txecr",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.txecr",
-               .field_bit_size = 32,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       {
-       .field_info_mask = {
-               .description = "l4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               },
-       .field_info_spec = {
-               .description = "l4.err",
-               .field_bit_size = 4,
-               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
-               }
-       },
-       /* class_tid: 4, thor, table: port_table.wr_0 */
-       {
-       .field_info_mask = {
-               .description = "dev.port_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff,
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "dev.port_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
-               .field_opr1 = {
-               (BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,
-               BNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}
-               }
-       },
-       /* class_tid: 4, thor, table: port_table.wr_1 */
-       {
-       .field_info_mask = {
-               .description = "dev.port_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff,
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "dev.port_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
-               .field_opr1 = {
-               (BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,
-               BNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}
-               }
-       },
-       /* class_tid: 4, thor, table: port_table.rd */
-       {
-       .field_info_mask = {
-               .description = "dev.port_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff,
-                       0xff}
-               },
-       .field_info_spec = {
-               .description = "dev.port_id",
-               .field_bit_size = 10,
-               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
-               .field_opr1 = {
-               (BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,
-               BNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}
-               }
-       }
-};
-
-struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {
-       /* class_tid: 1, thor, table: l2_cntxt_tcam.gre */
-       {
-       .description = "prof_func_id",
-       .field_bit_size = 7,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr1 = {
-       (BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1 >> 8) & 0xff,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1 & 0xff}
-       },
-       {
-       .description = "ctxt_meta_prof",
-       .field_bit_size = 3,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "def_ctxt_data",
-       .field_bit_size = 16,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR & 0xff}
-       },
-       {
-       .description = "ctxt_opcode",
-       .field_bit_size = 3,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       ULP_THOR_SYM_CTXT_OPCODE_NORMAL_FLOW}
-       },
-       {
-       .description = "l2_cntxt_id",
-       .field_bit_size = 10,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_PHY_PORT >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_PHY_PORT & 0xff},
-       .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr2 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 & 0xff},
-       .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr3 = {
-       (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 >> 8) & 0xff,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 & 0xff}
-       },
-       {
-       .description = "parif",
-       .field_bit_size = 4,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CF,
-       .field_opr1 = {
-       (BNXT_ULP_CF_IDX_PHY_PORT_PARIF >> 8) & 0xff,
-       BNXT_ULP_CF_IDX_PHY_PORT_PARIF & 0xff}
-       },
-       /* class_tid: 1, thor, table: l2_cntxt_tcam_cache.gre_wr */
-       {
-       .description = "rid",
-       .field_bit_size = 32,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_RID & 0xff}
-       },
-       {
-       .description = "l2_cntxt_tcam_index",
-       .field_bit_size = 10,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_cntxt_id",
-       .field_bit_size = 10,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "src_property_ptr",
-       .field_bit_size = 10,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       /* class_tid: 1, thor, table: fkb_select.gre */
-       {
-       .description = "l2_cntxt_id.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
-       },
-       {
-       .description = "parif.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "spif.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "svif.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "lcos.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "meta.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "rcyc_cnt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "loopback.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_l2type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_dmac.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_smac.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_dt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_sa.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_nvt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ovp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ovd.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ovv.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ovt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ivp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ivd.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ivv.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ivt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_etype.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_l3type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_sip.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_sip_selcmp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_dip.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_dip_selcmp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ttl.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_prot.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
-       },
-       {
-       .description = "tl3_fid.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_qos.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_nonext.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_esp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_auth.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_dest.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_frag.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_rthdr.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_hop.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_1frag.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_df.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_l3err.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_l4type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_src.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_dst.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_flags.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_seq.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_pa.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_opt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_tcpts.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_err.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tuntype.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tflags.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tids.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tid.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tctxts.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tctxt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tqos.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "terr.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_l2type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_dmac.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_smac.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_dt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_sa.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_nvt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_ovp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_ovd.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_ovv.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_ovt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_ivp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_ivd.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_ivv.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_ivt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_etype.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_l3type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_sip.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_sip_selcmp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_dip.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_dip_selcmp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_ttl.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_prot.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
-       },
-       {
-       .description = "l3_fid.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_qos.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_ieh_nonext.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_ieh_esp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_ieh_auth.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_ieh_dest.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_ieh_frag.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_ieh_rthdr.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_ieh_hop.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_ieh_1frag.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_df.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_l3err.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_l4type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_src.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_dst.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
-       },
-       {
-       .description = "l4_flags.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_seq.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_ack.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_win.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_pa.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_opt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_tcpts.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_tsval.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_txecr.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_err.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       /* class_tid: 1, thor, table: profile_tcam.gre */
-       {
-       .description = "wc_key_id",
-       .field_bit_size = 6,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr1 = {
-       (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0 >> 8) & 0xff,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0 & 0xff}
-       },
-       {
-       .description = "wc_profile_id",
-       .field_bit_size = 8,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr1 = {
-       (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2 >> 8) & 0xff,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2 & 0xff}
-       },
-       {
-       .description = "wc_search_en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
-       },
-       {
-       .description = "em_key_type",
-       .field_bit_size = 2,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "em_key_id",
-       .field_bit_size = 6,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "em_profile_id",
-       .field_bit_size = 8,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "em_search_en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "pl_byp_lkup_en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       /* class_tid: 1, thor, table: wm.gre */
-       {
-       .description = "ctxt_data",
-       .field_bit_size = 14,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "meta_prof",
-       .field_bit_size = 3,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "opcode",
-       .field_bit_size = 3,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "data",
-       .field_bit_size = 16,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
-       },
-       {
-       .description = "strength",
-       .field_bit_size = 2,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
-       },
-       /* class_tid: 1, thor, table: wm.gre_low */
-       {
-       .description = "ctxt_data",
-       .field_bit_size = 14,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "meta_prof",
-       .field_bit_size = 3,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "opcode",
-       .field_bit_size = 3,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "data",
-       .field_bit_size = 16,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
-       },
-       {
-       .description = "strength",
-       .field_bit_size = 2,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
-       },
-       /* class_tid: 1, thor, table: l2_cntxt_tcam.0 */
-       {
-       .description = "prof_func_id",
-       .field_bit_size = 7,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr1 = {
-       (BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 >> 8) & 0xff,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 & 0xff}
-       },
-       {
-       .description = "ctxt_meta_prof",
-       .field_bit_size = 3,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "def_ctxt_data",
-       .field_bit_size = 16,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR & 0xff}
-       },
-       {
-       .description = "ctxt_opcode",
-       .field_bit_size = 3,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       ULP_THOR_SYM_CTXT_OPCODE_NORMAL_FLOW}
-       },
-       {
-       .description = "l2_cntxt_id",
-       .field_bit_size = 10,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_PHY_PORT >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_PHY_PORT & 0xff},
-       .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr2 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 & 0xff},
-       .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr3 = {
-       (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 >> 8) & 0xff,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 & 0xff}
-       },
-       {
-       .description = "parif",
-       .field_bit_size = 4,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CF,
-       .field_opr1 = {
-       (BNXT_ULP_CF_IDX_PHY_PORT_PARIF >> 8) & 0xff,
-       BNXT_ULP_CF_IDX_PHY_PORT_PARIF & 0xff}
-       },
-       /* class_tid: 1, thor, table: mac_addr_cache.gre_frag_wr */
-       {
-       .description = "rid",
-       .field_bit_size = 32,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_RID & 0xff}
-       },
-       {
-       .description = "l2_cntxt_tcam_index",
-       .field_bit_size = 10,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_cntxt_id",
-       .field_bit_size = 10,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "src_property_ptr",
-       .field_bit_size = 10,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       /* class_tid: 1, thor, table: fkb_select.gre_frag */
-       {
-       .description = "l2_cntxt_id.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
-       },
-       {
-       .description = "parif.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "spif.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "svif.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "lcos.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "meta.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "rcyc_cnt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "loopback.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_l2type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_dmac.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_smac.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_dt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_sa.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_nvt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ovp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ovd.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ovv.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ovt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ivp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ivd.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ivv.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ivt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_etype.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_l3type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_sip.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_sip_selcmp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_dip.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_dip_selcmp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ttl.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_prot.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
-       },
-       {
-       .description = "tl3_fid.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_qos.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_nonext.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_esp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_auth.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_dest.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_frag.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_rthdr.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_hop.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_1frag.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_df.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_l3err.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_l4type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_src.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_dst.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_flags.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_seq.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_pa.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_opt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_tcpts.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_err.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tuntype.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tflags.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tids.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tid.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tctxts.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tctxt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tqos.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "terr.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_l2type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_dmac.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_smac.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_dt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_sa.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_nvt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_ovp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_ovd.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_ovv.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_ovt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_ivp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_ivd.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_ivv.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_ivt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_etype.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_l3type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_sip.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_sip_selcmp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_dip.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_dip_selcmp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_ttl.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_prot.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
-       },
-       {
-       .description = "l3_fid.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_qos.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_ieh_nonext.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_ieh_esp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_ieh_auth.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_ieh_dest.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_ieh_frag.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_ieh_rthdr.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_ieh_hop.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_ieh_1frag.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_df.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l3_l3err.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_l4type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_src.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_dst.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
-       },
-       {
-       .description = "l4_flags.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_seq.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_ack.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_win.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_pa.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_opt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_tcpts.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_tsval.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_txecr.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l4_err.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       /* class_tid: 1, thor, table: profile_tcam.gre_frag */
-       {
-       .description = "wc_key_id",
-       .field_bit_size = 6,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr1 = {
-       (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0 >> 8) & 0xff,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0 & 0xff}
-       },
-       {
-       .description = "wc_profile_id",
-       .field_bit_size = 8,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr1 = {
-       (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 >> 8) & 0xff,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 & 0xff}
-       },
-       {
-       .description = "wc_search_en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
-       },
-       {
-       .description = "em_key_type",
-       .field_bit_size = 2,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "em_key_id",
-       .field_bit_size = 6,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "em_profile_id",
-       .field_bit_size = 8,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "em_search_en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "pl_byp_lkup_en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       /* class_tid: 1, thor, table: wm.gre_frag */
-       {
-       .description = "ctxt_data",
-       .field_bit_size = 14,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "meta_prof",
-       .field_bit_size = 3,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "opcode",
-       .field_bit_size = 3,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "data",
-       .field_bit_size = 16,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
-       },
-       {
-       .description = "strength",
-       .field_bit_size = 2,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
-       },
-       /* class_tid: 1, thor, table: wm.gre_frag_low */
-       {
-       .description = "ctxt_data",
-       .field_bit_size = 14,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "meta_prof",
-       .field_bit_size = 3,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "opcode",
-       .field_bit_size = 3,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "data",
-       .field_bit_size = 16,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
-       },
-       {
-       .description = "strength",
-       .field_bit_size = 2,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
-       },
-       /* class_tid: 1, thor, table: l2_cntxt_tcam.0 */
-       {
-       .description = "prof_func_id",
-       .field_bit_size = 7,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr1 = {
-       (BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 >> 8) & 0xff,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 & 0xff}
-       },
-       {
-       .description = "ctxt_meta_prof",
-       .field_bit_size = 3,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "def_ctxt_data",
-       .field_bit_size = 16,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR & 0xff}
-       },
-       {
-       .description = "ctxt_opcode",
-       .field_bit_size = 3,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       ULP_THOR_SYM_CTXT_OPCODE_NORMAL_FLOW}
-       },
-       {
-       .description = "l2_cntxt_id",
-       .field_bit_size = 10,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_PHY_PORT >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_PHY_PORT & 0xff},
-       .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr2 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 & 0xff},
-       .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr3 = {
-       (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 >> 8) & 0xff,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 & 0xff}
-       },
-       {
-       .description = "parif",
-       .field_bit_size = 4,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CF,
-       .field_opr1 = {
-       (BNXT_ULP_CF_IDX_PHY_PORT_PARIF >> 8) & 0xff,
-       BNXT_ULP_CF_IDX_PHY_PORT_PARIF & 0xff}
-       },
-       /* class_tid: 1, thor, table: mac_addr_cache.wr */
-       {
-       .description = "rid",
-       .field_bit_size = 32,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_RID & 0xff}
-       },
-       {
-       .description = "l2_cntxt_tcam_index",
-       .field_bit_size = 10,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_cntxt_id",
-       .field_bit_size = 10,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "src_property_ptr",
-       .field_bit_size = 10,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       /* class_tid: 1, thor, table: fkb_select.icmpv4 */
-       {
-       .description = "l2_cntxt_id.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
-       },
-       {
-       .description = "parif.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "spif.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "svif.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "lcos.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "meta.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "rcyc_cnt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "loopback.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_l2type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_dmac.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_smac.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_dt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_sa.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_nvt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ovp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ovd.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ovv.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ovt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ivp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ivd.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ivv.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_ivt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl2_etype.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_l3type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_sip.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_sip_selcmp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_dip.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_dip_selcmp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ttl.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_prot.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
-       },
-       {
-       .description = "tl3_fid.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_qos.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_nonext.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_esp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_auth.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_dest.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_frag.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_rthdr.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_hop.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_ieh_1frag.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_df.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl3_l3err.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_l4type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_src.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_dst.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_flags.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_seq.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_pa.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_opt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_tcpts.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tl4_err.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tuntype.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tflags.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tids.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tid.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tctxts.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tctxt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "tqos.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "terr.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_l2type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_dmac.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_smac.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_dt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "l2_sa.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
+       .tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+       .tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
+       .fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+       .mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+       .byte_order = BNXT_ULP_BYTE_ORDER_LE,
+       .result_start_idx = 242,
+       .result_bit_size = 128,
+       .result_num_fields = 17
+       }
+};
+
+struct bnxt_ulp_mapper_cond_info ulp_thor_class_cond_list[] = {
+       /* cond_reject: thor, class_tid: 1 */
        {
-       .description = "l2_nvt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .cond_opcode = BNXT_ULP_COND_OPC_HDR_BIT_IS_SET,
+       .cond_operand = BNXT_ULP_HDR_BIT_O_IPV6
        },
        {
-       .description = "l2_ovp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .cond_opcode = BNXT_ULP_COND_OPC_FIELD_BIT_IS_SET,
+       .cond_operand = BNXT_ULP_GLB_HF_ID_O_ETH_SMAC
        },
        {
-       .description = "l2_ovd.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .cond_opcode = BNXT_ULP_COND_OPC_FLOW_PAT_MATCH,
+       .cond_operand = 2
        },
        {
-       .description = "l2_ovv.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .cond_opcode = BNXT_ULP_COND_OPC_FLOW_PAT_MATCH,
+       .cond_operand = 3
        },
+       /* cond_execute: class_tid: 1, l2_cntxt_tcam_cache.rd */
        {
-       .description = "l2_ovt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .cond_opcode = BNXT_ULP_COND_OPC_FIELD_BIT_NOT_SET,
+       .cond_operand = BNXT_ULP_GLB_HF_ID_O_ETH_DMAC
        },
+       /* cond_execute: class_tid: 1, control.0 */
        {
-       .description = "l2_ivp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+       .cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
        },
+       /* cond_execute: class_tid: 1, control.l3_l4 */
        {
-       .description = "l2_ivd.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+       .cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
        },
+       /* cond_execute: class_tid: 1, wm.l3_l4 */
        {
-       .description = "l2_ivv.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .cond_opcode = BNXT_ULP_COND_OPC_CF_IS_SET,
+       .cond_operand = BNXT_ULP_CF_IDX_O_L4
        },
+       /* cond_reject: thor, class_tid: 3 */
        {
-       .description = "l2_ivt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .cond_opcode = BNXT_ULP_COND_OPC_CF_IS_SET,
+       .cond_operand = BNXT_ULP_CF_IDX_VFR_MODE
        },
+       /* cond_execute: class_tid: 3, control.ing_0 */
        {
-       .description = "l2_etype.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+       .cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
        },
+       /* cond_execute: class_tid: 3, control.egr_0 */
        {
-       .description = "l3_l3type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .cond_opcode = BNXT_ULP_COND_OPC_CF_NOT_SET,
+       .cond_operand = BNXT_ULP_CF_IDX_VFR_MODE
        },
+       /* cond_execute: class_tid: 3, control.egr_1 */
        {
-       .description = "l3_sip.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+       .cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
        },
+       /* cond_reject: thor, class_tid: 4 */
        {
-       .description = "l3_sip_selcmp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .cond_opcode = BNXT_ULP_COND_OPC_CF_IS_SET,
+       .cond_operand = BNXT_ULP_CF_IDX_VFR_MODE
+       }
+};
+
+struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
+       /* class_tid: 1, , table: port_table.rd */
+       {
+       .field_info_mask = {
+               .description = "dev.port_id",
+               .field_bit_size = 10,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff,
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "dev.port_id",
+               .field_bit_size = 10,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
+               .field_opr1 = {
+               (BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,
+               BNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}
+               }
        },
+       /* class_tid: 1, , table: l2_cntxt_tcam_cache.rd */
        {
-       .description = "l3_dip.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "svif",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr1 = {
+               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
+               },
+       .field_info_spec = {
+               .description = "svif",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr1 = {
+               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
+               }
        },
+       /* class_tid: 1, , table: mac_addr_cache.rd */
        {
-       .description = "l3_dip_selcmp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "svif",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr1 = {
+               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
+               },
+       .field_info_spec = {
+               .description = "svif",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr1 = {
+               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
+               }
        },
        {
-       .description = "l3_ttl.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tun_hdr",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+               .field_opr1 = {
+               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
+               },
+       .field_info_spec = {
+               .description = "tun_hdr",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+               .field_opr1 = {
+               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
+               }
        },
        {
-       .description = "l3_prot.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
+       .field_info_mask = {
+               .description = "one_tag",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "one_tag",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "l3_fid.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "vid",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "vid",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "l3_qos.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "mac_addr",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr1 = {
+               (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
+               },
+       .field_info_spec = {
+               .description = "mac_addr",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr1 = {
+               (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
+               }
        },
+       /* class_tid: 1, , table: l2_cntxt_tcam.0 */
        {
-       .description = "l3_ieh_nonext.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "etype",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "etype",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "l3_ieh_esp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_ivlan_tpid_sel",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "l2_ivlan_tpid_sel",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "l3_ieh_auth.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_ivlan_vid",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "l2_ivlan_vid",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "l3_ieh_dest.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_ovlan_tpid_sel",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "l2_ovlan_tpid_sel",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "l3_ieh_frag.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_ovlan_vid",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "l2_ovlan_vid",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "l3_ieh_rthdr.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "two_vtags",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "two_vtags",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "l3_ieh_hop.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "vtag_present",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "vtag_present",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "l3_ieh_1frag.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "mac1_addr",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "mac1_addr",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "l3_df.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "mac0_addr",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr1 = {
+               (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
+               },
+       .field_info_spec = {
+               .description = "mac0_addr",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr1 = {
+               (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
+               }
        },
        {
-       .description = "l3_l3err.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tunnel_id",
+               .field_bit_size = 24,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "tunnel_id",
+               .field_bit_size = 24,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "l4_l4type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tun_hdr_type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+               .field_opr1 = {
+               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
+               },
+       .field_info_spec = {
+               .description = "tun_hdr_type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+               .field_opr1 = {
+               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
+               }
        },
        {
-       .description = "l4_src.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "llc",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "llc",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "l4_dst.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
+       .field_info_mask = {
+               .description = "roce",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "roce",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "l4_flags.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "metadata",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "metadata",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "l4_seq.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "svif",
+               .field_bit_size = 11,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr1 = {
+               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
+               },
+       .field_info_spec = {
+               .description = "svif",
+               .field_bit_size = 11,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr1 = {
+               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
+               }
        },
        {
-       .description = "l4_ack.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "parif",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "parif",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "l4_win.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "spif",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "spif",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "l4_pa.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "loopback",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "loopback",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "l4_opt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "recycle_cnt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "recycle_cnt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "l4_tcpts.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "mpass_cnt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+               .field_opr1 = {
+               2}
+               },
+       .field_info_spec = {
+               .description = "mpass_cnt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "l4_tsval.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "valid",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+               .field_opr1 = {
+               1}
+               },
+       .field_info_spec = {
+               .description = "valid",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+               .field_opr1 = {
+               1}
+               }
        },
+       /* class_tid: 1, , table: mac_addr_cache.wr */
        {
-       .description = "l4_txecr.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "svif",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr1 = {
+               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
+               },
+       .field_info_spec = {
+               .description = "svif",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr1 = {
+               (BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
+               }
        },
        {
-       .description = "l4_err.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tun_hdr",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+               .field_opr1 = {
+               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
+               },
+       .field_info_spec = {
+               .description = "tun_hdr",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+               .field_opr1 = {
+               ULP_THOR_SYM_TUN_HDR_TYPE_NONE}
+               }
        },
-       /* class_tid: 1, thor, table: profile_tcam.icmpv4 */
        {
-       .description = "wc_key_id",
-       .field_bit_size = 6,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr1 = {
-       (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0 >> 8) & 0xff,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0 & 0xff}
+       .field_info_mask = {
+               .description = "one_tag",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "one_tag",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "wc_profile_id",
-       .field_bit_size = 8,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr1 = {
-       (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 >> 8) & 0xff,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 & 0xff}
+       .field_info_mask = {
+               .description = "vid",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "vid",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "wc_search_en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
+       .field_info_mask = {
+               .description = "mac_addr",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr1 = {
+               (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
+               },
+       .field_info_spec = {
+               .description = "mac_addr",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr1 = {
+               (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
+               }
        },
+       /* class_tid: 1, , table: profile_tcam_cache.l3_l4_rd */
        {
-       .description = "em_key_type",
-       .field_bit_size = 2,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "recycle_cnt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "recycle_cnt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "em_key_id",
-       .field_bit_size = 6,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "prof_func_id",
+               .field_bit_size = 7,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "prof_func_id",
+               .field_bit_size = 7,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+               .field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
+               .field_opr1 = {
+               (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
+               .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
+               .field_opr2 = {
+                       (BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID >> 8) & 0xff,
+                       BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff},
+               .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
+               .field_opr3 = {
+               (BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,
+               BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}
+               }
        },
        {
-       .description = "em_profile_id",
-       .field_bit_size = 8,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "hdr_sig_id",
+               .field_bit_size = 5,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "hdr_sig_id",
+               .field_bit_size = 5,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
+               .field_opr1 = {
+               (BNXT_ULP_CF_IDX_HDR_SIG_ID >> 8) & 0xff,
+               BNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}
+               }
        },
+       /* class_tid: 1, , table: profile_tcam.l3_l4 */
        {
-       .description = "em_search_en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l4_hdr_is_udp_tcp",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "l4_hdr_is_udp_tcp",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "pl_byp_lkup_en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l4_hdr_type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
+               .field_opr1 = {
+               (BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,
+               BNXT_ULP_CF_IDX_O_L4 & 0xff},
+               .field_src2 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_src3 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "l4_hdr_type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
+               .field_opr1 = {
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
+               (uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
+               .field_src2 = BNXT_ULP_FIELD_SRC_CONST,
+               .field_opr2 = {
+                       ULP_THOR_SYM_L4_HDR_TYPE_TCP},
+               .field_src3 = BNXT_ULP_FIELD_SRC_CONST,
+               .field_opr3 = {
+               ULP_THOR_SYM_L4_HDR_TYPE_UDP}
+               }
+       },
+       {
+       .field_info_mask = {
+               .description = "l4_hdr_error",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
+               .field_opr1 = {
+               (BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,
+               BNXT_ULP_CF_IDX_O_L4 & 0xff}
+               },
+       .field_info_spec = {
+               .description = "l4_hdr_error",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
-       /* class_tid: 1, thor, table: profile_tcam_cache.icmpv4_wr */
        {
-       .description = "rid",
-       .field_bit_size = 32,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_RID & 0xff}
+       .field_info_mask = {
+               .description = "l4_hdr_valid",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
+               .field_opr1 = {
+               (BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,
+               BNXT_ULP_CF_IDX_O_L4 & 0xff}
+               },
+       .field_info_spec = {
+               .description = "l4_hdr_valid",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
+               .field_opr1 = {
+               (BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,
+               BNXT_ULP_CF_IDX_O_L4 & 0xff}
+               }
        },
        {
-       .description = "profile_tcam_index",
-       .field_bit_size = 10,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "ieh",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "ieh",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "em_profile_id",
-       .field_bit_size = 8,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l3_ipv6_cmp_dst",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "l3_ipv6_cmp_dst",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "em_key_id",
-       .field_bit_size = 8,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l3_ipv6_cmp_src",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "l3_ipv6_cmp_src",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "wc_profile_id",
-       .field_bit_size = 8,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l3_hdr_isIP",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "l3_hdr_isIP",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "wc_key_id",
-       .field_bit_size = 8,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l3_hdr_type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "l3_hdr_type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "flow_sig_id",
-       .field_bit_size = 8,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l3_hdr_error",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "l3_hdr_error",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
-       /* class_tid: 1, thor, table: wm.icmpv4 */
        {
-       .description = "ctxt_data",
-       .field_bit_size = 14,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l3_hdr_valid",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "l3_hdr_valid",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+               .field_opr1 = {
+               ULP_THOR_SYM_L3_HDR_VALID_YES}
+               }
        },
        {
-       .description = "meta_prof",
-       .field_bit_size = 3,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_two_vtags",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "l2_two_vtags",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "opcode",
-       .field_bit_size = 3,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_vtag_present",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "l2_vtag_present",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "data",
-       .field_bit_size = 16,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
+       .field_info_mask = {
+               .description = "l2_uc_mc_bc",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "l2_uc_mc_bc",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "strength",
-       .field_bit_size = 2,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
+       .field_info_mask = {
+               .description = "l2_hdr_type",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "l2_hdr_type",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
-       /* class_tid: 1, thor, table: wm.icmpv4_low */
        {
-       .description = "ctxt_data",
-       .field_bit_size = 14,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_hdr_error",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "l2_hdr_error",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "meta_prof",
-       .field_bit_size = 3,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_hdr_valid",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "l2_hdr_valid",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+               .field_opr1 = {
+               ULP_THOR_SYM_L2_HDR_VALID_YES}
+               }
        },
        {
-       .description = "opcode",
-       .field_bit_size = 3,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tun_hdr_flags",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "tun_hdr_flags",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "data",
-       .field_bit_size = 16,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
+       .field_info_mask = {
+               .description = "tun_hdr_type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "tun_hdr_type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "strength",
-       .field_bit_size = 2,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
+       .field_info_mask = {
+               .description = "tun_hdr_err",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "tun_hdr_err",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
-       /* class_tid: 1, thor, table: fkb_select.icmpv6 */
        {
-       .description = "l2_cntxt_id.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
+       .field_info_mask = {
+               .description = "tun_hdr_valid",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "tun_hdr_valid",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "parif.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl4_hdr_is_udp_tcp",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "tl4_hdr_is_udp_tcp",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "spif.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl4_hdr_type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "tl4_hdr_type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "svif.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl4_hdr_error",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "tl4_hdr_error",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "lcos.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl4_hdr_valid",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "tl4_hdr_valid",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "meta.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3_ipv6_cmp_dst",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "tl3_ipv6_cmp_dst",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "rcyc_cnt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3_ipv6_cmp_src",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "tl3_ipv6_cmp_src",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "loopback.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3_hdr_isIP",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "tl3_hdr_isIP",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_l2type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3_hdr_type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "tl3_hdr_type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_dmac.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3_hdr_error",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "tl3_hdr_error",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_smac.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3_hdr_valid",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "tl3_hdr_valid",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_dt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl2_two_vtags",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "tl2_two_vtags",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_sa.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl2_vtag_present",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "tl2_vtag_present",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_nvt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl2_uc_mc_bc",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "tl2_uc_mc_bc",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_ovp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl2_hdr_type",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "tl2_hdr_type",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_ovd.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl2_hdr_valid",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "tl2_hdr_valid",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_ovv.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "hrec_next",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "hrec_next",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_ovt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "prof_func_id",
+               .field_bit_size = 7,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "prof_func_id",
+               .field_bit_size = 7,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+               .field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
+               .field_opr1 = {
+               (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
+               .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
+               .field_opr2 = {
+                       (BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID >> 8) & 0xff,
+                       BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff},
+               .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
+               .field_opr3 = {
+               (BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,
+               BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}
+               }
        },
        {
-       .description = "tl2_ivp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "agg_error",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "agg_error",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_ivd.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "metadata",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "metadata",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_ivv.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "pkt_type_0",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "pkt_type_0",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_ivt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "pkt_type_1",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "pkt_type_1",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_etype.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "valid",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+               .field_opr1 = {
+               1}
+               },
+       .field_info_spec = {
+               .description = "valid",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+               .field_opr1 = {
+               1}
+               }
        },
+       /* class_tid: 1, , table: profile_tcam_cache.l3_l4_wr */
        {
-       .description = "tl3_l3type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "recycle_cnt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "recycle_cnt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl3_sip.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "prof_func_id",
+               .field_bit_size = 7,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "prof_func_id",
+               .field_bit_size = 7,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+               .field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
+               .field_opr1 = {
+               (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
+               .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
+               .field_opr2 = {
+                       (BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID >> 8) & 0xff,
+                       BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff},
+               .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
+               .field_opr3 = {
+               (BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,
+               BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}
+               }
        },
        {
-       .description = "tl3_sip_selcmp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "hdr_sig_id",
+               .field_bit_size = 5,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "hdr_sig_id",
+               .field_bit_size = 5,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
+               .field_opr1 = {
+               (BNXT_ULP_CF_IDX_HDR_SIG_ID >> 8) & 0xff,
+               BNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}
+               }
        },
+       /* class_tid: 1, , table: wm.l3_l4 */
        {
-       .description = "tl3_dip.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "wc_profile_id",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "wc_profile_id",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+               .field_opr1 = {
+               (BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0 >> 8) & 0xff,
+               BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0 & 0xff}
+               }
        },
        {
-       .description = "tl3_dip_selcmp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_cntxt_id",
+               .field_bit_size = 10,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff,
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "l2_cntxt_id",
+               .field_bit_size = 10,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_RF,
+               .field_opr1 = {
+               (BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,
+               BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}
+               }
        },
        {
-       .description = "tl3_ttl.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "parif",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "parif",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tl3_prot.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
+       .field_info_mask = {
+               .description = "spif",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "spif",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tl3_fid.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "svif",
+               .field_bit_size = 11,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "svif",
+               .field_bit_size = 11,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tl3_qos.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "lcos",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "lcos",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tl3_ieh_nonext.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "meta",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "meta",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tl3_ieh_esp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "rcyc_cnt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "rcyc_cnt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tl3_ieh_auth.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "loopback",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "loopback",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tl3_ieh_dest.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl2_l2type",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl2_l2type",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tl3_ieh_frag.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl2_dmac",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl2_dmac",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tl3_ieh_rthdr.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl2_smac",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl2_smac",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tl3_ieh_hop.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl2_dt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl2_dt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tl3_ieh_1frag.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl2_sa",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl2_sa",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tl3_df.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl2_nvt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl2_nvt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tl3_l3err.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl2_ovp",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl2_ovp",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tl4_l4type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl2_ovd",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl2_ovd",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tl4_src.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl2_ovv",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl2_ovv",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tl4_dst.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl2_ovt",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl2_ovt",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tl4_flags.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl2_ivp",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl2_ivp",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tl4_seq.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl2_ivd",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl2_ivd",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tl4_pa.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl2_ivv",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl2_ivv",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tl4_opt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl2_ivt",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl2_ivt",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tl4_tcpts.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl2_etype",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl2_etype",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tl4_err.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3.l3type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl3.l3type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tuntype.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3.sip.ipv4",
+               .field_bit_size = 32,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl3.sip.ipv4",
+               .field_bit_size = 32,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tflags.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3.sip.ipv6",
+               .field_bit_size = 128,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl3.sip.ipv6",
+               .field_bit_size = 128,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tids.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3.sip_selcmp.ipv6",
+               .field_bit_size = 72,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl3.sip_selcmp.ipv6",
+               .field_bit_size = 72,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tid.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3.dip.ipv4",
+               .field_bit_size = 32,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl3.dip.ipv4",
+               .field_bit_size = 32,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tctxts.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3.dip.ipv6",
+               .field_bit_size = 128,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl3.dip.ipv6",
+               .field_bit_size = 128,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tctxt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3.dip_selcmp.ipv6",
+               .field_bit_size = 72,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl3.dip_selcmp.ipv6",
+               .field_bit_size = 72,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "tqos.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3.ttl",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl3.ttl",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "terr.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3.prot",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl3.prot",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l2_l2type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3.fid.ipv4",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl3.fid.ipv4",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l2_dmac.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3.fid.ipv6",
+               .field_bit_size = 20,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl3.fid.ipv6",
+               .field_bit_size = 20,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l2_smac.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3.qos",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl3.qos",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l2_dt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3.ieh_nonext",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl3.ieh_nonext",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l2_sa.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3.ieh_esp",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl3.ieh_esp",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l2_nvt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3.ieh_auth",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl3.ieh_auth",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l2_ovp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3.ieh_dest",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl3.ieh_dest",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l2_ovd.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3.ieh_frag",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl3.ieh_frag",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l2_ovv.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3.ieh_rthdr",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl3.ieh_rthdr",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l2_ovt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3.ieh_hop",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl3.ieh_hop",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l2_ivp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3.ieh_1frag",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl3.ieh_1frag",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l2_ivd.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3.df",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl3.df",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l2_ivv.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl3.l3err",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl3.l3err",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l2_ivt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl4.l4type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl4.l4type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l2_etype.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl4.src",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl4.src",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l3_l3type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl4.dst",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl4.dst",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l3_sip.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl4.flags",
+               .field_bit_size = 9,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl4.flags",
+               .field_bit_size = 9,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l3_sip_selcmp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl4.seq",
+               .field_bit_size = 32,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl4.seq",
+               .field_bit_size = 32,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l3_dip.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl4.pa",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl4.pa",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l3_dip_selcmp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl4.opt",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl4.opt",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l3_ttl.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tl4.tcpts",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl4.tcpts",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l3_prot.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
+       .field_info_mask = {
+               .description = "tl4.err",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tl4.err",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l3_fid.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tuntype",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tuntype",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l3_qos.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tflags",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tflags",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l3_ieh_nonext.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tids",
+               .field_bit_size = 24,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tids",
+               .field_bit_size = 24,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l3_ieh_esp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tid",
+               .field_bit_size = 32,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tid",
+               .field_bit_size = 32,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l3_ieh_auth.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tctxts",
+               .field_bit_size = 24,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tctxts",
+               .field_bit_size = 24,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l3_ieh_dest.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tctxt",
+               .field_bit_size = 32,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tctxt",
+               .field_bit_size = 32,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l3_ieh_frag.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tqos",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "tqos",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l3_ieh_rthdr.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "terr",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "terr",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l3_ieh_hop.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_l2type",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l2_l2type",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l3_ieh_1frag.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_dmac",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l2_dmac",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l3_df.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_smac",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l2_smac",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l3_l3err.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_dt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l2_dt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l4_l4type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_sa",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l2_sa",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l4_src.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_nvt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l2_nvt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l4_dst.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
+       .field_info_mask = {
+               .description = "l2_ovp",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l2_ovp",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l4_flags.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_ovd",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l2_ovd",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l4_seq.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_ovv",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l2_ovv",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l4_ack.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_ovt",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l2_ovt",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l4_win.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_ivp",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l2_ivp",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l4_pa.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_ivd",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l2_ivd",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l4_opt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_ivv",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l2_ivv",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l4_tcpts.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_ivt",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l2_ivt",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l4_tsval.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_etype",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l2_etype",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l4_txecr.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l3.l3type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l3.l3type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "l4_err.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l3.sip.ipv4",
+               .field_bit_size = 32,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr1 = {
+               (BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}
+               },
+       .field_info_spec = {
+               .description = "l3.sip.ipv4",
+               .field_bit_size = 32,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr1 = {
+               (BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}
+               }
        },
-       /* class_tid: 1, thor, table: profile_tcam.icmpv6 */
        {
-       .description = "wc_key_id",
-       .field_bit_size = 6,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr1 = {
-       (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0 >> 8) & 0xff,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0 & 0xff}
+       .field_info_mask = {
+               .description = "l3.sip.ipv6",
+               .field_bit_size = 128,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l3.sip.ipv6",
+               .field_bit_size = 128,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "wc_profile_id",
-       .field_bit_size = 8,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr1 = {
-       (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 >> 8) & 0xff,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 & 0xff}
+       .field_info_mask = {
+               .description = "l3.sip_selcmp.ipv6",
+               .field_bit_size = 72,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l3.sip_selcmp.ipv6",
+               .field_bit_size = 72,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "wc_search_en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
+       .field_info_mask = {
+               .description = "l3.dip.ipv4",
+               .field_bit_size = 32,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr1 = {
+               (BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}
+               },
+       .field_info_spec = {
+               .description = "l3.dip.ipv4",
+               .field_bit_size = 32,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr1 = {
+               (BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}
+               }
        },
        {
-       .description = "em_key_type",
-       .field_bit_size = 2,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l3.dip.ipv6",
+               .field_bit_size = 128,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l3.dip.ipv6",
+               .field_bit_size = 128,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "em_key_id",
-       .field_bit_size = 6,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l3.dip_selcmp.ipv6",
+               .field_bit_size = 72,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l3.dip_selcmp.ipv6",
+               .field_bit_size = 72,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "em_profile_id",
-       .field_bit_size = 8,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l3.ttl",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l3.ttl",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "em_search_en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l3.prot",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
+               .field_opr1 = {
+               (BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,
+               BNXT_ULP_CF_IDX_O_L4 & 0xff},
+               .field_src2 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_src3 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "l3.prot",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
+               .field_opr1 = {
+               (BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,
+               BNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff}
+               }
        },
        {
-       .description = "pl_byp_lkup_en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l3.fid.ipv4",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l3.fid.ipv4",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
-       /* class_tid: 1, thor, table: profile_tcam_cache.icmpv6_wr */
        {
-       .description = "rid",
-       .field_bit_size = 32,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_RID & 0xff}
+       .field_info_mask = {
+               .description = "l3.fid.ipv6",
+               .field_bit_size = 20,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l3.fid.ipv6",
+               .field_bit_size = 20,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "profile_tcam_index",
-       .field_bit_size = 10,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l3.qos",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l3.qos",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "em_profile_id",
-       .field_bit_size = 8,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l3.ieh_nonext",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l3.ieh_nonext",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "em_key_id",
-       .field_bit_size = 8,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l3.ieh_esp",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l3.ieh_esp",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "wc_profile_id",
-       .field_bit_size = 8,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l3.ieh_auth",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l3.ieh_auth",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "wc_key_id",
-       .field_bit_size = 8,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l3.ieh_dest",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l3.ieh_dest",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "flow_sig_id",
-       .field_bit_size = 8,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l3.ieh_frag",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l3.ieh_frag",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
-       /* class_tid: 1, thor, table: wm.icmpv6 */
        {
-       .description = "ctxt_data",
-       .field_bit_size = 14,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l3.ieh_rthdr",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l3.ieh_rthdr",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "meta_prof",
-       .field_bit_size = 3,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l3.ieh_hop",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l3.ieh_hop",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "opcode",
-       .field_bit_size = 3,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l3.ieh_1frag",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l3.ieh_1frag",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "data",
-       .field_bit_size = 16,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
+       .field_info_mask = {
+               .description = "l3.df",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l3.df",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "strength",
-       .field_bit_size = 2,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
+       .field_info_mask = {
+               .description = "l3.l3err.ipv4",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l3.l3err.ipv4",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
-       /* class_tid: 1, thor, table: wm.icmpv6_low */
        {
-       .description = "ctxt_data",
-       .field_bit_size = 14,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l3.l3err.ipv6",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l3.l3err.ipv6",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "meta_prof",
-       .field_bit_size = 3,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l4.l4type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l4.l4type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "opcode",
-       .field_bit_size = 3,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l4.src",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
+               .field_opr1 = {
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
+               (uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
+               .field_src2 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr2 = {
+                       (BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,
+                       BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff},
+               .field_src3 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr3 = {
+               (BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff}
+               },
+       .field_info_spec = {
+               .description = "l4.src",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
+               .field_opr1 = {
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
+               (uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
+               .field_src2 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr2 = {
+                       (BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,
+                       BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff},
+               .field_src3 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr3 = {
+               (BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff}
+               }
+       },
+       {
+       .field_info_mask = {
+               .description = "l4.dst",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
+               .field_opr1 = {
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
+               (uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
+               .field_src2 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr2 = {
+                       (BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
+                       BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
+               .field_src3 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr3 = {
+               (BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
+               },
+       .field_info_spec = {
+               .description = "l4.dst",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+               .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
+               .field_opr1 = {
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,
+               ((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,
+               (uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},
+               .field_src2 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr2 = {
+                       (BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,
+                       BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff},
+               .field_src3 = BNXT_ULP_FIELD_SRC_HF,
+               .field_opr3 = {
+               (BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,
+               BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff}
+               }
        },
        {
-       .description = "data",
-       .field_bit_size = 16,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
+       .field_info_mask = {
+               .description = "l4.flags",
+               .field_bit_size = 9,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l4.flags",
+               .field_bit_size = 9,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "strength",
-       .field_bit_size = 2,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
+       .field_info_mask = {
+               .description = "l4.seq",
+               .field_bit_size = 32,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l4.seq",
+               .field_bit_size = 32,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
-       /* class_tid: 1, thor, table: fkb_select.l3_l4_wm */
        {
-       .description = "l2_cntxt_id.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
+       .field_info_mask = {
+               .description = "l4.ack",
+               .field_bit_size = 32,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l4.ack",
+               .field_bit_size = 32,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "parif.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l4.win",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l4.win",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "spif.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l4.pa",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l4.pa",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "svif.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l4.opt",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l4.opt",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "lcos.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l4.tcpts",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l4.tcpts",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "meta.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l4.tsval",
+               .field_bit_size = 32,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l4.tsval",
+               .field_bit_size = 32,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "rcyc_cnt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l4.txecr",
+               .field_bit_size = 32,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l4.txecr",
+               .field_bit_size = 32,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
        {
-       .description = "loopback.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l4.err",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               },
+       .field_info_spec = {
+               .description = "l4.err",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SKIP
+               }
        },
+       /* class_tid: 3, , table: port_table.wr_0 */
        {
-       .description = "tl2_l2type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "dev.port_id",
+               .field_bit_size = 10,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff,
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "dev.port_id",
+               .field_bit_size = 10,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
+               .field_opr1 = {
+               (BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,
+               BNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}
+               }
        },
+       /* class_tid: 3, , table: l2_cntxt_tcam_cache.ing_rd */
        {
-       .description = "tl2_dmac.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "svif",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "svif",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
+               .field_opr1 = {
+               (BNXT_ULP_CF_IDX_PHY_PORT_SVIF >> 8) & 0xff,
+               BNXT_ULP_CF_IDX_PHY_PORT_SVIF & 0xff}
+               }
        },
+       /* class_tid: 3, , table: l2_cntxt_tcam.ing_0 */
        {
-       .description = "tl2_smac.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "etype",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "etype",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_dt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_ivlan_tpid_sel",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "l2_ivlan_tpid_sel",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_sa.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_ivlan_vid",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "l2_ivlan_vid",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_nvt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_ovlan_tpid_sel",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "l2_ovlan_tpid_sel",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_ovp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_ovlan_vid",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "l2_ovlan_vid",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_ovd.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "two_vtags",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "two_vtags",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_ovv.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "vtag_present",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "vtag_present",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_ovt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "mac1_addr",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "mac1_addr",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_ivp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "mac0_addr",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "mac0_addr",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_ivd.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tunnel_id",
+               .field_bit_size = 24,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "tunnel_id",
+               .field_bit_size = 24,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_ivv.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tun_hdr_type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "tun_hdr_type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_ivt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "llc",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "llc",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl2_etype.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "roce",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "roce",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl3_l3type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "metadata",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "metadata",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl3_sip.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "svif",
+               .field_bit_size = 11,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff,
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "svif",
+               .field_bit_size = 11,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
+               .field_opr1 = {
+               (BNXT_ULP_CF_IDX_PHY_PORT_SVIF >> 8) & 0xff,
+               BNXT_ULP_CF_IDX_PHY_PORT_SVIF & 0xff}
+               }
        },
        {
-       .description = "tl3_sip_selcmp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "parif",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "parif",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl3_dip.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "spif",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "spif",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl3_dip_selcmp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "loopback",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "loopback",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl3_ttl.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "recycle_cnt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "recycle_cnt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl3_prot.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
+       .field_info_mask = {
+               .description = "mpass_cnt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "mpass_cnt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl3_fid.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "valid",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+               .field_opr1 = {
+               1}
+               },
+       .field_info_spec = {
+               .description = "valid",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+               .field_opr1 = {
+               1}
+               }
        },
+       /* class_tid: 3, , table: l2_cntxt_tcam_cache.ing_wr */
        {
-       .description = "tl3_qos.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "svif",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "svif",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
+               .field_opr1 = {
+               (BNXT_ULP_CF_IDX_PHY_PORT_SVIF >> 8) & 0xff,
+               BNXT_ULP_CF_IDX_PHY_PORT_SVIF & 0xff}
+               }
        },
+       /* class_tid: 3, , table: l2_cntxt_tcam_cache.egr_rd */
        {
-       .description = "tl3_ieh_nonext.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "svif",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "svif",
+               .field_bit_size = 8,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
+               .field_opr1 = {
+               (BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,
+               BNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}
+               }
        },
+       /* class_tid: 3, , table: l2_cntxt_tcam.egr_0 */
        {
-       .description = "tl3_ieh_esp.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "etype",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "etype",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl3_ieh_auth.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_ivlan_tpid_sel",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "l2_ivlan_tpid_sel",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl3_ieh_dest.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_ivlan_vid",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "l2_ivlan_vid",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl3_ieh_frag.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_ovlan_tpid_sel",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "l2_ovlan_tpid_sel",
+               .field_bit_size = 3,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl3_ieh_rthdr.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "l2_ovlan_vid",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "l2_ovlan_vid",
+               .field_bit_size = 12,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl3_ieh_hop.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "two_vtags",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "two_vtags",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl3_ieh_1frag.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "vtag_present",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "vtag_present",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl3_df.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "mac1_addr",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "mac1_addr",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl3_l3err.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "mac0_addr",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "mac0_addr",
+               .field_bit_size = 48,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl4_l4type.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tunnel_id",
+               .field_bit_size = 24,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "tunnel_id",
+               .field_bit_size = 24,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl4_src.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "tun_hdr_type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "tun_hdr_type",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl4_dst.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "llc",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "llc",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl4_flags.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "roce",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "roce",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl4_seq.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "metadata",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "metadata",
+               .field_bit_size = 16,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl4_pa.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "svif",
+               .field_bit_size = 11,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+               .field_opr1 = {
+                       0xff,
+                       0xff}
+               },
+       .field_info_spec = {
+               .description = "svif",
+               .field_bit_size = 11,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CF,
+               .field_opr1 = {
+               (BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,
+               BNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}
+               }
        },
        {
-       .description = "tl4_opt.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "parif",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "parif",
+               .field_bit_size = 4,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl4_tcpts.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "spif",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "spif",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tl4_err.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "loopback",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "loopback",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tuntype.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "recycle_cnt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "recycle_cnt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tflags.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "mpass_cnt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               },
+       .field_info_spec = {
+               .description = "mpass_cnt",
+               .field_bit_size = 2,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+               }
        },
        {
-       .description = "tids.en",
-       .field_bit_size = 1,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_info_mask = {
+               .description = "valid",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+               .field_opr1 = {
+               1}
+               },
+       .field_info_spec = {
+               .description = "valid",
+               .field_bit_size = 1,
+               .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+               .field_opr1 = {
+               1}
+               }
+       }
+};
+
+struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {
+       /* class_tid: 1, , table: l2_cntxt_tcam.0 */
+       {
+       .description = "prof_func_id",
+       .field_bit_size = 7,
+       .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+       .field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,
+       .field_opr1 = {
+       (BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,
+       BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},
+       .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
+       .field_opr2 = {
+               (BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID >> 8) & 0xff,
+               BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff},
+       .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
+       .field_opr3 = {
+       (BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,
+       BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}
        },
        {
-       .description = "tid.en",
-       .field_bit_size = 1,
+       .description = "ctxt_meta_prof",
+       .field_bit_size = 3,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tctxts.en",
-       .field_bit_size = 1,
+       .description = "def_ctxt_data",
+       .field_bit_size = 16,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
+       .field_opr1 = {
+       (BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR >> 8) & 0xff,
+       BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR & 0xff}
        },
        {
-       .description = "tctxt.en",
-       .field_bit_size = 1,
+       .description = "ctxt_opcode",
+       .field_bit_size = 3,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+       .field_opr1 = {
+       ULP_THOR_SYM_CTXT_OPCODE_NORMAL_FLOW}
        },
        {
-       .description = "tqos.en",
-       .field_bit_size = 1,
+       .description = "l2_cntxt_id",
+       .field_bit_size = 10,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
+       .field_opr1 = {
+       (BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,
+       BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}
        },
        {
-       .description = "terr.en",
-       .field_bit_size = 1,
+       .description = "parif",
+       .field_bit_size = 4,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_CF,
+       .field_opr1 = {
+       (BNXT_ULP_CF_IDX_PHY_PORT_PARIF >> 8) & 0xff,
+       BNXT_ULP_CF_IDX_PHY_PORT_PARIF & 0xff}
        },
+       /* class_tid: 1, , table: mac_addr_cache.wr */
        {
-       .description = "l2_l2type.en",
-       .field_bit_size = 1,
+       .description = "rid",
+       .field_bit_size = 32,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
+       .field_opr1 = {
+       (BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
+       BNXT_ULP_RF_IDX_RID & 0xff}
        },
        {
-       .description = "l2_dmac.en",
-       .field_bit_size = 1,
+       .description = "l2_cntxt_tcam_index",
+       .field_bit_size = 10,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l2_smac.en",
-       .field_bit_size = 1,
+       .description = "l2_cntxt_id",
+       .field_bit_size = 10,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
+       .field_opr1 = {
+       (BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,
+       BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}
        },
        {
-       .description = "l2_dt.en",
-       .field_bit_size = 1,
+       .description = "src_property_ptr",
+       .field_bit_size = 10,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
+       /* class_tid: 1, , table: fkb_select.l3_l4_wm */
        {
-       .description = "l2_sa.en",
+       .description = "l2_cntxt_id.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+       .field_opr1 = {
+       1}
        },
        {
-       .description = "l2_nvt.en",
+       .description = "parif.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l2_ovp.en",
+       .description = "spif.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l2_ovd.en",
+       .description = "svif.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l2_ovv.en",
+       .description = "lcos.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l2_ovt.en",
+       .description = "meta.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l2_ivp.en",
+       .description = "rcyc_cnt.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l2_ivd.en",
+       .description = "loopback.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l2_ivv.en",
+       .description = "tl2_l2type.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l2_ivt.en",
+       .description = "tl2_dmac.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l2_etype.en",
+       .description = "tl2_smac.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_l3type.en",
+       .description = "tl2_dt.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_sip.en",
+       .description = "tl2_sa.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_sip_selcmp.en",
+       .description = "tl2_nvt.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_dip.en",
+       .description = "tl2_ovp.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_dip_selcmp.en",
+       .description = "tl2_ovd.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_ttl.en",
+       .description = "tl2_ovv.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_prot.en",
+       .description = "tl2_ovt.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
+       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_fid.en",
+       .description = "tl2_ivp.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_qos.en",
+       .description = "tl2_ivd.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_ieh_nonext.en",
+       .description = "tl2_ivv.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_ieh_esp.en",
+       .description = "tl2_ivt.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_ieh_auth.en",
+       .description = "tl2_etype.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_ieh_dest.en",
+       .description = "tl3_l3type.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_ieh_frag.en",
+       .description = "tl3_sip.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_ieh_rthdr.en",
+       .description = "tl3_sip_selcmp.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_ieh_hop.en",
+       .description = "tl3_dip.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_ieh_1frag.en",
+       .description = "tl3_dip_selcmp.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_df.en",
+       .description = "tl3_ttl.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_l3err.en",
+       .description = "tl3_prot.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l4_l4type.en",
+       .description = "tl3_fid.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l4_src.en",
+       .description = "tl3_qos.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l4_dst.en",
+       .description = "tl3_ieh_nonext.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
+       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l4_flags.en",
+       .description = "tl3_ieh_esp.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l4_seq.en",
+       .description = "tl3_ieh_auth.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l4_ack.en",
+       .description = "tl3_ieh_dest.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l4_win.en",
+       .description = "tl3_ieh_frag.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l4_pa.en",
+       .description = "tl3_ieh_rthdr.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l4_opt.en",
+       .description = "tl3_ieh_hop.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l4_tcpts.en",
+       .description = "tl3_ieh_1frag.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l4_tsval.en",
+       .description = "tl3_df.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l4_txecr.en",
+       .description = "tl3_l3err.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l4_err.en",
+       .description = "tl4_l4type.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 1, thor, table: profile_tcam.l3_l4 */
        {
-       .description = "wc_key_id",
-       .field_bit_size = 6,
+       .description = "tl4_src.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr1 = {
-       (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0 >> 8) & 0xff,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0 & 0xff}
-       },
-       {
-       .description = "wc_profile_id",
-       .field_bit_size = 8,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-       .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-       .field_opr1 = {
-       ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
-       ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
-       ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
-       ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
-       ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
-       ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
-       ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
-       (uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
-       .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr2 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 & 0xff},
-       .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr3 = {
-       (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1 >> 8) & 0xff,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1 & 0xff}
+       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "wc_search_en",
+       .description = "tl4_dst.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
+       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "em_key_type",
-       .field_bit_size = 2,
+       .description = "tl4_flags.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "em_key_id",
-       .field_bit_size = 6,
+       .description = "tl4_seq.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "em_profile_id",
-       .field_bit_size = 8,
+       .description = "tl4_pa.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "em_search_en",
+       .description = "tl4_opt.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "pl_byp_lkup_en",
+       .description = "tl4_tcpts.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 1, thor, table: profile_tcam_cache.wr */
        {
-       .description = "rid",
-       .field_bit_size = 32,
+       .description = "tl4_err.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_RID & 0xff}
+       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "profile_tcam_index",
-       .field_bit_size = 10,
+       .description = "tuntype.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "em_profile_id",
-       .field_bit_size = 8,
+       .description = "tflags.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "em_key_id",
-       .field_bit_size = 8,
+       .description = "tids.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "wc_profile_id",
-       .field_bit_size = 8,
+       .description = "tid.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "wc_key_id",
-       .field_bit_size = 8,
+       .description = "tctxts.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "flow_sig_id",
-       .field_bit_size = 8,
+       .description = "tctxt.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 1, thor, table: wm.l4 */
        {
-       .description = "ctxt_data",
-       .field_bit_size = 14,
+       .description = "tqos.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "meta_prof",
-       .field_bit_size = 3,
+       .description = "terr.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "opcode",
-       .field_bit_size = 3,
+       .description = "l2_l2type.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "data",
-       .field_bit_size = 16,
+       .description = "l2_dmac.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
+       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "strength",
-       .field_bit_size = 2,
+       .description = "l2_smac.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
+       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 1, thor, table: wm.l4_low */
        {
-       .description = "ctxt_data",
-       .field_bit_size = 14,
+       .description = "l2_dt.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "meta_prof",
-       .field_bit_size = 3,
+       .description = "l2_sa.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "opcode",
-       .field_bit_size = 3,
+       .description = "l2_nvt.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "data",
-       .field_bit_size = 16,
+       .description = "l2_ovp.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
+       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "strength",
-       .field_bit_size = 2,
+       .description = "l2_ovd.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
+       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 2, thor, table: l2_cntxt_tcam.0 */
        {
-       .description = "prof_func_id",
-       .field_bit_size = 7,
+       .description = "l2_ovv.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr1 = {
-       (BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 >> 8) & 0xff,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 & 0xff}
+       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "ctxt_meta_prof",
-       .field_bit_size = 3,
+       .description = "l2_ovt.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "def_ctxt_data",
-       .field_bit_size = 16,
+       .description = "l2_ivp.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR & 0xff}
+       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "ctxt_opcode",
-       .field_bit_size = 3,
+       .description = "l2_ivd.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       ULP_THOR_SYM_CTXT_OPCODE_NORMAL_FLOW}
-       },
-       {
-       .description = "l2_cntxt_id",
-       .field_bit_size = 10,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_PHY_PORT >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_PHY_PORT & 0xff},
-       .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr2 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 & 0xff},
-       .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr3 = {
-       (BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 >> 8) & 0xff,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 & 0xff}
+       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "parif",
-       .field_bit_size = 4,
+       .description = "l2_ivv.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CF,
-       .field_opr1 = {
-       (BNXT_ULP_CF_IDX_PHY_PORT_PARIF >> 8) & 0xff,
-       BNXT_ULP_CF_IDX_PHY_PORT_PARIF & 0xff}
+       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 2, thor, table: mac_addr_cache.wr */
        {
-       .description = "rid",
-       .field_bit_size = 32,
+       .description = "l2_ivt.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_RID & 0xff}
+       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l2_cntxt_tcam_index",
-       .field_bit_size = 10,
+       .description = "l2_etype.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l2_cntxt_id",
-       .field_bit_size = 10,
+       .description = "l3_l3type.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "src_property_ptr",
-       .field_bit_size = 10,
+       .description = "l3_sip.en",
+       .field_bit_size = 1,
+       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+       .field_opr1 = {
+       1}
+       },
+       {
+       .description = "l3_sip_selcmp.en",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 2, thor, table: fkb_select.l3_l4_wm */
        {
-       .description = "l2_cntxt_id.en",
+       .description = "l3_dip.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
@@ -27997,795 +4872,876 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {
        1}
        },
        {
-       .description = "parif.en",
+       .description = "l3_dip_selcmp.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "spif.en",
+       .description = "l3_ttl.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "svif.en",
+       .description = "l3_prot.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+       .field_opr1 = {
+       1}
        },
        {
-       .description = "lcos.en",
+       .description = "l3_fid.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "meta.en",
+       .description = "l3_qos.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "rcyc_cnt.en",
+       .description = "l3_ieh_nonext.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "loopback.en",
+       .description = "l3_ieh_esp.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl2_l2type.en",
+       .description = "l3_ieh_auth.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl2_dmac.en",
+       .description = "l3_ieh_dest.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl2_smac.en",
+       .description = "l3_ieh_frag.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl2_dt.en",
+       .description = "l3_ieh_rthdr.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl2_sa.en",
+       .description = "l3_ieh_hop.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl2_nvt.en",
+       .description = "l3_ieh_1frag.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl2_ovp.en",
+       .description = "l3_df.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl2_ovd.en",
+       .description = "l3_l3err.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl2_ovv.en",
+       .description = "l4_l4type.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl2_ovt.en",
+       .description = "l4_src.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+       .field_opr1 = {
+       1}
        },
        {
-       .description = "tl2_ivp.en",
+       .description = "l4_dst.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+       .field_opr1 = {
+       1}
        },
        {
-       .description = "tl2_ivd.en",
+       .description = "l4_flags.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl2_ivv.en",
+       .description = "l4_seq.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl2_ivt.en",
+       .description = "l4_ack.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl2_etype.en",
+       .description = "l4_win.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl3_l3type.en",
+       .description = "l4_pa.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl3_sip.en",
+       .description = "l4_opt.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl3_sip_selcmp.en",
+       .description = "l4_tcpts.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl3_dip.en",
+       .description = "l4_tsval.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl3_dip_selcmp.en",
+       .description = "l4_txecr.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl3_ttl.en",
+       .description = "l4_err.en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
+       /* class_tid: 1, , table: profile_tcam.l3_l4 */
        {
-       .description = "tl3_prot.en",
-       .field_bit_size = 1,
+       .description = "wc_key_id",
+       .field_bit_size = 6,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+       .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
        .field_opr1 = {
-       1}
+       (BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0 >> 8) & 0xff,
+       BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0 & 0xff}
        },
        {
-       .description = "tl3_fid.en",
-       .field_bit_size = 1,
+       .description = "wc_profile_id",
+       .field_bit_size = 8,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+       .field_opr1 = {
+       (BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0 >> 8) & 0xff,
+       BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0 & 0xff}
        },
        {
-       .description = "tl3_qos.en",
+       .description = "wc_search_en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+       .field_opr1 = {
+       1}
        },
        {
-       .description = "tl3_ieh_nonext.en",
-       .field_bit_size = 1,
+       .description = "em_key_type",
+       .field_bit_size = 2,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl3_ieh_esp.en",
-       .field_bit_size = 1,
+       .description = "em_key_id",
+       .field_bit_size = 6,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl3_ieh_auth.en",
-       .field_bit_size = 1,
+       .description = "em_profile_id",
+       .field_bit_size = 8,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl3_ieh_dest.en",
+       .description = "em_search_en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl3_ieh_frag.en",
+       .description = "pl_byp_lkup_en",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
+       /* class_tid: 1, , table: profile_tcam_cache.l3_l4_wr */
        {
-       .description = "tl3_ieh_rthdr.en",
-       .field_bit_size = 1,
+       .description = "rid",
+       .field_bit_size = 32,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
+       .field_opr1 = {
+       (BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
+       BNXT_ULP_RF_IDX_RID & 0xff}
        },
        {
-       .description = "tl3_ieh_hop.en",
-       .field_bit_size = 1,
+       .description = "profile_tcam_index",
+       .field_bit_size = 10,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl3_ieh_1frag.en",
-       .field_bit_size = 1,
+       .description = "em_profile_id",
+       .field_bit_size = 8,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl3_df.en",
-       .field_bit_size = 1,
+       .description = "em_key_id",
+       .field_bit_size = 8,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl3_l3err.en",
-       .field_bit_size = 1,
+       .description = "wc_profile_id",
+       .field_bit_size = 8,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl4_l4type.en",
-       .field_bit_size = 1,
+       .description = "wc_key_id",
+       .field_bit_size = 8,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl4_src.en",
-       .field_bit_size = 1,
+       .description = "flow_sig_id",
+       .field_bit_size = 64,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_CF,
+       .field_opr1 = {
+       (BNXT_ULP_CF_IDX_FLOW_SIG_ID >> 8) & 0xff,
+       BNXT_ULP_CF_IDX_FLOW_SIG_ID & 0xff}
        },
+       /* class_tid: 1, , table: wm.l3_l4 */
        {
-       .description = "tl4_dst.en",
-       .field_bit_size = 1,
+       .description = "ctxt_data",
+       .field_bit_size = 14,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl4_flags.en",
-       .field_bit_size = 1,
+       .description = "meta_prof",
+       .field_bit_size = 3,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl4_seq.en",
-       .field_bit_size = 1,
+       .description = "opcode",
+       .field_bit_size = 3,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl4_pa.en",
-       .field_bit_size = 1,
+       .description = "data",
+       .field_bit_size = 16,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
+       .field_opr1 = {
+       (BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
+       BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
        },
        {
-       .description = "tl4_opt.en",
-       .field_bit_size = 1,
+       .description = "strength",
+       .field_bit_size = 2,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+       .field_opr1 = {
+       1}
        },
+       /* class_tid: 3, , table: int_full_act_record.0 */
        {
-       .description = "tl4_tcpts.en",
-       .field_bit_size = 1,
+       .description = "sp_rec_ptr",
+       .field_bit_size = 16,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tl4_err.en",
-       .field_bit_size = 1,
+       .description = "encap_ptr",
+       .field_bit_size = 16,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tuntype.en",
-       .field_bit_size = 1,
+       .description = "mod_rec_ptr",
+       .field_bit_size = 16,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tflags.en",
-       .field_bit_size = 1,
+       .description = "rsvd1",
+       .field_bit_size = 16,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tids.en",
-       .field_bit_size = 1,
+       .description = "rsvd0",
+       .field_bit_size = 8,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tid.en",
-       .field_bit_size = 1,
+       .description = "decap_func",
+       .field_bit_size = 5,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tctxts.en",
-       .field_bit_size = 1,
+       .description = "meter",
+       .field_bit_size = 10,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tctxt.en",
+       .description = "stats_op",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "tqos.en",
-       .field_bit_size = 1,
+       .description = "stats_ptr",
+       .field_bit_size = 16,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "terr.en",
+       .description = "vnic_or_vport",
+       .field_bit_size = 11,
+       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+       .field_src1 = BNXT_ULP_FIELD_SRC_CF,
+       .field_opr1 = {
+       (BNXT_ULP_CF_IDX_DRV_FUNC_VNIC >> 8) & 0xff,
+       BNXT_ULP_CF_IDX_DRV_FUNC_VNIC & 0xff}
+       },
+       {
+       .description = "use_default",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l2_l2type.en",
-       .field_bit_size = 1,
+       .description = "mirror",
+       .field_bit_size = 4,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l2_dmac.en",
+       .description = "cond_copy",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l2_smac.en",
-       .field_bit_size = 1,
+       .description = "vlan_del_rpt",
+       .field_bit_size = 2,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l2_dt.en",
+       .description = "drop",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l2_sa.en",
+       .description = "hit",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l2_nvt.en",
-       .field_bit_size = 1,
+       .description = "type",
+       .field_bit_size = 3,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+       .field_opr1 = {
+       1}
        },
+       /* class_tid: 3, , table: port_table.wr_0 */
        {
-       .description = "l2_ovp.en",
-       .field_bit_size = 1,
+       .description = "rid",
+       .field_bit_size = 32,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l2_ovd.en",
-       .field_bit_size = 1,
+       .description = "drv_func.mac",
+       .field_bit_size = 48,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l2_ovv.en",
-       .field_bit_size = 1,
+       .description = "drv_func.parent.mac",
+       .field_bit_size = 48,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l2_ovt.en",
-       .field_bit_size = 1,
+       .description = "phy_port",
+       .field_bit_size = 8,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l2_ivp.en",
-       .field_bit_size = 1,
+       .description = "default_arec_ptr",
+       .field_bit_size = 16,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
+       .field_opr1 = {
+       (BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR >> 8) & 0xff,
+       BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR & 0xff}
        },
+       /* class_tid: 3, , table: l2_cntxt_tcam.ing_0 */
        {
-       .description = "l2_ivd.en",
-       .field_bit_size = 1,
+       .description = "prof_func_id",
+       .field_bit_size = 7,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+       .field_opr1 = {
+       (BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,
+       BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}
        },
        {
-       .description = "l2_ivv.en",
-       .field_bit_size = 1,
+       .description = "ctxt_meta_prof",
+       .field_bit_size = 3,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l2_ivt.en",
-       .field_bit_size = 1,
+       .description = "def_ctxt_data",
+       .field_bit_size = 16,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
+       .field_opr1 = {
+       (BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR >> 8) & 0xff,
+       BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR & 0xff}
        },
        {
-       .description = "l2_etype.en",
-       .field_bit_size = 1,
+       .description = "ctxt_opcode",
+       .field_bit_size = 3,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+       .field_opr1 = {
+       ULP_THOR_SYM_CTXT_OPCODE_NORMAL_FLOW}
        },
        {
-       .description = "l3_l3type.en",
-       .field_bit_size = 1,
+       .description = "l2_cntxt_id",
+       .field_bit_size = 10,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
+       .field_opr1 = {
+       (BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,
+       BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}
        },
        {
-       .description = "l3_sip.en",
-       .field_bit_size = 1,
+       .description = "parif",
+       .field_bit_size = 4,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_CF,
+       .field_opr1 = {
+       (BNXT_ULP_CF_IDX_PHY_PORT_PARIF >> 8) & 0xff,
+       BNXT_ULP_CF_IDX_PHY_PORT_PARIF & 0xff}
        },
+       /* class_tid: 3, , table: l2_cntxt_tcam_cache.ing_wr */
        {
-       .description = "l3_sip_selcmp.en",
-       .field_bit_size = 1,
+       .description = "rid",
+       .field_bit_size = 32,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
+       .field_opr1 = {
+       (BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
+       BNXT_ULP_RF_IDX_RID & 0xff}
        },
        {
-       .description = "l3_dip.en",
-       .field_bit_size = 1,
+       .description = "l2_cntxt_tcam_index",
+       .field_bit_size = 10,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
+       .field_opr1 = {
+       (BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 >> 8) & 0xff,
+       BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 & 0xff}
        },
        {
-       .description = "l3_dip_selcmp.en",
-       .field_bit_size = 1,
+       .description = "l2_cntxt_id",
+       .field_bit_size = 10,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
+       .field_opr1 = {
+       (BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,
+       BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}
        },
        {
-       .description = "l3_ttl.en",
-       .field_bit_size = 1,
+       .description = "src_property_ptr",
+       .field_bit_size = 10,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
+       /* class_tid: 3, , table: parif_def_arec_ptr.ing_0 */
        {
-       .description = "l3_prot.en",
-       .field_bit_size = 1,
+       .description = "act_rec_ptr",
+       .field_bit_size = 32,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
        .field_opr1 = {
-       1}
+       (BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR >> 8) & 0xff,
+       BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR & 0xff}
        },
+       /* class_tid: 3, , table: parif_def_err_arec_ptr.ing_0 */
        {
-       .description = "l3_fid.en",
-       .field_bit_size = 1,
+       .description = "act_rec_ptr",
+       .field_bit_size = 32,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
+       .field_opr1 = {
+       (BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR >> 8) & 0xff,
+       BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR & 0xff}
        },
+       /* class_tid: 3, , table: int_full_act_record.egr_0 */
        {
-       .description = "l3_qos.en",
-       .field_bit_size = 1,
+       .description = "sp_rec_ptr",
+       .field_bit_size = 16,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_ieh_nonext.en",
-       .field_bit_size = 1,
+       .description = "encap_ptr",
+       .field_bit_size = 16,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_ieh_esp.en",
-       .field_bit_size = 1,
+       .description = "mod_rec_ptr",
+       .field_bit_size = 16,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_ieh_auth.en",
-       .field_bit_size = 1,
+       .description = "rsvd1",
+       .field_bit_size = 16,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_ieh_dest.en",
-       .field_bit_size = 1,
+       .description = "rsvd0",
+       .field_bit_size = 8,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_ieh_frag.en",
-       .field_bit_size = 1,
+       .description = "decap_func",
+       .field_bit_size = 5,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_ieh_rthdr.en",
-       .field_bit_size = 1,
+       .description = "meter",
+       .field_bit_size = 10,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_ieh_hop.en",
+       .description = "stats_op",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_ieh_1frag.en",
-       .field_bit_size = 1,
+       .description = "stats_ptr",
+       .field_bit_size = 16,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l3_df.en",
-       .field_bit_size = 1,
+       .description = "vnic_or_vport",
+       .field_bit_size = 11,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_CF,
+       .field_opr1 = {
+       (BNXT_ULP_CF_IDX_PHY_PORT_VPORT >> 8) & 0xff,
+       BNXT_ULP_CF_IDX_PHY_PORT_VPORT & 0xff}
        },
        {
-       .description = "l3_l3err.en",
+       .description = "use_default",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l4_l4type.en",
-       .field_bit_size = 1,
+       .description = "mirror",
+       .field_bit_size = 4,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l4_src.en",
+       .description = "cond_copy",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l4_dst.en",
-       .field_bit_size = 1,
+       .description = "vlan_del_rpt",
+       .field_bit_size = 2,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
+       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l4_flags.en",
+       .description = "drop",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l4_seq.en",
+       .description = "hit",
        .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l4_ack.en",
-       .field_bit_size = 1,
+       .description = "type",
+       .field_bit_size = 3,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+       .field_opr1 = {
+       1}
        },
+       /* class_tid: 3, , table: l2_cntxt_tcam.egr_0 */
        {
-       .description = "l4_win.en",
-       .field_bit_size = 1,
+       .description = "prof_func_id",
+       .field_bit_size = 7,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+       .field_opr1 = {
+       (BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,
+       BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}
        },
        {
-       .description = "l4_pa.en",
-       .field_bit_size = 1,
+       .description = "ctxt_meta_prof",
+       .field_bit_size = 3,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "l4_opt.en",
-       .field_bit_size = 1,
+       .description = "def_ctxt_data",
+       .field_bit_size = 16,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
+       .field_opr1 = {
+       (BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
+       BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
        },
        {
-       .description = "l4_tcpts.en",
-       .field_bit_size = 1,
+       .description = "ctxt_opcode",
+       .field_bit_size = 3,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+       .field_opr1 = {
+       ULP_THOR_SYM_CTXT_OPCODE_NORMAL_FLOW}
        },
        {
-       .description = "l4_tsval.en",
-       .field_bit_size = 1,
+       .description = "l2_cntxt_id",
+       .field_bit_size = 10,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
+       .field_opr1 = {
+       (BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,
+       BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}
        },
        {
-       .description = "l4_txecr.en",
-       .field_bit_size = 1,
+       .description = "parif",
+       .field_bit_size = 4,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_CF,
+       .field_opr1 = {
+       (BNXT_ULP_CF_IDX_DRV_FUNC_PARIF >> 8) & 0xff,
+       BNXT_ULP_CF_IDX_DRV_FUNC_PARIF & 0xff}
        },
+       /* class_tid: 3, , table: parif_def_arec_ptr.egr_0 */
        {
-       .description = "l4_err.en",
-       .field_bit_size = 1,
+       .description = "act_rec_ptr",
+       .field_bit_size = 32,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
+       .field_opr1 = {
+       (BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
+       BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
        },
-       /* class_tid: 2, thor, table: profile_tcam.l3_l4 */
+       /* class_tid: 3, , table: parif_def_err_arec_ptr.egr_0 */
        {
-       .description = "wc_key_id",
-       .field_bit_size = 6,
+       .description = "act_rec_ptr",
+       .field_bit_size = 32,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
        .field_opr1 = {
-       (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0 >> 8) & 0xff,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0 & 0xff}
+       (BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
+       BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
        },
+       /* class_tid: 4, , table: int_full_act_record.loopback */
        {
-       .description = "wc_profile_id",
-       .field_bit_size = 8,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-       .field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-       .field_opr1 = {
-       ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
-       ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
-       ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
-       ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
-       ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
-       ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
-       ((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
-       (uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
-       .field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr2 = {
-               (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 >> 8) & 0xff,
-               BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 & 0xff},
-       .field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr3 = {
-       (BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1 >> 8) & 0xff,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1 & 0xff}
+       .description = "sp_rec_ptr",
+       .field_bit_size = 16,
+       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "wc_search_en",
-       .field_bit_size = 1,
+       .description = "encap_ptr",
+       .field_bit_size = 16,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
+       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "em_key_type",
-       .field_bit_size = 2,
+       .description = "mod_rec_ptr",
+       .field_bit_size = 16,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "em_key_id",
-       .field_bit_size = 6,
+       .description = "rsvd1",
+       .field_bit_size = 16,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "em_profile_id",
+       .description = "rsvd0",
        .field_bit_size = 8,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "em_search_en",
-       .field_bit_size = 1,
+       .description = "decap_func",
+       .field_bit_size = 5,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "pl_byp_lkup_en",
-       .field_bit_size = 1,
+       .description = "meter",
+       .field_bit_size = 10,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 2, thor, table: profile_tcam_cache.wr */
        {
-       .description = "rid",
-       .field_bit_size = 32,
+       .description = "stats_op",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_RID & 0xff}
+       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "profile_tcam_index",
-       .field_bit_size = 10,
+       .description = "stats_ptr",
+       .field_bit_size = 16,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "em_profile_id",
-       .field_bit_size = 8,
+       .description = "vnic_or_vport",
+       .field_bit_size = 11,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+       .field_opr1 = {
+       (ULP_THOR_SYM_LOOPBACK_PORT >> 8) & 0xff,
+       ULP_THOR_SYM_LOOPBACK_PORT & 0xff}
        },
        {
-       .description = "em_key_id",
-       .field_bit_size = 8,
+       .description = "use_default",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "wc_profile_id",
-       .field_bit_size = 8,
+       .description = "mirror",
+       .field_bit_size = 4,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "wc_key_id",
-       .field_bit_size = 8,
+       .description = "cond_copy",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "flow_sig_id",
-       .field_bit_size = 8,
+       .description = "vlan_del_rpt",
+       .field_bit_size = 2,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 2, thor, table: wm.l4 */
        {
-       .description = "ctxt_data",
-       .field_bit_size = 14,
+       .description = "drop",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "meta_prof",
-       .field_bit_size = 3,
+       .description = "hit",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "opcode",
+       .description = "type",
        .field_bit_size = 3,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+       .field_opr1 = {
+       1}
        },
+       /* class_tid: 4, , table: parif_def_arec_ptr.vf_egr */
        {
-       .description = "data",
-       .field_bit_size = 16,
+       .description = "act_rec_ptr",
+       .field_bit_size = 32,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
+       .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
        .field_opr1 = {
-       (BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
+       (BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR >> 8) & 0xff,
+       BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR & 0xff}
        },
+       /* class_tid: 4, , table: parif_def_err_arec_ptr.vf_egr */
        {
-       .description = "strength",
-       .field_bit_size = 2,
+       .description = "act_rec_ptr",
+       .field_bit_size = 32,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+       .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
        .field_opr1 = {
-       1}
+       (BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR >> 8) & 0xff,
+       BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR & 0xff}
        },
-       /* class_tid: 4, thor, table: int_full_act_record.0 */
+       /* class_tid: 4, , table: int_full_act_record.vf_ing */
        {
        .description = "sp_rec_ptr",
        .field_bit_size = 16,
@@ -28844,10 +5800,10 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {
        .description = "vnic_or_vport",
        .field_bit_size = 11,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_PORT_TABLE,
+       .field_src1 = BNXT_ULP_FIELD_SRC_CF,
        .field_opr1 = {
-               (BNXT_ULP_PORT_TABLE_DRV_FUNC_PARENT_VNIC >> 8) & 0xff,
-               BNXT_ULP_PORT_TABLE_DRV_FUNC_PARENT_VNIC & 0xff}
+       (BNXT_ULP_CF_IDX_DRV_FUNC_VNIC >> 8) & 0xff,
+       BNXT_ULP_CF_IDX_DRV_FUNC_VNIC & 0xff}
        },
        {
        .description = "use_default",
@@ -28893,44 +5849,87 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {
        .field_opr1 = {
        1}
        },
-       /* class_tid: 4, thor, table: port_table.wr_0 */
+       /* class_tid: 4, , table: vtag_encap_record.vfr_egr0 */
        {
-       .description = "rid",
-       .field_bit_size = 32,
+       .description = "ecv_tun_type",
+       .field_bit_size = 3,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "drv_func.mac",
-       .field_bit_size = 48,
+       .description = "ecv_l4_type",
+       .field_bit_size = 3,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "drv_func.parent.mac",
-       .field_bit_size = 48,
+       .description = "ecv_l3_type",
+       .field_bit_size = 3,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
+       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       },
+       {
+       .description = "ecv_l2_en",
+       .field_bit_size = 1,
+       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       },
+       {
+       .description = "ecv_vtag_type",
+       .field_bit_size = 4,
+       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
        .field_opr1 = {
-       (BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC & 0xff}
+       ULP_THOR_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI}
        },
        {
-       .description = "phy_port",
-       .field_bit_size = 8,
+       .description = "rsrvd",
+       .field_bit_size = 1,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
        {
-       .description = "default_arec_ptr",
+       .description = "ecv_valid",
+       .field_bit_size = 1,
+       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+       .field_opr1 = {
+       1}
+       },
+       {
+       .description = "vtag_tpid",
        .field_bit_size = 16,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+       .field_opr1 = {
+               0x81,
+               0x00}
+       },
+       {
+       .description = "vtag_vid",
+       .field_bit_size = 12,
+       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+       .field_src1 = BNXT_ULP_FIELD_SRC_CF,
+       .field_opr1 = {
+       (BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,
+       BNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}
+       },
+       {
+       .description = "vtag_de",
+       .field_bit_size = 1,
+       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       },
+       {
+       .description = "vtag_pcp",
+       .field_bit_size = 3,
+       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+       .field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
        .field_opr1 = {
-       (BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0 >> 8) & 0xff,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0 & 0xff}
+       (BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP >> 8) & 0xff,
+       BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP & 0xff}
        },
-       /* class_tid: 4, thor, table: int_full_act_record.1 */
+       /* class_tid: 4, , table: int_full_act_record.vfr_egr0 */
        {
        .description = "sp_rec_ptr",
        .field_bit_size = 16,
@@ -28941,7 +5940,10 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {
        .description = "encap_ptr",
        .field_bit_size = 16,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
+       .field_opr1 = {
+       (BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,
+       BNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}
        },
        {
        .description = "mod_rec_ptr",
@@ -28989,10 +5991,10 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {
        .description = "vnic_or_vport",
        .field_bit_size = 11,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_PORT_TABLE,
+       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
        .field_opr1 = {
-               (BNXT_ULP_PORT_TABLE_DRV_FUNC_PARENT_VNIC >> 8) & 0xff,
-               BNXT_ULP_PORT_TABLE_DRV_FUNC_PARENT_VNIC & 0xff}
+       (ULP_THOR_SYM_LOOPBACK_PORT >> 8) & 0xff,
+       ULP_THOR_SYM_LOOPBACK_PORT & 0xff}
        },
        {
        .description = "use_default",
@@ -29037,70 +6039,11 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {
        .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
        .field_opr1 = {
        1}
-       },
-       /* class_tid: 4, thor, table: port_table.wr_1 */
-       {
-       .description = "rid",
-       .field_bit_size = 32,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "drv_func.mac",
-       .field_bit_size = 48,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-       },
-       {
-       .description = "drv_func.parent.mac",
-       .field_bit_size = 48,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC & 0xff}
-       },
-       {
-       .description = "phy_port",
-       .field_bit_size = 8,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-       .field_opr1 = {
-       1}
-       },
-       {
-       .description = "default_arec_ptr",
-       .field_bit_size = 16,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-       .field_opr1 = {
-       (BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1 >> 8) & 0xff,
-       BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1 & 0xff}
-       },
-       /* class_tid: 4, thor, table: parif_def_arec_ptr.ing_0 */
-       {
-       .description = "act_rec_ptr",
-       .field_bit_size = 32,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR & 0xff}
-       },
-       /* class_tid: 4, thor, table: parif_def_err_arec_ptr.ing_0 */
-       {
-       .description = "act_rec_ptr",
-       .field_bit_size = 32,
-       .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-       .field_src1 = BNXT_ULP_FIELD_SRC_RF,
-       .field_opr1 = {
-       (BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR >> 8) & 0xff,
-       BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR & 0xff}
        }
 };
 
 struct bnxt_ulp_mapper_ident_info ulp_thor_class_ident_list[] = {
-       /* class_tid: 1, thor, table: port_table.rd */
+       /* class_tid: 1, , table: port_table.rd */
        {
        .description = "default_arec_ptr",
        .regfile_idx = BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR,
@@ -29119,53 +6062,30 @@ struct bnxt_ulp_mapper_ident_info ulp_thor_class_ident_list[] = {
        .ident_bit_size = 8,
        .ident_bit_pos = 128
        },
-       /* class_tid: 1, thor, table: l2_cntxt_tcam.gre */
+       /* class_tid: 1, , table: l2_cntxt_tcam_cache.rd */
        {
        .description = "l2_cntxt_id",
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-       .ident_type = TF_IDENT_TYPE_L2_CTXT_HIGH,
        .regfile_idx = BNXT_ULP_RF_IDX_L2_CNTXT_ID_0,
        .ident_bit_size = 10,
-       .ident_bit_pos = 29
+       .ident_bit_pos = 42
        },
-       /* class_tid: 1, thor, table: profile_tcam.icmpv4 */
+       /* class_tid: 1, , table: mac_addr_cache.rd */
        {
-       .description = "em_profile_id",
-       .resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-       .ident_type = TF_IDENT_TYPE_EM_PROF,
-       .regfile_idx = BNXT_ULP_RF_IDX_EM_PROFILE_ID_0,
-       .ident_bit_size = 8,
-       .ident_bit_pos = 23
+       .description = "l2_cntxt_id",
+       .regfile_idx = BNXT_ULP_RF_IDX_L2_CNTXT_ID_0,
+       .ident_bit_size = 10,
+       .ident_bit_pos = 42
        },
-       /* class_tid: 1, thor, table: profile_tcam.icmpv6 */
+       /* class_tid: 1, , table: l2_cntxt_tcam.0 */
        {
-       .description = "em_profile_id",
+       .description = "l2_cntxt_id",
        .resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-       .ident_type = TF_IDENT_TYPE_EM_PROF,
-       .regfile_idx = BNXT_ULP_RF_IDX_EM_PROFILE_ID_0,
-       .ident_bit_size = 8,
-       .ident_bit_pos = 23
-       },
-       /* class_tid: 2, thor, table: port_table.rd */
-       {
-       .description = "default_arec_ptr",
-       .regfile_idx = BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR,
-       .ident_bit_size = 16,
-       .ident_bit_pos = 136
-       },
-       {
-       .description = "drv_func.parent.mac",
-       .regfile_idx = BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC,
-       .ident_bit_size = 48,
-       .ident_bit_pos = 80
-       },
-       {
-       .description = "phy_port",
-       .regfile_idx = BNXT_ULP_RF_IDX_PHY_PORT,
-       .ident_bit_size = 8,
-       .ident_bit_pos = 128
+       .ident_type = TF_IDENT_TYPE_L2_CTXT_HIGH,
+       .regfile_idx = BNXT_ULP_RF_IDX_L2_CNTXT_ID_0,
+       .ident_bit_size = 10,
+       .ident_bit_pos = 29
        },
-       /* class_tid: 2, thor, table: l2_cntxt_tcam.0 */
+       /* class_tid: 3, , table: l2_cntxt_tcam.ing_0 */
        {
        .description = "l2_cntxt_id",
        .resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
@@ -29174,12 +6094,14 @@ struct bnxt_ulp_mapper_ident_info ulp_thor_class_ident_list[] = {
        .ident_bit_size = 10,
        .ident_bit_pos = 29
        },
-       /* class_tid: 4, thor, table: port_table.rd */
+       /* class_tid: 3, , table: l2_cntxt_tcam.egr_0 */
        {
-       .description = "default_arec_ptr",
-       .regfile_idx = BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR,
-       .ident_bit_size = 16,
-       .ident_bit_pos = 136
+       .description = "l2_cntxt_id",
+       .resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+       .ident_type = TF_IDENT_TYPE_L2_CTXT_HIGH,
+       .regfile_idx = BNXT_ULP_RF_IDX_L2_CNTXT_ID_0,
+       .ident_bit_size = 10,
+       .ident_bit_pos = 29
        }
 };
 

diff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_act.c b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_act.c
index 9e0a6b5..b6d2afd 100644 (file)
--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_act.c
+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_act.c
@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 
-/* date: Sun Mar 21 13:04:51 2021 */
+/* date: Thu May 13 18:15:56 2021 */
 
 #include "ulp_template_db_enum.h"
 #include "ulp_template_db_field.h"
@@ -12,7 +12,7 @@
 
 /* Mapper templates for header act list */
 struct bnxt_ulp_mapper_tmpl_info ulp_wh_plus_act_tmpl_list[] = {
-       /* act_tid: 1, wh_plus, ingress */
+       /* act_tid: 1, ingress */
        [1] = {
        .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
        .num_tbls = 5,
@@ -22,7 +22,7 @@ struct bnxt_ulp_mapper_tmpl_info ulp_wh_plus_act_tmpl_list[] = {
                .cond_start_idx = 0,
                .cond_nums = 9 }
        },
-       /* act_tid: 2, wh_plus, ingress */
+       /* act_tid: 2, ingress */
        [2] = {
        .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
        .num_tbls = 7,
@@ -32,7 +32,7 @@ struct bnxt_ulp_mapper_tmpl_info ulp_wh_plus_act_tmpl_list[] = {
                .cond_start_idx = 14,
                .cond_nums = 0 }
        },
-       /* act_tid: 3, wh_plus, ingress */
+       /* act_tid: 3, ingress */
        [3] = {
        .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
        .num_tbls = 6,
@@ -42,7 +42,7 @@ struct bnxt_ulp_mapper_tmpl_info ulp_wh_plus_act_tmpl_list[] = {
                .cond_start_idx = 15,
                .cond_nums = 0 }
        },
-       /* act_tid: 4, wh_plus, egress */
+       /* act_tid: 4, egress */
        [4] = {
        .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
        .num_tbls = 5,
@@ -52,7 +52,7 @@ struct bnxt_ulp_mapper_tmpl_info ulp_wh_plus_act_tmpl_list[] = {
                .cond_start_idx = 20,
                .cond_nums = 0 }
        },
-       /* act_tid: 5, wh_plus, egress */
+       /* act_tid: 5, egress */
        [5] = {
        .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
        .num_tbls = 6,
@@ -62,7 +62,7 @@ struct bnxt_ulp_mapper_tmpl_info ulp_wh_plus_act_tmpl_list[] = {
                .cond_start_idx = 28,
                .cond_nums = 0 }
        },
-       /* act_tid: 6, wh_plus, egress */
+       /* act_tid: 6, egress */
        [6] = {
        .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
        .num_tbls = 6,
@@ -75,7 +75,7 @@ struct bnxt_ulp_mapper_tmpl_info ulp_wh_plus_act_tmpl_list[] = {
 };
 
 struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
-       { /* act_tid: 1, wh_plus, table: shared_mirror_record.rd */
+       { /* act_tid: 1, , table: shared_mirror_record.rd */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
        .resource_sub_type =
@@ -98,7 +98,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .ident_start_idx = 0,
        .ident_nums = 1
        },
-       { /* act_tid: 1, wh_plus, table: int_flow_counter_tbl.0 */
+       { /* act_tid: 1, , table: int_flow_counter_tbl.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_STATS_64,
        .resource_sub_type =
@@ -119,7 +119,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 64,
        .result_num_fields = 1
        },
-       { /* act_tid: 1, wh_plus, table: int_vtag_encap_record.0 */
+       { /* act_tid: 1, , table: int_vtag_encap_record.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_ENCAP_16B,
        .resource_sub_type =
@@ -141,7 +141,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 0,
        .encap_num_fields = 12
        },
-       { /* act_tid: 1, wh_plus, table: int_full_act_record.0 */
+       { /* act_tid: 1, , table: int_full_act_record.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
        .resource_sub_type =
@@ -163,7 +163,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 0
        },
-       { /* act_tid: 1, wh_plus, table: ext_full_act_record.0 */
+       { /* act_tid: 1, , table: ext_full_act_record.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_EXT,
        .resource_sub_type =
@@ -185,7 +185,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 12
        },
-       { /* act_tid: 2, wh_plus, table: control.0 */
+       { /* act_tid: 2, , table: control.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
        .direction = TF_DIR_RX,
        .execute_info = {
@@ -198,7 +198,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .fdb_operand = BNXT_ULP_RF_IDX_RID,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE
        },
-       { /* act_tid: 2, wh_plus, table: mirror_tbl.alloc */
+       { /* act_tid: 2, , table: mirror_tbl.alloc */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
        .resource_sub_type =
@@ -220,7 +220,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 32,
        .result_num_fields = 6
        },
-       { /* act_tid: 2, wh_plus, table: int_flow_counter_tbl.0 */
+       { /* act_tid: 2, , table: int_flow_counter_tbl.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_STATS_64,
        .resource_sub_type =
@@ -242,7 +242,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 64,
        .result_num_fields = 1
        },
-       { /* act_tid: 2, wh_plus, table: int_full_act_record.0 */
+       { /* act_tid: 2, , table: int_full_act_record.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
        .resource_sub_type =
@@ -265,7 +265,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 0
        },
-       { /* act_tid: 2, wh_plus, table: ext_full_act_record.0 */
+       { /* act_tid: 2, , table: ext_full_act_record.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_EXT,
        .resource_sub_type =
@@ -288,7 +288,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 12
        },
-       { /* act_tid: 2, wh_plus, table: mirror_tbl.wr */
+       { /* act_tid: 2, , table: mirror_tbl.wr */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
        .resource_sub_type =
@@ -309,7 +309,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 32,
        .result_num_fields = 6
        },
-       { /* act_tid: 2, wh_plus, table: shared_mirror_record.wr */
+       { /* act_tid: 2, , table: shared_mirror_record.wr */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
        .resource_sub_type =
@@ -333,7 +333,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 34,
        .result_num_fields = 2
        },
-       { /* act_tid: 3, wh_plus, table: int_flow_counter_tbl.0 */
+       { /* act_tid: 3, , table: int_flow_counter_tbl.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_STATS_64,
        .resource_sub_type =
@@ -353,7 +353,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 64,
        .result_num_fields = 1
        },
-       { /* act_tid: 3, wh_plus, table: act_modify_ipv4_src.0 */
+       { /* act_tid: 3, , table: act_modify_ipv4_src.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_MODIFY_IPV4,
        .resource_sub_type =
@@ -373,7 +373,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 32,
        .result_num_fields = 1
        },
-       { /* act_tid: 3, wh_plus, table: act_modify_ipv4_dst.0 */
+       { /* act_tid: 3, , table: act_modify_ipv4_dst.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_MODIFY_IPV4,
        .resource_sub_type =
@@ -393,7 +393,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 32,
        .result_num_fields = 1
        },
-       { /* act_tid: 3, wh_plus, table: int_encap_mac_record.0 */
+       { /* act_tid: 3, , table: int_encap_mac_record.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_ENCAP_16B,
        .resource_sub_type =
@@ -414,7 +414,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 0,
        .encap_num_fields = 12
        },
-       { /* act_tid: 3, wh_plus, table: int_full_act_record.0 */
+       { /* act_tid: 3, , table: int_full_act_record.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
        .resource_sub_type =
@@ -434,7 +434,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 128,
        .result_num_fields = 26
        },
-       { /* act_tid: 3, wh_plus, table: ext_full_act_record.0 */
+       { /* act_tid: 3, , table: ext_full_act_record.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_EXT,
        .resource_sub_type =
@@ -455,7 +455,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 12
        },
-       { /* act_tid: 4, wh_plus, table: int_flow_counter_tbl.0 */
+       { /* act_tid: 4, , table: int_flow_counter_tbl.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_STATS_64,
        .resource_sub_type =
@@ -475,7 +475,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 64,
        .result_num_fields = 1
        },
-       { /* act_tid: 4, wh_plus, table: int_vtag_encap_record.0 */
+       { /* act_tid: 4, , table: int_vtag_encap_record.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_ENCAP_16B,
        .resource_sub_type =
@@ -496,7 +496,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 0,
        .encap_num_fields = 12
        },
-       { /* act_tid: 4, wh_plus, table: int_full_act_record.0 */
+       { /* act_tid: 4, , table: int_full_act_record.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
        .resource_sub_type =
@@ -516,7 +516,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 128,
        .result_num_fields = 26
        },
-       { /* act_tid: 4, wh_plus, table: ext_full_act_record.no_tag */
+       { /* act_tid: 4, , table: ext_full_act_record.no_tag */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_EXT,
        .resource_sub_type =
@@ -537,7 +537,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 12
        },
-       { /* act_tid: 4, wh_plus, table: ext_full_act_record.one_tag */
+       { /* act_tid: 4, , table: ext_full_act_record.one_tag */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_EXT,
        .resource_sub_type =
@@ -558,7 +558,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 12
        },
-       { /* act_tid: 5, wh_plus, table: int_flow_counter_tbl.0 */
+       { /* act_tid: 5, , table: int_flow_counter_tbl.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_STATS_64,
        .resource_sub_type =
@@ -578,7 +578,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 64,
        .result_num_fields = 1
        },
-       { /* act_tid: 5, wh_plus, table: act_modify_ipv4_src.0 */
+       { /* act_tid: 5, , table: act_modify_ipv4_src.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_MODIFY_IPV4,
        .resource_sub_type =
@@ -598,7 +598,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 32,
        .result_num_fields = 1
        },
-       { /* act_tid: 5, wh_plus, table: act_modify_ipv4_dst.0 */
+       { /* act_tid: 5, , table: act_modify_ipv4_dst.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_MODIFY_IPV4,
        .resource_sub_type =
@@ -618,7 +618,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 32,
        .result_num_fields = 1
        },
-       { /* act_tid: 5, wh_plus, table: int_encap_mac_record.dummy */
+       { /* act_tid: 5, , table: int_encap_mac_record.dummy */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_ENCAP_16B,
        .resource_sub_type =
@@ -639,7 +639,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 0,
        .encap_num_fields = 12
        },
-       { /* act_tid: 5, wh_plus, table: int_full_act_record.0 */
+       { /* act_tid: 5, , table: int_full_act_record.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
        .resource_sub_type =
@@ -659,7 +659,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 128,
        .result_num_fields = 26
        },
-       { /* act_tid: 5, wh_plus, table: ext_full_act_record.0 */
+       { /* act_tid: 5, , table: ext_full_act_record.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_EXT,
        .resource_sub_type =
@@ -680,7 +680,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 12
        },
-       { /* act_tid: 6, wh_plus, table: int_flow_counter_tbl.0 */
+       { /* act_tid: 6, , table: int_flow_counter_tbl.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_STATS_64,
        .resource_sub_type =
@@ -700,7 +700,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 64,
        .result_num_fields = 1
        },
-       { /* act_tid: 6, wh_plus, table: sp_smac_ipv4.0 */
+       { /* act_tid: 6, , table: sp_smac_ipv4.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
        .resource_sub_type =
@@ -721,7 +721,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 0,
        .encap_num_fields = 3
        },
-       { /* act_tid: 6, wh_plus, table: sp_smac_ipv6.0 */
+       { /* act_tid: 6, , table: sp_smac_ipv6.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_SP_SMAC_IPV6,
        .resource_sub_type =
@@ -742,7 +742,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 0,
        .encap_num_fields = 3
        },
-       { /* act_tid: 6, wh_plus, table: int_tun_encap_record.0 */
+       { /* act_tid: 6, , table: int_tun_encap_record.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_ENCAP_64B,
        .resource_sub_type =
@@ -763,7 +763,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_num_fields = 0,
        .encap_num_fields = 12
        },
-       { /* act_tid: 6, wh_plus, table: int_full_act_record.0 */
+       { /* act_tid: 6, , table: int_full_act_record.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
        .resource_sub_type =
@@ -783,7 +783,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
        .result_bit_size = 128,
        .result_num_fields = 26
        },
-       { /* act_tid: 6, wh_plus, table: ext_full_act_record_vxlan.0 */
+       { /* act_tid: 6, , table: ext_full_act_record_vxlan.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_EXT,
        .resource_sub_type =
@@ -981,7 +981,7 @@ struct bnxt_ulp_mapper_cond_info ulp_wh_plus_act_cond_list[] = {
 };
 
 struct bnxt_ulp_mapper_key_info ulp_wh_plus_act_key_info_list[] = {
-       /* act_tid: 1, wh_plus, table: shared_mirror_record.rd */
+       /* act_tid: 1, , table: shared_mirror_record.rd */
        {
        .field_info_mask = {
                .description = "shared_index",
@@ -1001,7 +1001,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_act_key_info_list[] = {
                BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE & 0xff}
                }
        },
-       /* act_tid: 2, wh_plus, table: shared_mirror_record.wr */
+       /* act_tid: 2, , table: shared_mirror_record.wr */
        {
        .field_info_mask = {
                .description = "shared_index",
@@ -1024,14 +1024,14 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_act_key_info_list[] = {
 };
 
 struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
-       /* act_tid: 1, wh_plus, table: int_flow_counter_tbl.0 */
+       /* act_tid: 1, , table: int_flow_counter_tbl.0 */
        {
        .description = "count",
        .field_bit_size = 64,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 1, wh_plus, table: int_vtag_encap_record.0 */
+       /* act_tid: 1, , table: int_vtag_encap_record.0 */
        {
        .description = "ecv_tun_type",
        .field_bit_size = 3,
@@ -1117,7 +1117,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 1, wh_plus, table: int_full_act_record.0 */
+       /* act_tid: 1, , table: int_full_act_record.0 */
        {
        .description = "flow_cntr_ptr",
        .field_bit_size = 14,
@@ -1379,7 +1379,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 1, wh_plus, table: ext_full_act_record.0 */
+       /* act_tid: 1, , table: ext_full_act_record.0 */
        {
        .description = "flow_cntr_ptr",
        .field_bit_size = 14,
@@ -1701,7 +1701,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 2, wh_plus, table: mirror_tbl.alloc */
+       /* act_tid: 2, , table: mirror_tbl.alloc */
        {
        .description = "act_rec_ptr",
        .field_bit_size = 16,
@@ -1740,14 +1740,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 2, wh_plus, table: int_flow_counter_tbl.0 */
+       /* act_tid: 2, , table: int_flow_counter_tbl.0 */
        {
        .description = "count",
        .field_bit_size = 64,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 2, wh_plus, table: int_full_act_record.0 */
+       /* act_tid: 2, , table: int_full_act_record.0 */
        {
        .description = "flow_cntr_ptr",
        .field_bit_size = 14,
@@ -1921,7 +1921,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 2, wh_plus, table: ext_full_act_record.0 */
+       /* act_tid: 2, , table: ext_full_act_record.0 */
        {
        .description = "flow_cntr_ptr",
        .field_bit_size = 14,
@@ -2178,7 +2178,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 2, wh_plus, table: mirror_tbl.wr */
+       /* act_tid: 2, , table: mirror_tbl.wr */
        {
        .description = "act_rec_ptr",
        .field_bit_size = 16,
@@ -2220,7 +2220,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 2, wh_plus, table: shared_mirror_record.wr */
+       /* act_tid: 2, , table: shared_mirror_record.wr */
        {
        .description = "rid",
        .field_bit_size = 32,
@@ -2239,14 +2239,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
                (1 >> 8) & 0xff,
                1 & 0xff}
        },
-       /* act_tid: 3, wh_plus, table: int_flow_counter_tbl.0 */
+       /* act_tid: 3, , table: int_flow_counter_tbl.0 */
        {
        .description = "count",
        .field_bit_size = 64,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 3, wh_plus, table: act_modify_ipv4_src.0 */
+       /* act_tid: 3, , table: act_modify_ipv4_src.0 */
        {
        .description = "ipv4_addr",
        .field_bit_size = 32,
@@ -2256,7 +2256,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        (BNXT_ULP_ACT_PROP_IDX_SET_IPV4_SRC >> 8) & 0xff,
        BNXT_ULP_ACT_PROP_IDX_SET_IPV4_SRC & 0xff}
        },
-       /* act_tid: 3, wh_plus, table: act_modify_ipv4_dst.0 */
+       /* act_tid: 3, , table: act_modify_ipv4_dst.0 */
        {
        .description = "ipv4_addr",
        .field_bit_size = 32,
@@ -2266,7 +2266,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        (BNXT_ULP_ACT_PROP_IDX_SET_IPV4_DST >> 8) & 0xff,
        BNXT_ULP_ACT_PROP_IDX_SET_IPV4_DST & 0xff}
        },
-       /* act_tid: 3, wh_plus, table: int_encap_mac_record.0 */
+       /* act_tid: 3, , table: int_encap_mac_record.0 */
        {
        .description = "ecv_tun_type",
        .field_bit_size = 3,
@@ -2343,7 +2343,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 3, wh_plus, table: int_full_act_record.0 */
+       /* act_tid: 3, , table: int_full_act_record.0 */
        {
        .description = "flow_cntr_ptr",
        .field_bit_size = 14,
@@ -2573,7 +2573,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 3, wh_plus, table: ext_full_act_record.0 */
+       /* act_tid: 3, , table: ext_full_act_record.0 */
        {
        .description = "flow_cntr_ptr",
        .field_bit_size = 14,
@@ -2879,14 +2879,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 4, wh_plus, table: int_flow_counter_tbl.0 */
+       /* act_tid: 4, , table: int_flow_counter_tbl.0 */
        {
        .description = "count",
        .field_bit_size = 64,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 4, wh_plus, table: int_vtag_encap_record.0 */
+       /* act_tid: 4, , table: int_vtag_encap_record.0 */
        {
        .description = "ecv_tun_type",
        .field_bit_size = 3,
@@ -2972,7 +2972,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 4, wh_plus, table: int_full_act_record.0 */
+       /* act_tid: 4, , table: int_full_act_record.0 */
        {
        .description = "flow_cntr_ptr",
        .field_bit_size = 14,
@@ -3162,7 +3162,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 4, wh_plus, table: ext_full_act_record.no_tag */
+       /* act_tid: 4, , table: ext_full_act_record.no_tag */
        {
        .description = "flow_cntr_ptr",
        .field_bit_size = 14,
@@ -3423,7 +3423,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 4, wh_plus, table: ext_full_act_record.one_tag */
+       /* act_tid: 4, , table: ext_full_act_record.one_tag */
        {
        .description = "flow_cntr_ptr",
        .field_bit_size = 14,
@@ -3704,14 +3704,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 5, wh_plus, table: int_flow_counter_tbl.0 */
+       /* act_tid: 5, , table: int_flow_counter_tbl.0 */
        {
        .description = "count",
        .field_bit_size = 64,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 5, wh_plus, table: act_modify_ipv4_src.0 */
+       /* act_tid: 5, , table: act_modify_ipv4_src.0 */
        {
        .description = "ipv4_addr",
        .field_bit_size = 32,
@@ -3721,7 +3721,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        (BNXT_ULP_ACT_PROP_IDX_SET_IPV4_SRC >> 8) & 0xff,
        BNXT_ULP_ACT_PROP_IDX_SET_IPV4_SRC & 0xff}
        },
-       /* act_tid: 5, wh_plus, table: act_modify_ipv4_dst.0 */
+       /* act_tid: 5, , table: act_modify_ipv4_dst.0 */
        {
        .description = "ipv4_addr",
        .field_bit_size = 32,
@@ -3731,7 +3731,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        (BNXT_ULP_ACT_PROP_IDX_SET_IPV4_DST >> 8) & 0xff,
        BNXT_ULP_ACT_PROP_IDX_SET_IPV4_DST & 0xff}
        },
-       /* act_tid: 5, wh_plus, table: int_encap_mac_record.dummy */
+       /* act_tid: 5, , table: int_encap_mac_record.dummy */
        {
        .description = "ecv_tun_type",
        .field_bit_size = 3,
@@ -3808,7 +3808,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 5, wh_plus, table: int_full_act_record.0 */
+       /* act_tid: 5, , table: int_full_act_record.0 */
        {
        .description = "flow_cntr_ptr",
        .field_bit_size = 14,
@@ -4038,7 +4038,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 5, wh_plus, table: ext_full_act_record.0 */
+       /* act_tid: 5, , table: ext_full_act_record.0 */
        {
        .description = "flow_cntr_ptr",
        .field_bit_size = 14,
@@ -4344,14 +4344,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 6, wh_plus, table: int_flow_counter_tbl.0 */
+       /* act_tid: 6, , table: int_flow_counter_tbl.0 */
        {
        .description = "count",
        .field_bit_size = 64,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 6, wh_plus, table: sp_smac_ipv4.0 */
+       /* act_tid: 6, , table: sp_smac_ipv4.0 */
        {
        .description = "smac",
        .field_bit_size = 48,
@@ -4376,7 +4376,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 6, wh_plus, table: sp_smac_ipv6.0 */
+       /* act_tid: 6, , table: sp_smac_ipv6.0 */
        {
        .description = "smac",
        .field_bit_size = 48,
@@ -4401,7 +4401,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 6, wh_plus, table: int_tun_encap_record.0 */
+       /* act_tid: 6, , table: int_tun_encap_record.0 */
        {
        .description = "ecv_tun_type",
        .field_bit_size = 3,
@@ -4509,7 +4509,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
                (BNXT_ULP_ACT_PROP_IDX_ENCAP_TUN_SZ >> 8) & 0xff,
                BNXT_ULP_ACT_PROP_IDX_ENCAP_TUN_SZ & 0xff}
        },
-       /* act_tid: 6, wh_plus, table: int_full_act_record.0 */
+       /* act_tid: 6, , table: int_full_act_record.0 */
        {
        .description = "flow_cntr_ptr",
        .field_bit_size = 14,
@@ -4684,7 +4684,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* act_tid: 6, wh_plus, table: ext_full_act_record_vxlan.0 */
+       /* act_tid: 6, , table: ext_full_act_record_vxlan.0 */
        {
        .description = "flow_cntr_ptr",
        .field_bit_size = 14,
@@ -4964,7 +4964,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 };
 
 struct bnxt_ulp_mapper_ident_info ulp_wh_plus_act_ident_list[] = {
-       /* act_tid: 1, wh_plus, table: shared_mirror_record.rd */
+       /* act_tid: 1, , table: shared_mirror_record.rd */
        {
        .description = "mirror_id",
        .regfile_idx = BNXT_ULP_RF_IDX_MIRROR_ID_0,

diff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_class.c b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_class.c
index fa3c350..85b8950 100644 (file)
--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_class.c
+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_class.c
@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 
-/* date: Wed Apr 14 09:56:27 2021 */
+/* date: Fri May 14 10:26:31 2021 */
 
 #include "ulp_template_db_enum.h"
 #include "ulp_template_db_field.h"
@@ -12,7 +12,7 @@
 
 /* Mapper templates for header class list */
 struct bnxt_ulp_mapper_tmpl_info ulp_wh_plus_class_tmpl_list[] = {
-       /* class_tid: 1, wh_plus, ingress */
+       /* class_tid: 1, ingress */
        [1] = {
        .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
        .num_tbls = 18,
@@ -22,7 +22,7 @@ struct bnxt_ulp_mapper_tmpl_info ulp_wh_plus_class_tmpl_list[] = {
                .cond_start_idx = 0,
                .cond_nums = 1 }
        },
-       /* class_tid: 2, wh_plus, egress */
+       /* class_tid: 2, egress */
        [2] = {
        .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
        .num_tbls = 15,
@@ -32,7 +32,7 @@ struct bnxt_ulp_mapper_tmpl_info ulp_wh_plus_class_tmpl_list[] = {
                .cond_start_idx = 24,
                .cond_nums = 1 }
        },
-       /* class_tid: 3, wh_plus, ingress */
+       /* class_tid: 3, ingress */
        [3] = {
        .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
        .num_tbls = 22,
@@ -42,7 +42,7 @@ struct bnxt_ulp_mapper_tmpl_info ulp_wh_plus_class_tmpl_list[] = {
                .cond_start_idx = 35,
                .cond_nums = 0 }
        },
-       /* class_tid: 4, wh_plus, egress */
+       /* class_tid: 4, egress */
        [4] = {
        .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
        .num_tbls = 19,
@@ -55,7 +55,7 @@ struct bnxt_ulp_mapper_tmpl_info ulp_wh_plus_class_tmpl_list[] = {
 };
 
 struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
-       { /* class_tid: 1, wh_plus, table: l2_cntxt_tcam_cache.rd */
+       { /* class_tid: 1, , table: l2_cntxt_tcam_cache.rd */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
        .resource_sub_type =
@@ -78,7 +78,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 0,
        .ident_nums = 1
        },
-       { /* class_tid: 1, wh_plus, table: mac_addr_cache.rd */
+       { /* class_tid: 1, , table: mac_addr_cache.rd */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MAC_ADDR_CACHE,
@@ -100,7 +100,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 1,
        .ident_nums = 1
        },
-       { /* class_tid: 1, wh_plus, table: control.0 */
+       { /* class_tid: 1, , table: control.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
        .direction = TF_DIR_RX,
        .execute_info = {
@@ -113,7 +113,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .fdb_operand = BNXT_ULP_RF_IDX_RID,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE
        },
-       { /* class_tid: 1, wh_plus, table: l2_cntxt_tcam.0 */
+       { /* class_tid: 1, , table: l2_cntxt_tcam.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
        .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
        .direction = TF_DIR_RX,
@@ -140,7 +140,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 2,
        .ident_nums = 1
        },
-       { /* class_tid: 1, wh_plus, table: mac_addr_cache.wr */
+       { /* class_tid: 1, , table: mac_addr_cache.wr */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MAC_ADDR_CACHE,
@@ -163,7 +163,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 62,
        .result_num_fields = 4
        },
-       { /* class_tid: 1, wh_plus, table: profile_tcam_cache.rd */
+       { /* class_tid: 1, , table: profile_tcam_cache.rd */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,
        .resource_sub_type =
@@ -186,7 +186,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 3,
        .ident_nums = 3
        },
-       { /* class_tid: 1, wh_plus, table: control.1 */
+       { /* class_tid: 1, , table: control.1 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
        .direction = TF_DIR_RX,
        .execute_info = {
@@ -199,7 +199,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .fdb_operand = BNXT_ULP_RF_IDX_RID,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE
        },
-       { /* class_tid: 1, wh_plus, table: control.2 */
+       { /* class_tid: 1, , table: control.2 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
        .direction = TF_DIR_RX,
        .execute_info = {
@@ -218,7 +218,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
                .func_dst_opr = BNXT_ULP_RF_IDX_CC },
        .byte_order = BNXT_ULP_BYTE_ORDER_LE
        },
-       { /* class_tid: 1, wh_plus, table: profile_tcam.ipv4 */
+       { /* class_tid: 1, , table: profile_tcam.ipv4 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
        .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,
        .direction = TF_DIR_RX,
@@ -245,7 +245,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 6,
        .ident_nums = 1
        },
-       { /* class_tid: 1, wh_plus, table: profile_tcam.ipv6 */
+       { /* class_tid: 1, , table: profile_tcam.ipv6 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
        .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,
        .direction = TF_DIR_RX,
@@ -272,7 +272,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 7,
        .ident_nums = 1
        },
-       { /* class_tid: 1, wh_plus, table: profile_tcam.ipv4_vxlan */
+       { /* class_tid: 1, , table: profile_tcam.ipv4_vxlan */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
        .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,
        .direction = TF_DIR_RX,
@@ -299,7 +299,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 8,
        .ident_nums = 1
        },
-       { /* class_tid: 1, wh_plus, table: profile_tcam_cache.wr */
+       { /* class_tid: 1, , table: profile_tcam_cache.wr */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,
        .resource_sub_type =
@@ -320,10 +320,10 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .key_bit_size = 14,
        .key_num_fields = 3,
        .result_start_idx = 68,
-       .result_bit_size = 90,
+       .result_bit_size = 122,
        .result_num_fields = 5
        },
-       { /* class_tid: 1, wh_plus, table: em.ipv4 */
+       { /* class_tid: 1, , table: em.ipv4 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
        .resource_type = TF_MEM_INTERNAL,
        .direction = TF_DIR_RX,
@@ -345,7 +345,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 64,
        .result_num_fields = 9
        },
-       { /* class_tid: 1, wh_plus, table: eem.ipv4 */
+       { /* class_tid: 1, , table: eem.ipv4 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
        .resource_type = TF_MEM_EXTERNAL,
        .direction = TF_DIR_RX,
@@ -367,7 +367,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 64,
        .result_num_fields = 9
        },
-       { /* class_tid: 1, wh_plus, table: em.ipv6 */
+       { /* class_tid: 1, , table: em.ipv6 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
        .resource_type = TF_MEM_INTERNAL,
        .direction = TF_DIR_RX,
@@ -389,7 +389,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 64,
        .result_num_fields = 9
        },
-       { /* class_tid: 1, wh_plus, table: eem.ipv6 */
+       { /* class_tid: 1, , table: eem.ipv6 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
        .resource_type = TF_MEM_EXTERNAL,
        .direction = TF_DIR_RX,
@@ -411,7 +411,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 64,
        .result_num_fields = 9
        },
-       { /* class_tid: 1, wh_plus, table: em.vxlan */
+       { /* class_tid: 1, , table: em.vxlan */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
        .resource_type = TF_MEM_INTERNAL,
        .direction = TF_DIR_RX,
@@ -433,7 +433,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 64,
        .result_num_fields = 9
        },
-       { /* class_tid: 1, wh_plus, table: eem.vxlan */
+       { /* class_tid: 1, , table: eem.vxlan */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
        .resource_type = TF_MEM_EXTERNAL,
        .direction = TF_DIR_RX,
@@ -455,7 +455,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 64,
        .result_num_fields = 9
        },
-       { /* class_tid: 2, wh_plus, table: l2_cntxt_tcam_cache.rd */
+       { /* class_tid: 2, , table: l2_cntxt_tcam_cache.rd */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
@@ -477,7 +477,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 9,
        .ident_nums = 1
        },
-       { /* class_tid: 2, wh_plus, table: mac_addr_cache.rd */
+       { /* class_tid: 2, , table: mac_addr_cache.rd */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MAC_ADDR_CACHE,
@@ -499,7 +499,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 10,
        .ident_nums = 1
        },
-       { /* class_tid: 2, wh_plus, table: control.0 */
+       { /* class_tid: 2, , table: control.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
        .direction = TF_DIR_TX,
        .execute_info = {
@@ -512,7 +512,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .fdb_operand = BNXT_ULP_RF_IDX_RID,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE
        },
-       { /* class_tid: 2, wh_plus, table: l2_cntxt_tcam.0 */
+       { /* class_tid: 2, , table: l2_cntxt_tcam.0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
        .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
        .direction = TF_DIR_TX,
@@ -539,7 +539,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 11,
        .ident_nums = 1
        },
-       { /* class_tid: 2, wh_plus, table: mac_addr_cache.wr */
+       { /* class_tid: 2, , table: mac_addr_cache.wr */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MAC_ADDR_CACHE,
@@ -562,7 +562,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 62,
        .result_num_fields = 4
        },
-       { /* class_tid: 2, wh_plus, table: profile_tcam_cache.rd */
+       { /* class_tid: 2, , table: profile_tcam_cache.rd */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM,
@@ -584,7 +584,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 12,
        .ident_nums = 3
        },
-       { /* class_tid: 2, wh_plus, table: control.gen_tbl_miss */
+       { /* class_tid: 2, , table: control.gen_tbl_miss */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
        .direction = TF_DIR_TX,
        .execute_info = {
@@ -597,7 +597,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .fdb_operand = BNXT_ULP_RF_IDX_RID,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE
        },
-       { /* class_tid: 2, wh_plus, table: control.conflict_check */
+       { /* class_tid: 2, , table: control.conflict_check */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
        .direction = TF_DIR_TX,
        .execute_info = {
@@ -616,7 +616,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
                .func_dst_opr = BNXT_ULP_RF_IDX_CC },
        .byte_order = BNXT_ULP_BYTE_ORDER_LE
        },
-       { /* class_tid: 2, wh_plus, table: profile_tcam.ipv4 */
+       { /* class_tid: 2, , table: profile_tcam.ipv4 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
        .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,
        .direction = TF_DIR_TX,
@@ -643,7 +643,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 15,
        .ident_nums = 1
        },
-       { /* class_tid: 2, wh_plus, table: profile_tcam.ipv6 */
+       { /* class_tid: 2, , table: profile_tcam.ipv6 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
        .resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,
        .direction = TF_DIR_TX,
@@ -670,7 +670,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 16,
        .ident_nums = 1
        },
-       { /* class_tid: 2, wh_plus, table: profile_tcam_cache.wr */
+       { /* class_tid: 2, , table: profile_tcam_cache.wr */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM,
@@ -690,10 +690,10 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .key_bit_size = 14,
        .key_num_fields = 3,
        .result_start_idx = 178,
-       .result_bit_size = 90,
+       .result_bit_size = 122,
        .result_num_fields = 5
        },
-       { /* class_tid: 2, wh_plus, table: em.ipv4 */
+       { /* class_tid: 2, , table: em.ipv4 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
        .resource_type = TF_MEM_INTERNAL,
        .direction = TF_DIR_TX,
@@ -715,7 +715,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 64,
        .result_num_fields = 9
        },
-       { /* class_tid: 2, wh_plus, table: eem.ipv4 */
+       { /* class_tid: 2, , table: eem.ipv4 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
        .resource_type = TF_MEM_EXTERNAL,
        .direction = TF_DIR_TX,
@@ -737,7 +737,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 64,
        .result_num_fields = 9
        },
-       { /* class_tid: 2, wh_plus, table: em.ipv6 */
+       { /* class_tid: 2, , table: em.ipv6 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
        .resource_type = TF_MEM_INTERNAL,
        .direction = TF_DIR_TX,
@@ -759,7 +759,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 64,
        .result_num_fields = 9
        },
-       { /* class_tid: 2, wh_plus, table: eem.ipv6 */
+       { /* class_tid: 2, , table: eem.ipv6 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
        .resource_type = TF_MEM_EXTERNAL,
        .direction = TF_DIR_TX,
@@ -781,7 +781,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 64,
        .result_num_fields = 9
        },
-       { /* class_tid: 3, wh_plus, table: int_full_act_record.ing_0 */
+       { /* class_tid: 3, , table: int_full_act_record.ing_0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
        .resource_sub_type =
@@ -802,7 +802,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 128,
        .result_num_fields = 26
        },
-       { /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.ing_rd */
+       { /* class_tid: 3, , table: l2_cntxt_tcam_cache.ing_rd */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
@@ -824,7 +824,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 17,
        .ident_nums = 0
        },
-       { /* class_tid: 3, wh_plus, table: control.ing_0 */
+       { /* class_tid: 3, , table: control.ing_0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
        .direction = TF_DIR_RX,
        .execute_info = {
@@ -837,7 +837,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .fdb_operand = BNXT_ULP_RF_IDX_RID,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE
        },
-       { /* class_tid: 3, wh_plus, table: l2_cntxt_tcam.ing_0 */
+       { /* class_tid: 3, , table: l2_cntxt_tcam.ing_0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
        .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
        .direction = TF_DIR_RX,
@@ -866,7 +866,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 17,
        .ident_nums = 1
        },
-       { /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.ing_wr */
+       { /* class_tid: 3, , table: l2_cntxt_tcam_cache.ing_wr */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
@@ -889,7 +889,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 62,
        .result_num_fields = 4
        },
-       { /* class_tid: 3, wh_plus, table: parif_def_lkup_arec_ptr.ing_0 */
+       { /* class_tid: 3, , table: parif_def_lkup_arec_ptr.ing_0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
        .resource_type = TF_IF_TBL_TYPE_LKUP_PARIF_DFLT_ACT_REC_PTR,
        .direction = TF_DIR_RX,
@@ -907,7 +907,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 32,
        .result_num_fields = 1
        },
-       { /* class_tid: 3, wh_plus, table: parif_def_arec_ptr.ing_0 */
+       { /* class_tid: 3, , table: parif_def_arec_ptr.ing_0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
        .resource_type = TF_IF_TBL_TYPE_PROF_PARIF_DFLT_ACT_REC_PTR,
        .direction = TF_DIR_RX,
@@ -925,7 +925,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 32,
        .result_num_fields = 1
        },
-       { /* class_tid: 3, wh_plus, table: parif_def_err_arec_ptr.ing_0 */
+       { /* class_tid: 3, , table: parif_def_err_arec_ptr.ing_0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
        .resource_type = TF_IF_TBL_TYPE_PROF_PARIF_ERR_ACT_REC_PTR,
        .direction = TF_DIR_RX,
@@ -943,7 +943,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 32,
        .result_num_fields = 1
        },
-       { /* class_tid: 3, wh_plus, table: control.egr_0 */
+       { /* class_tid: 3, , table: control.egr_0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
        .direction = TF_DIR_RX,
        .execute_info = {
@@ -955,7 +955,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE
        },
-       { /* class_tid: 3, wh_plus, table: int_full_act_record.egr_vfr */
+       { /* class_tid: 3, , table: int_full_act_record.egr_vfr */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
        .resource_sub_type =
@@ -977,7 +977,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 0
        },
-       { /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.egr_rd_vfr */
+       { /* class_tid: 3, , table: l2_cntxt_tcam_cache.egr_rd_vfr */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
@@ -999,7 +999,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 18,
        .ident_nums = 0
        },
-       { /* class_tid: 3, wh_plus, table: control.egr_1 */
+       { /* class_tid: 3, , table: control.egr_1 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
        .direction = TF_DIR_RX,
        .execute_info = {
@@ -1012,7 +1012,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .fdb_operand = BNXT_ULP_RF_IDX_RID,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE
        },
-       { /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_bypass.egr_vfr */
+       { /* class_tid: 3, , table: l2_cntxt_tcam_bypass.egr_vfr */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
        .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
        .direction = TF_DIR_TX,
@@ -1039,7 +1039,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 18,
        .ident_nums = 0
        },
-       { /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.egr_wr_vfr */
+       { /* class_tid: 3, , table: l2_cntxt_tcam_cache.egr_wr_vfr */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
@@ -1062,7 +1062,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 62,
        .result_num_fields = 4
        },
-       { /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.rd */
+       { /* class_tid: 3, , table: l2_cntxt_tcam_cache.rd */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
@@ -1084,7 +1084,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 18,
        .ident_nums = 0
        },
-       { /* class_tid: 3, wh_plus, table: control.egr_2 */
+       { /* class_tid: 3, , table: control.egr_2 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
        .direction = TF_DIR_RX,
        .execute_info = {
@@ -1097,7 +1097,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .fdb_operand = BNXT_ULP_RF_IDX_RID,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE
        },
-       { /* class_tid: 3, wh_plus, table: l2_cntxt_tcam.egr_0 */
+       { /* class_tid: 3, , table: l2_cntxt_tcam.egr_0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
        .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
        .direction = TF_DIR_TX,
@@ -1124,7 +1124,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 18,
        .ident_nums = 1
        },
-       { /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.egr_wr */
+       { /* class_tid: 3, , table: l2_cntxt_tcam_cache.egr_wr */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
@@ -1147,7 +1147,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 62,
        .result_num_fields = 4
        },
-       { /* class_tid: 3, wh_plus, table: int_full_act_record.egr_0 */
+       { /* class_tid: 3, , table: int_full_act_record.egr_0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
        .resource_sub_type =
@@ -1169,7 +1169,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 0
        },
-       { /* class_tid: 3, wh_plus, table: parif_def_lkup_arec_ptr.egr_0 */
+       { /* class_tid: 3, , table: parif_def_lkup_arec_ptr.egr_0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
        .resource_type = TF_IF_TBL_TYPE_LKUP_PARIF_DFLT_ACT_REC_PTR,
        .direction = TF_DIR_TX,
@@ -1187,7 +1187,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 32,
        .result_num_fields = 1
        },
-       { /* class_tid: 3, wh_plus, table: parif_def_arec_ptr.egr_0 */
+       { /* class_tid: 3, , table: parif_def_arec_ptr.egr_0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
        .resource_type = TF_IF_TBL_TYPE_PROF_PARIF_DFLT_ACT_REC_PTR,
        .direction = TF_DIR_TX,
@@ -1205,7 +1205,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 32,
        .result_num_fields = 1
        },
-       { /* class_tid: 3, wh_plus, table: parif_def_err_arec_ptr.egr_0 */
+       { /* class_tid: 3, , table: parif_def_err_arec_ptr.egr_0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
        .resource_type = TF_IF_TBL_TYPE_PROF_PARIF_ERR_ACT_REC_PTR,
        .direction = TF_DIR_TX,
@@ -1223,7 +1223,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 32,
        .result_num_fields = 1
        },
-       { /* class_tid: 4, wh_plus, table: int_full_act_record.loopback */
+       { /* class_tid: 4, , table: int_full_act_record.loopback */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
        .resource_sub_type =
@@ -1245,7 +1245,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 0
        },
-       { /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.vf_rd_egr */
+       { /* class_tid: 4, , table: l2_cntxt_tcam_cache.vf_rd_egr */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
@@ -1267,7 +1267,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 19,
        .ident_nums = 0
        },
-       { /* class_tid: 4, wh_plus, table: control.vf_0 */
+       { /* class_tid: 4, , table: control.vf_0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
        .direction = TF_DIR_TX,
        .execute_info = {
@@ -1280,7 +1280,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .fdb_operand = BNXT_ULP_RF_IDX_RID,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE
        },
-       { /* class_tid: 4, wh_plus, table: l2_cntxt_tcam.vf_egr */
+       { /* class_tid: 4, , table: l2_cntxt_tcam.vf_egr */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
        .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
        .direction = TF_DIR_TX,
@@ -1307,7 +1307,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 19,
        .ident_nums = 1
        },
-       { /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.vf_egr_wr */
+       { /* class_tid: 4, , table: l2_cntxt_tcam_cache.vf_egr_wr */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
@@ -1330,7 +1330,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 62,
        .result_num_fields = 4
        },
-       { /* class_tid: 4, wh_plus, table: parif_def_lkup_arec_ptr.vf_egr */
+       { /* class_tid: 4, , table: parif_def_lkup_arec_ptr.vf_egr */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
        .resource_type = TF_IF_TBL_TYPE_LKUP_PARIF_DFLT_ACT_REC_PTR,
        .direction = TF_DIR_TX,
@@ -1348,7 +1348,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 32,
        .result_num_fields = 1
        },
-       { /* class_tid: 4, wh_plus, table: parif_def_arec_ptr.vf_egr */
+       { /* class_tid: 4, , table: parif_def_arec_ptr.vf_egr */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
        .resource_type = TF_IF_TBL_TYPE_PROF_PARIF_DFLT_ACT_REC_PTR,
        .direction = TF_DIR_TX,
@@ -1366,7 +1366,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 32,
        .result_num_fields = 1
        },
-       { /* class_tid: 4, wh_plus, table: parif_def_err_arec_ptr.vf_egr */
+       { /* class_tid: 4, , table: parif_def_err_arec_ptr.vf_egr */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
        .resource_type = TF_IF_TBL_TYPE_PROF_PARIF_ERR_ACT_REC_PTR,
        .direction = TF_DIR_TX,
@@ -1384,7 +1384,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 32,
        .result_num_fields = 1
        },
-       { /* class_tid: 4, wh_plus, table: int_full_act_record.vf_ing */
+       { /* class_tid: 4, , table: int_full_act_record.vf_ing */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
        .resource_sub_type =
@@ -1406,7 +1406,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_num_fields = 26,
        .encap_num_fields = 0
        },
-       { /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_bypass.vf_ing */
+       { /* class_tid: 4, , table: l2_cntxt_tcam_bypass.vf_ing */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
        .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
        .direction = TF_DIR_RX,
@@ -1434,7 +1434,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 20,
        .ident_nums = 0
        },
-       { /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.vfr_rd_egr0 */
+       { /* class_tid: 4, , table: l2_cntxt_tcam_cache.vfr_rd_egr0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
@@ -1456,7 +1456,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 20,
        .ident_nums = 0
        },
-       { /* class_tid: 4, wh_plus, table: control.vfr_0 */
+       { /* class_tid: 4, , table: control.vfr_0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
        .direction = TF_DIR_TX,
        .execute_info = {
@@ -1469,7 +1469,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .fdb_operand = BNXT_ULP_RF_IDX_RID,
        .byte_order = BNXT_ULP_BYTE_ORDER_LE
        },
-       { /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_bypass.vfr_egr0 */
+       { /* class_tid: 4, , table: l2_cntxt_tcam_bypass.vfr_egr0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
        .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
        .direction = TF_DIR_TX,
@@ -1496,7 +1496,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 20,
        .ident_nums = 0
        },
-       { /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.vfr_wr_egr0 */
+       { /* class_tid: 4, , table: l2_cntxt_tcam_cache.vfr_wr_egr0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
        .resource_sub_type =
                BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
@@ -1519,7 +1519,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 62,
        .result_num_fields = 4
        },
-       { /* class_tid: 4, wh_plus, table: int_vtag_encap_record.vfr_egr0 */
+       { /* class_tid: 4, , table: int_vtag_encap_record.vfr_egr0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_ACT_ENCAP_8B,
        .resource_sub_type =
@@ -1541,7 +1541,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_num_fields = 0,
        .encap_num_fields = 12
        },
-       { /* class_tid: 4, wh_plus, table: int_full_act_record.vfr_egr0 */
+       { /* class_tid: 4, , table: int_full_act_record.vfr_egr0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
        .resource_sub_type =
@@ -1562,7 +1562,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 128,
        .result_num_fields = 26
        },
-       { /* class_tid: 4, wh_plus, table: int_full_act_record.vfr_ing0 */
+       { /* class_tid: 4, , table: int_full_act_record.vfr_ing0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
        .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
        .resource_sub_type =
@@ -1583,7 +1583,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .result_bit_size = 128,
        .result_num_fields = 26
        },
-       { /* class_tid: 4, table: l2_cntxt_tcam_bypass.vfr_dtagged_ing0 */
+       { /* class_tid: 4, , table: l2_cntxt_tcam_bypass.vfr_dtagged_ing0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
        .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
        .direction = TF_DIR_RX,
@@ -1611,7 +1611,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
        .ident_start_idx = 20,
        .ident_nums = 0
        },
-       { /* class_tid: 4, table: l2_cntxt_tcam_bypass.vfr_stagged_ing0 */
+       { /* class_tid: 4, , table: l2_cntxt_tcam_bypass.vfr_stagged_ing0 */
        .resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
        .resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
        .direction = TF_DIR_RX,
@@ -1838,7 +1838,7 @@ struct bnxt_ulp_mapper_cond_info ulp_wh_plus_class_cond_list[] = {
 };
 
 struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
-       /* class_tid: 1, wh_plus, table: l2_cntxt_tcam_cache.rd */
+       /* class_tid: 1, , table: l2_cntxt_tcam_cache.rd */
        {
        .field_info_mask = {
                .description = "svif",
@@ -1859,7 +1859,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
                }
        },
-       /* class_tid: 1, wh_plus, table: mac_addr_cache.rd */
+       /* class_tid: 1, , table: mac_addr_cache.rd */
        {
        .field_info_mask = {
                .description = "svif",
@@ -1979,7 +1979,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
                }
        },
-       /* class_tid: 1, wh_plus, table: l2_cntxt_tcam.0 */
+       /* class_tid: 1, , table: l2_cntxt_tcam.0 */
        {
        .field_info_mask = {
                .description = "l2_ivlan_vid",
@@ -2215,7 +2215,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                1}
                }
        },
-       /* class_tid: 1, wh_plus, table: mac_addr_cache.wr */
+       /* class_tid: 1, , table: mac_addr_cache.wr */
        {
        .field_info_mask = {
                .description = "svif",
@@ -2335,7 +2335,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}
                }
        },
-       /* class_tid: 1, wh_plus, table: profile_tcam_cache.rd */
+       /* class_tid: 1, , table: profile_tcam_cache.rd */
        {
        .field_info_mask = {
                .description = "recycle_cnt",
@@ -2398,7 +2398,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}
                }
        },
-       /* class_tid: 1, wh_plus, table: profile_tcam.ipv4 */
+       /* class_tid: 1, , table: profile_tcam.ipv4 */
        {
        .field_info_mask = {
                .description = "l4_hdr_is_udp_tcp",
@@ -3080,7 +3080,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                1}
                }
        },
-       /* class_tid: 1, wh_plus, table: profile_tcam.ipv6 */
+       /* class_tid: 1, , table: profile_tcam.ipv6 */
        {
        .field_info_mask = {
                .description = "l4_hdr_is_udp_tcp",
@@ -3764,7 +3764,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                1}
                }
        },
-       /* class_tid: 1, wh_plus, table: profile_tcam.ipv4_vxlan */
+       /* class_tid: 1, , table: profile_tcam.ipv4_vxlan */
        {
        .field_info_mask = {
                .description = "l4_hdr_is_udp_tcp",
@@ -4406,7 +4406,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                1}
                }
        },
-       /* class_tid: 1, wh_plus, table: profile_tcam_cache.wr */
+       /* class_tid: 1, , table: profile_tcam_cache.wr */
        {
        .field_info_mask = {
                .description = "recycle_cnt",
@@ -4469,7 +4469,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}
                }
        },
-       /* class_tid: 1, wh_plus, table: em.ipv4 */
+       /* class_tid: 1, , table: em.ipv4 */
        {
        .field_info_mask = {
                .description = "spare",
@@ -4671,7 +4671,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}
                }
        },
-       /* class_tid: 1, wh_plus, table: eem.ipv4 */
+       /* class_tid: 1, , table: eem.ipv4 */
        {
        .field_info_mask = {
                .description = "spare",
@@ -4873,7 +4873,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}
                }
        },
-       /* class_tid: 1, wh_plus, table: em.ipv6 */
+       /* class_tid: 1, , table: em.ipv6 */
        {
        .field_info_mask = {
                .description = "spare",
@@ -5089,7 +5089,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}
                }
        },
-       /* class_tid: 1, wh_plus, table: eem.ipv6 */
+       /* class_tid: 1, , table: eem.ipv6 */
        {
        .field_info_mask = {
                .description = "spare",
@@ -5305,7 +5305,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}
                }
        },
-       /* class_tid: 1, wh_plus, table: em.vxlan */
+       /* class_tid: 1, , table: em.vxlan */
        {
        .field_info_mask = {
                .description = "spare",
@@ -5487,7 +5487,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}
                }
        },
-       /* class_tid: 1, wh_plus, table: eem.vxlan */
+       /* class_tid: 1, , table: eem.vxlan */
        {
        .field_info_mask = {
                .description = "spare",
@@ -5669,7 +5669,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}
                }
        },
-       /* class_tid: 2, wh_plus, table: l2_cntxt_tcam_cache.rd */
+       /* class_tid: 2, , table: l2_cntxt_tcam_cache.rd */
        {
        .field_info_mask = {
                .description = "svif",
@@ -5690,7 +5690,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
                }
        },
-       /* class_tid: 2, wh_plus, table: mac_addr_cache.rd */
+       /* class_tid: 2, , table: mac_addr_cache.rd */
        {
        .field_info_mask = {
                .description = "svif",
@@ -5810,7 +5810,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}
                }
        },
-       /* class_tid: 2, wh_plus, table: l2_cntxt_tcam.0 */
+       /* class_tid: 2, , table: l2_cntxt_tcam.0 */
        {
        .field_info_mask = {
                .description = "l2_ivlan_vid",
@@ -6046,7 +6046,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                1}
                }
        },
-       /* class_tid: 2, wh_plus, table: mac_addr_cache.wr */
+       /* class_tid: 2, , table: mac_addr_cache.wr */
        {
        .field_info_mask = {
                .description = "svif",
@@ -6166,7 +6166,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}
                }
        },
-       /* class_tid: 2, wh_plus, table: profile_tcam_cache.rd */
+       /* class_tid: 2, , table: profile_tcam_cache.rd */
        {
        .field_info_mask = {
                .description = "recycle_cnt",
@@ -6229,7 +6229,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}
                }
        },
-       /* class_tid: 2, wh_plus, table: profile_tcam.ipv4 */
+       /* class_tid: 2, , table: profile_tcam.ipv4 */
        {
        .field_info_mask = {
                .description = "l4_hdr_is_udp_tcp",
@@ -6911,7 +6911,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                1}
                }
        },
-       /* class_tid: 2, wh_plus, table: profile_tcam.ipv6 */
+       /* class_tid: 2, , table: profile_tcam.ipv6 */
        {
        .field_info_mask = {
                .description = "l4_hdr_is_udp_tcp",
@@ -7595,7 +7595,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                1}
                }
        },
-       /* class_tid: 2, wh_plus, table: profile_tcam_cache.wr */
+       /* class_tid: 2, , table: profile_tcam_cache.wr */
        {
        .field_info_mask = {
                .description = "recycle_cnt",
@@ -7658,7 +7658,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}
                }
        },
-       /* class_tid: 2, wh_plus, table: em.ipv4 */
+       /* class_tid: 2, , table: em.ipv4 */
        {
        .field_info_mask = {
                .description = "spare",
@@ -7860,7 +7860,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}
                }
        },
-       /* class_tid: 2, wh_plus, table: eem.ipv4 */
+       /* class_tid: 2, , table: eem.ipv4 */
        {
        .field_info_mask = {
                .description = "spare",
@@ -8062,7 +8062,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}
                }
        },
-       /* class_tid: 2, wh_plus, table: em.ipv6 */
+       /* class_tid: 2, , table: em.ipv6 */
        {
        .field_info_mask = {
                .description = "spare",
@@ -8278,7 +8278,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}
                }
        },
-       /* class_tid: 2, wh_plus, table: eem.ipv6 */
+       /* class_tid: 2, , table: eem.ipv6 */
        {
        .field_info_mask = {
                .description = "spare",
@@ -8494,7 +8494,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}
                }
        },
-       /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.ing_rd */
+       /* class_tid: 3, , table: l2_cntxt_tcam_cache.ing_rd */
        {
        .field_info_mask = {
                .description = "svif",
@@ -8514,7 +8514,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_CF_IDX_PHY_PORT_SVIF & 0xff}
                }
        },
-       /* class_tid: 3, wh_plus, table: l2_cntxt_tcam.ing_0 */
+       /* class_tid: 3, , table: l2_cntxt_tcam.ing_0 */
        {
        .field_info_mask = {
                .description = "l2_ivlan_vid",
@@ -8665,17 +8665,13 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                .description = "tun_hdr_type",
                .field_bit_size = 4,
                .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_WP_SYM_TUN_HDR_TYPE_NONE}
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
                },
        .field_info_spec = {
                .description = "tun_hdr_type",
                .field_bit_size = 4,
                .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_WP_SYM_TUN_HDR_TYPE_NONE}
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
                }
        },
        {
@@ -8710,7 +8706,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                1}
                }
        },
-       /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.ing_wr */
+       /* class_tid: 3, , table: l2_cntxt_tcam_cache.ing_wr */
        {
        .field_info_mask = {
                .description = "svif",
@@ -8730,7 +8726,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_CF_IDX_PHY_PORT_SVIF & 0xff}
                }
        },
-       /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.egr_rd_vfr */
+       /* class_tid: 3, , table: l2_cntxt_tcam_cache.egr_rd_vfr */
        {
        .field_info_mask = {
                .description = "svif",
@@ -8750,7 +8746,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}
                }
        },
-       /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_bypass.egr_vfr */
+       /* class_tid: 3, , table: l2_cntxt_tcam_bypass.egr_vfr */
        {
        .field_info_mask = {
                .description = "l2_ivlan_vid",
@@ -8901,17 +8897,13 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                .description = "tun_hdr_type",
                .field_bit_size = 4,
                .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_WP_SYM_TUN_HDR_TYPE_NONE}
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
                },
        .field_info_spec = {
                .description = "tun_hdr_type",
                .field_bit_size = 4,
                .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_WP_SYM_TUN_HDR_TYPE_NONE}
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
                }
        },
        {
@@ -8946,7 +8938,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                1}
                }
        },
-       /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.egr_wr_vfr */
+       /* class_tid: 3, , table: l2_cntxt_tcam_cache.egr_wr_vfr */
        {
        .field_info_mask = {
                .description = "svif",
@@ -8966,7 +8958,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}
                }
        },
-       /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.rd */
+       /* class_tid: 3, , table: l2_cntxt_tcam_cache.rd */
        {
        .field_info_mask = {
                .description = "svif",
@@ -8986,7 +8978,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}
                }
        },
-       /* class_tid: 3, wh_plus, table: l2_cntxt_tcam.egr_0 */
+       /* class_tid: 3, , table: l2_cntxt_tcam.egr_0 */
        {
        .field_info_mask = {
                .description = "l2_ivlan_vid",
@@ -9137,17 +9129,13 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                .description = "tun_hdr_type",
                .field_bit_size = 4,
                .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_WP_SYM_TUN_HDR_TYPE_NONE}
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
                },
        .field_info_spec = {
                .description = "tun_hdr_type",
                .field_bit_size = 4,
                .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_WP_SYM_TUN_HDR_TYPE_NONE}
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
                }
        },
        {
@@ -9182,7 +9170,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                1}
                }
        },
-       /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.egr_wr */
+       /* class_tid: 3, , table: l2_cntxt_tcam_cache.egr_wr */
        {
        .field_info_mask = {
                .description = "svif",
@@ -9202,7 +9190,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}
                }
        },
-       /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.vf_rd_egr */
+       /* class_tid: 4, , table: l2_cntxt_tcam_cache.vf_rd_egr */
        {
        .field_info_mask = {
                .description = "svif",
@@ -9222,7 +9210,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_CF_IDX_VF_FUNC_SVIF & 0xff}
                }
        },
-       /* class_tid: 4, wh_plus, table: l2_cntxt_tcam.vf_egr */
+       /* class_tid: 4, , table: l2_cntxt_tcam.vf_egr */
        {
        .field_info_mask = {
                .description = "l2_ivlan_vid",
@@ -9373,17 +9361,13 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                .description = "tun_hdr_type",
                .field_bit_size = 4,
                .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_WP_SYM_TUN_HDR_TYPE_NONE}
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
                },
        .field_info_spec = {
                .description = "tun_hdr_type",
                .field_bit_size = 4,
                .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_WP_SYM_TUN_HDR_TYPE_NONE}
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
                }
        },
        {
@@ -9418,7 +9402,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                1}
                }
        },
-       /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.vf_egr_wr */
+       /* class_tid: 4, , table: l2_cntxt_tcam_cache.vf_egr_wr */
        {
        .field_info_mask = {
                .description = "svif",
@@ -9438,7 +9422,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_CF_IDX_VF_FUNC_SVIF & 0xff}
                }
        },
-       /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_bypass.vf_ing */
+       /* class_tid: 4, , table: l2_cntxt_tcam_bypass.vf_ing */
        {
        .field_info_mask = {
                .description = "l2_ivlan_vid",
@@ -9589,17 +9573,13 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                .description = "tun_hdr_type",
                .field_bit_size = 4,
                .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_WP_SYM_TUN_HDR_TYPE_NONE}
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
                },
        .field_info_spec = {
                .description = "tun_hdr_type",
                .field_bit_size = 4,
                .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_WP_SYM_TUN_HDR_TYPE_NONE}
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
                }
        },
        {
@@ -9634,7 +9614,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                1}
                }
        },
-       /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.vfr_rd_egr0 */
+       /* class_tid: 4, , table: l2_cntxt_tcam_cache.vfr_rd_egr0 */
        {
        .field_info_mask = {
                .description = "svif",
@@ -9654,7 +9634,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}
                }
        },
-       /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_bypass.vfr_egr0 */
+       /* class_tid: 4, , table: l2_cntxt_tcam_bypass.vfr_egr0 */
        {
        .field_info_mask = {
                .description = "l2_ivlan_vid",
@@ -9805,17 +9785,13 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                .description = "tun_hdr_type",
                .field_bit_size = 4,
                .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_WP_SYM_TUN_HDR_TYPE_NONE}
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
                },
        .field_info_spec = {
                .description = "tun_hdr_type",
                .field_bit_size = 4,
                .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_WP_SYM_TUN_HDR_TYPE_NONE}
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
                }
        },
        {
@@ -9850,7 +9826,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                1}
                }
        },
-       /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.vfr_wr_egr0 */
+       /* class_tid: 4, , table: l2_cntxt_tcam_cache.vfr_wr_egr0 */
        {
        .field_info_mask = {
                .description = "svif",
@@ -9870,7 +9846,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                BNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}
                }
        },
-       /* class_tid: 4, table: l2_cntxt_tcam_bypass.vfr_dtagged_ing0 */
+       /* class_tid: 4, , table: l2_cntxt_tcam_bypass.vfr_dtagged_ing0 */
        {
        .field_info_mask = {
                .description = "l2_ivlan_vid",
@@ -10031,17 +10007,13 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                .description = "tun_hdr_type",
                .field_bit_size = 4,
                .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
                },
        .field_info_spec = {
                .description = "tun_hdr_type",
                .field_bit_size = 4,
                .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_WP_SYM_TUN_HDR_TYPE_NONE}
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
                }
        },
        {
@@ -10076,7 +10048,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                1}
                }
        },
-       /* class_tid: 4,  table: l2_cntxt_tcam_bypass.vfr_stagged_ing0 */
+       /* class_tid: 4, , table: l2_cntxt_tcam_bypass.vfr_stagged_ing0 */
        {
        .field_info_mask = {
                .description = "l2_ivlan_vid",
@@ -10237,17 +10209,13 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
                .description = "tun_hdr_type",
                .field_bit_size = 4,
                .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-               .field_opr1 = {
-                       0xff}
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
                },
        .field_info_spec = {
                .description = "tun_hdr_type",
                .field_bit_size = 4,
                .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-               .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-               .field_opr1 = {
-               ULP_WP_SYM_TUN_HDR_TYPE_NONE}
+               .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
                }
        },
        {
@@ -10285,7 +10253,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 };
 
 struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
-       /* class_tid: 1, wh_plus, table: l2_cntxt_tcam.0 */
+       /* class_tid: 1, , table: l2_cntxt_tcam.0 */
        {
        .description = "l2_cntxt_id",
        .field_bit_size = 10,
@@ -10375,7 +10343,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 1, wh_plus, table: mac_addr_cache.wr */
+       /* class_tid: 1, , table: mac_addr_cache.wr */
        {
        .description = "rid",
        .field_bit_size = 32,
@@ -10406,7 +10374,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 1, wh_plus, table: profile_tcam.ipv4 */
+       /* class_tid: 1, , table: profile_tcam.ipv4 */
        {
        .description = "wc_key_id",
        .field_bit_size = 4,
@@ -10552,7 +10520,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 1, wh_plus, table: profile_tcam.ipv6 */
+       /* class_tid: 1, , table: profile_tcam.ipv6 */
        {
        .description = "wc_key_id",
        .field_bit_size = 4,
@@ -10698,7 +10666,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 1, wh_plus, table: profile_tcam.ipv4_vxlan */
+       /* class_tid: 1, , table: profile_tcam.ipv4_vxlan */
        {
        .description = "wc_key_id",
        .field_bit_size = 4,
@@ -10816,7 +10784,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 1, wh_plus, table: profile_tcam_cache.wr */
+       /* class_tid: 1, , table: profile_tcam_cache.wr */
        {
        .description = "rid",
        .field_bit_size = 32,
@@ -10852,14 +10820,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        },
        {
        .description = "flow_sig_id",
-       .field_bit_size = 32,
+       .field_bit_size = 64,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_CF,
        .field_opr1 = {
        (BNXT_ULP_CF_IDX_FLOW_SIG_ID >> 8) & 0xff,
        BNXT_ULP_CF_IDX_FLOW_SIG_ID & 0xff}
        },
-       /* class_tid: 1, wh_plus, table: em.ipv4 */
+       /* class_tid: 1, , table: em.ipv4 */
        {
        .description = "act_rec_ptr",
        .field_bit_size = 33,
@@ -10921,7 +10889,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opr1 = {
        1}
        },
-       /* class_tid: 1, wh_plus, table: eem.ipv4 */
+       /* class_tid: 1, , table: eem.ipv4 */
        {
        .description = "act_rec_ptr",
        .field_bit_size = 33,
@@ -10989,7 +10957,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opr1 = {
        1}
        },
-       /* class_tid: 1, wh_plus, table: em.ipv6 */
+       /* class_tid: 1, , table: em.ipv6 */
        {
        .description = "act_rec_ptr",
        .field_bit_size = 33,
@@ -11051,7 +11019,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opr1 = {
        1}
        },
-       /* class_tid: 1, wh_plus, table: eem.ipv6 */
+       /* class_tid: 1, , table: eem.ipv6 */
        {
        .description = "act_rec_ptr",
        .field_bit_size = 33,
@@ -11119,7 +11087,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opr1 = {
        1}
        },
-       /* class_tid: 1, wh_plus, table: em.vxlan */
+       /* class_tid: 1, , table: em.vxlan */
        {
        .description = "act_rec_ptr",
        .field_bit_size = 33,
@@ -11181,7 +11149,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opr1 = {
        1}
        },
-       /* class_tid: 1, wh_plus, table: eem.vxlan */
+       /* class_tid: 1, , table: eem.vxlan */
        {
        .description = "act_rec_ptr",
        .field_bit_size = 33,
@@ -11249,7 +11217,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opr1 = {
        1}
        },
-       /* class_tid: 2, wh_plus, table: l2_cntxt_tcam.0 */
+       /* class_tid: 2, , table: l2_cntxt_tcam.0 */
        {
        .description = "l2_cntxt_id",
        .field_bit_size = 10,
@@ -11349,7 +11317,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 2, wh_plus, table: mac_addr_cache.wr */
+       /* class_tid: 2, , table: mac_addr_cache.wr */
        {
        .description = "rid",
        .field_bit_size = 32,
@@ -11383,7 +11351,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 2, wh_plus, table: profile_tcam.ipv4 */
+       /* class_tid: 2, , table: profile_tcam.ipv4 */
        {
        .description = "wc_key_id",
        .field_bit_size = 4,
@@ -11529,7 +11497,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 2, wh_plus, table: profile_tcam.ipv6 */
+       /* class_tid: 2, , table: profile_tcam.ipv6 */
        {
        .description = "wc_key_id",
        .field_bit_size = 4,
@@ -11675,7 +11643,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 2, wh_plus, table: profile_tcam_cache.wr */
+       /* class_tid: 2, , table: profile_tcam_cache.wr */
        {
        .description = "rid",
        .field_bit_size = 32,
@@ -11711,14 +11679,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        },
        {
        .description = "flow_sig_id",
-       .field_bit_size = 32,
+       .field_bit_size = 64,
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_CF,
        .field_opr1 = {
        (BNXT_ULP_CF_IDX_FLOW_SIG_ID >> 8) & 0xff,
        BNXT_ULP_CF_IDX_FLOW_SIG_ID & 0xff}
        },
-       /* class_tid: 2, wh_plus, table: em.ipv4 */
+       /* class_tid: 2, , table: em.ipv4 */
        {
        .description = "act_rec_ptr",
        .field_bit_size = 33,
@@ -11780,7 +11748,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opr1 = {
        1}
        },
-       /* class_tid: 2, wh_plus, table: eem.ipv4 */
+       /* class_tid: 2, , table: eem.ipv4 */
        {
        .description = "act_rec_ptr",
        .field_bit_size = 33,
@@ -11848,7 +11816,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opr1 = {
        1}
        },
-       /* class_tid: 2, wh_plus, table: em.ipv6 */
+       /* class_tid: 2, , table: em.ipv6 */
        {
        .description = "act_rec_ptr",
        .field_bit_size = 33,
@@ -11910,7 +11878,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opr1 = {
        1}
        },
-       /* class_tid: 2, wh_plus, table: eem.ipv6 */
+       /* class_tid: 2, , table: eem.ipv6 */
        {
        .description = "act_rec_ptr",
        .field_bit_size = 33,
@@ -11978,7 +11946,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opr1 = {
        1}
        },
-       /* class_tid: 3, wh_plus, table: int_full_act_record.ing_0 */
+       /* class_tid: 3, , table: int_full_act_record.ing_0 */
        {
        .description = "flow_cntr_ptr",
        .field_bit_size = 14,
@@ -12138,7 +12106,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 3, wh_plus, table: l2_cntxt_tcam.ing_0 */
+       /* class_tid: 3, , table: l2_cntxt_tcam.ing_0 */
        {
        .description = "l2_cntxt_id",
        .field_bit_size = 10,
@@ -12228,7 +12196,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.ing_wr */
+       /* class_tid: 3, , table: l2_cntxt_tcam_cache.ing_wr */
        {
        .description = "rid",
        .field_bit_size = 32,
@@ -12262,7 +12230,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 3, wh_plus, table: parif_def_lkup_arec_ptr.ing_0 */
+       /* class_tid: 3, , table: parif_def_lkup_arec_ptr.ing_0 */
        {
        .description = "act_rec_ptr",
        .field_bit_size = 32,
@@ -12272,7 +12240,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        (BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
        BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
        },
-       /* class_tid: 3, wh_plus, table: parif_def_arec_ptr.ing_0 */
+       /* class_tid: 3, , table: parif_def_arec_ptr.ing_0 */
        {
        .description = "act_rec_ptr",
        .field_bit_size = 32,
@@ -12282,7 +12250,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        (BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
        BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
        },
-       /* class_tid: 3, wh_plus, table: parif_def_err_arec_ptr.ing_0 */
+       /* class_tid: 3, , table: parif_def_err_arec_ptr.ing_0 */
        {
        .description = "act_rec_ptr",
        .field_bit_size = 32,
@@ -12292,7 +12260,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        (BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
        BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
        },
-       /* class_tid: 3, wh_plus, table: int_full_act_record.egr_vfr */
+       /* class_tid: 3, , table: int_full_act_record.egr_vfr */
        {
        .description = "flow_cntr_ptr",
        .field_bit_size = 14,
@@ -12452,7 +12420,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_bypass.egr_vfr */
+       /* class_tid: 3, , table: l2_cntxt_tcam_bypass.egr_vfr */
        {
        .description = "act_record_ptr",
        .field_bit_size = 16,
@@ -12540,7 +12508,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.egr_wr_vfr */
+       /* class_tid: 3, , table: l2_cntxt_tcam_cache.egr_wr_vfr */
        {
        .description = "rid",
        .field_bit_size = 32,
@@ -12571,7 +12539,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 3, wh_plus, table: l2_cntxt_tcam.egr_0 */
+       /* class_tid: 3, , table: l2_cntxt_tcam.egr_0 */
        {
        .description = "l2_cntxt_id",
        .field_bit_size = 10,
@@ -12661,7 +12629,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.egr_wr */
+       /* class_tid: 3, , table: l2_cntxt_tcam_cache.egr_wr */
        {
        .description = "rid",
        .field_bit_size = 32,
@@ -12695,7 +12663,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 3, wh_plus, table: int_full_act_record.egr_0 */
+       /* class_tid: 3, , table: int_full_act_record.egr_0 */
        {
        .description = "flow_cntr_ptr",
        .field_bit_size = 14,
@@ -12855,7 +12823,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 3, wh_plus, table: parif_def_lkup_arec_ptr.egr_0 */
+       /* class_tid: 3, , table: parif_def_lkup_arec_ptr.egr_0 */
        {
        .description = "act_rec_ptr",
        .field_bit_size = 32,
@@ -12865,7 +12833,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        (BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
        BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
        },
-       /* class_tid: 3, wh_plus, table: parif_def_arec_ptr.egr_0 */
+       /* class_tid: 3, , table: parif_def_arec_ptr.egr_0 */
        {
        .description = "act_rec_ptr",
        .field_bit_size = 32,
@@ -12875,7 +12843,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        (BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
        BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
        },
-       /* class_tid: 3, wh_plus, table: parif_def_err_arec_ptr.egr_0 */
+       /* class_tid: 3, , table: parif_def_err_arec_ptr.egr_0 */
        {
        .description = "act_rec_ptr",
        .field_bit_size = 32,
@@ -12885,7 +12853,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        (BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
        BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
        },
-       /* class_tid: 4, wh_plus, table: int_full_act_record.loopback */
+       /* class_tid: 4, , table: int_full_act_record.loopback */
        {
        .description = "flow_cntr_ptr",
        .field_bit_size = 14,
@@ -13045,7 +13013,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 4, wh_plus, table: l2_cntxt_tcam.vf_egr */
+       /* class_tid: 4, , table: l2_cntxt_tcam.vf_egr */
        {
        .description = "l2_cntxt_id",
        .field_bit_size = 10,
@@ -13134,7 +13102,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.vf_egr_wr */
+       /* class_tid: 4, , table: l2_cntxt_tcam_cache.vf_egr_wr */
        {
        .description = "rid",
        .field_bit_size = 32,
@@ -13168,7 +13136,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 4, wh_plus, table: parif_def_lkup_arec_ptr.vf_egr */
+       /* class_tid: 4, , table: parif_def_lkup_arec_ptr.vf_egr */
        {
        .description = "act_rec_ptr",
        .field_bit_size = 32,
@@ -13178,7 +13146,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        (BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR >> 8) & 0xff,
        BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR & 0xff}
        },
-       /* class_tid: 4, wh_plus, table: parif_def_arec_ptr.vf_egr */
+       /* class_tid: 4, , table: parif_def_arec_ptr.vf_egr */
        {
        .description = "act_rec_ptr",
        .field_bit_size = 32,
@@ -13188,7 +13156,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        (BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR >> 8) & 0xff,
        BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR & 0xff}
        },
-       /* class_tid: 4, wh_plus, table: parif_def_err_arec_ptr.vf_egr */
+       /* class_tid: 4, , table: parif_def_err_arec_ptr.vf_egr */
        {
        .description = "act_rec_ptr",
        .field_bit_size = 32,
@@ -13198,7 +13166,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        (BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR >> 8) & 0xff,
        BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR & 0xff}
        },
-       /* class_tid: 4, wh_plus, table: int_full_act_record.vf_ing */
+       /* class_tid: 4, , table: int_full_act_record.vf_ing */
        {
        .description = "flow_cntr_ptr",
        .field_bit_size = 14,
@@ -13358,7 +13326,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_bypass.vf_ing */
+       /* class_tid: 4, , table: l2_cntxt_tcam_bypass.vf_ing */
        {
        .description = "act_record_ptr",
        .field_bit_size = 16,
@@ -13444,7 +13412,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_bypass.vfr_egr0 */
+       /* class_tid: 4, , table: l2_cntxt_tcam_bypass.vfr_egr0 */
        {
        .description = "act_record_ptr",
        .field_bit_size = 16,
@@ -13529,7 +13497,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.vfr_wr_egr0 */
+       /* class_tid: 4, , table: l2_cntxt_tcam_cache.vfr_wr_egr0 */
        {
        .description = "rid",
        .field_bit_size = 32,
@@ -13560,7 +13528,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 4, wh_plus, table: int_vtag_encap_record.vfr_egr0 */
+       /* class_tid: 4, , table: int_vtag_encap_record.vfr_egr0 */
        {
        .description = "ecv_tun_type",
        .field_bit_size = 3,
@@ -13643,7 +13611,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 4, wh_plus, table: int_full_act_record.vfr_egr0 */
+       /* class_tid: 4, , table: int_full_act_record.vfr_egr0 */
        {
        .description = "flow_cntr_ptr",
        .field_bit_size = 14,
@@ -13806,7 +13774,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 4, wh_plus, table: int_full_act_record.vfr_ing0 */
+       /* class_tid: 4, , table: int_full_act_record.vfr_ing0 */
        {
        .description = "flow_cntr_ptr",
        .field_bit_size = 14,
@@ -13968,7 +13936,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 4, table: l2_cntxt_tcam_bypass.vfr_dtagged_ing0 */
+       /* class_tid: 4, , table: l2_cntxt_tcam_bypass.vfr_dtagged_ing0 */
        {
        .description = "act_record_ptr",
        .field_bit_size = 16,
@@ -14054,7 +14022,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
        .field_opc = BNXT_ULP_FIELD_OPC_SRC1,
        .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
        },
-       /* class_tid: 4, table: l2_cntxt_tcam_bypass.vfr_stagged_ing0 */
+       /* class_tid: 4, , table: l2_cntxt_tcam_bypass.vfr_stagged_ing0 */
        {
        .description = "act_record_ptr",
        .field_bit_size = 16,
@@ -14143,21 +14111,21 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 };
 
 struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {
-       /* class_tid: 1, wh_plus, table: l2_cntxt_tcam_cache.rd */
+       /* class_tid: 1, , table: l2_cntxt_tcam_cache.rd */
        {
        .description = "l2_cntxt_id",
        .regfile_idx = BNXT_ULP_RF_IDX_L2_CNTXT_ID_0,
        .ident_bit_size = 10,
        .ident_bit_pos = 42
        },
-       /* class_tid: 1, wh_plus, table: mac_addr_cache.rd */
+       /* class_tid: 1, , table: mac_addr_cache.rd */
        {
        .description = "l2_cntxt_id",
        .regfile_idx = BNXT_ULP_RF_IDX_L2_CNTXT_ID_0,
        .ident_bit_size = 10,
        .ident_bit_pos = 42
        },
-       /* class_tid: 1, wh_plus, table: l2_cntxt_tcam.0 */
+       /* class_tid: 1, , table: l2_cntxt_tcam.0 */
        {
        .description = "l2_cntxt_id",
        .resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
@@ -14166,7 +14134,7 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {
        .ident_bit_size = 10,
        .ident_bit_pos = 0
        },
-       /* class_tid: 1, wh_plus, table: profile_tcam_cache.rd */
+       /* class_tid: 1, , table: profile_tcam_cache.rd */
        {
        .description = "em_profile_id",
        .regfile_idx = BNXT_ULP_RF_IDX_EM_PROFILE_ID_0,
@@ -14176,7 +14144,7 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {
        {
        .description = "flow_sig_id",
        .regfile_idx = BNXT_ULP_RF_IDX_FLOW_SIG_ID,
-       .ident_bit_size = 32,
+       .ident_bit_size = 64,
        .ident_bit_pos = 58
        },
        {
@@ -14185,7 +14153,7 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {
        .ident_bit_size = 10,
        .ident_bit_pos = 32
        },
-       /* class_tid: 1, wh_plus, table: profile_tcam.ipv4 */
+       /* class_tid: 1, , table: profile_tcam.ipv4 */
        {
        .description = "em_profile_id",
        .resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
@@ -14194,7 +14162,7 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {
        .ident_bit_size = 8,
        .ident_bit_pos = 28
        },
-       /* class_tid: 1, wh_plus, table: profile_tcam.ipv6 */
+       /* class_tid: 1, , table: profile_tcam.ipv6 */
        {
        .description = "em_profile_id",
        .resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
@@ -14203,7 +14171,7 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {
        .ident_bit_size = 8,
        .ident_bit_pos = 28
        },
-       /* class_tid: 1, wh_plus, table: profile_tcam.ipv4_vxlan */
+       /* class_tid: 1, , table: profile_tcam.ipv4_vxlan */
        {
        .description = "em_profile_id",
        .resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
@@ -14212,21 +14180,21 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {
        .ident_bit_size = 8,
        .ident_bit_pos = 28
        },
-       /* class_tid: 2, wh_plus, table: l2_cntxt_tcam_cache.rd */
+       /* class_tid: 2, , table: l2_cntxt_tcam_cache.rd */
        {
        .description = "l2_cntxt_id",
        .regfile_idx = BNXT_ULP_RF_IDX_L2_CNTXT_ID_0,
        .ident_bit_size = 10,
        .ident_bit_pos = 42
        },
-       /* class_tid: 2, wh_plus, table: mac_addr_cache.rd */
+       /* class_tid: 2, , table: mac_addr_cache.rd */
        {
        .description = "l2_cntxt_id",
        .regfile_idx = BNXT_ULP_RF_IDX_L2_CNTXT_ID_0,
        .ident_bit_size = 10,
        .ident_bit_pos = 42
        },
-       /* class_tid: 2, wh_plus, table: l2_cntxt_tcam.0 */
+       /* class_tid: 2, , table: l2_cntxt_tcam.0 */
        {
        .description = "l2_cntxt_id",
        .resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
@@ -14235,7 +14203,7 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {
        .ident_bit_size = 10,
        .ident_bit_pos = 0
        },
-       /* class_tid: 2, wh_plus, table: profile_tcam_cache.rd */
+       /* class_tid: 2, , table: profile_tcam_cache.rd */
        {
        .description = "em_profile_id",
        .regfile_idx = BNXT_ULP_RF_IDX_EM_PROFILE_ID_0,
@@ -14245,7 +14213,7 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {
        {
        .description = "flow_sig_id",
        .regfile_idx = BNXT_ULP_RF_IDX_FLOW_SIG_ID,
-       .ident_bit_size = 32,
+       .ident_bit_size = 64,
        .ident_bit_pos = 58
        },
        {
@@ -14254,7 +14222,7 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {
        .ident_bit_size = 10,
        .ident_bit_pos = 32
        },
-       /* class_tid: 2, wh_plus, table: profile_tcam.ipv4 */
+       /* class_tid: 2, , table: profile_tcam.ipv4 */
        {
        .description = "em_profile_id",
        .resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
@@ -14263,7 +14231,7 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {
        .ident_bit_size = 8,
        .ident_bit_pos = 28
        },
-       /* class_tid: 2, wh_plus, table: profile_tcam.ipv6 */
+       /* class_tid: 2, , table: profile_tcam.ipv6 */
        {
        .description = "em_profile_id",
        .resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
@@ -14272,7 +14240,7 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {
        .ident_bit_size = 8,
        .ident_bit_pos = 28
        },
-       /* class_tid: 3, wh_plus, table: l2_cntxt_tcam.ing_0 */
+       /* class_tid: 3, , table: l2_cntxt_tcam.ing_0 */
        {
        .description = "l2_cntxt_id",
        .resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
@@ -14281,7 +14249,7 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {
        .ident_bit_size = 10,
        .ident_bit_pos = 0
        },
-       /* class_tid: 3, wh_plus, table: l2_cntxt_tcam.egr_0 */
+       /* class_tid: 3, , table: l2_cntxt_tcam.egr_0 */
        {
        .description = "l2_cntxt_id",
        .resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
@@ -14290,7 +14258,7 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {
        .ident_bit_size = 10,
        .ident_bit_pos = 0
        },
-       /* class_tid: 4, wh_plus, table: l2_cntxt_tcam.vf_egr */
+       /* class_tid: 4, , table: l2_cntxt_tcam.vf_egr */
        {
        .description = "l2_cntxt_id",
        .resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,