octeontx2-af: Increase number of reserved entries in KPU

With current KPU profile, we have 2 reserved entries which can
be loaded from firmware to parse custom headers. Adding changes
to increase these reserved entries to 6.
And also removed KPU entries for unused LTYPEs like
NPC_LT_LA_IH_8_ETHER, NPC_LT_LA_IH_4_ETHER, NPC_LT_LA_IH_2_ETHER

Signed-off-by: Kiran Kumar K <kirankumark@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/npc.h b/drivers/net/ethernet/marvell/octeontx2/af/npc.h
index 6e1192f..3144d30 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/npc.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/npc.h
@@ -25,10 +25,7 @@ enum npc_kpu_la_ltype {
        NPC_LT_LA_8023 = 1,
        NPC_LT_LA_ETHER,
        NPC_LT_LA_IH_NIX_ETHER,
-       NPC_LT_LA_IH_8_ETHER,
-       NPC_LT_LA_IH_4_ETHER,
-       NPC_LT_LA_IH_2_ETHER,
-       NPC_LT_LA_HIGIG2_ETHER,
+       NPC_LT_LA_HIGIG2_ETHER = 7,
        NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
        NPC_LT_LA_CUSTOM_L2_90B_ETHER,
        NPC_LT_LA_CPT_HDR,
@@ -554,7 +551,7 @@ struct npc_kpu_profile_fwdata {
 #define KPU_SIGN       0x00666f727075706b
 #define KPU_NAME_LEN   32
 /** Maximum number of custom KPU entries supported by the built-in profile. */
-#define KPU_MAX_CST_ENT        2
+#define KPU_MAX_CST_ENT        6
        /* KPU Profle Header */
        __le64  signature; /* "kpuprof\0" (8 bytes/ASCII characters) */
        u8      name[KPU_NAME_LEN]; /* KPU Profile name */

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/npc_profile.h b/drivers/net/ethernet/marvell/octeontx2/af/npc_profile.h
index 1a8c537..0fe7ad3 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/npc_profile.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/npc_profile.h
@@ -8,7 +8,7 @@
 #ifndef NPC_PROFILE_H
 #define NPC_PROFILE_H
 
-#define NPC_KPU_PROFILE_VER    0x0000000100060000
+#define NPC_KPU_PROFILE_VER    0x0000000100070000
 #define NPC_KPU_VER_MAJ(ver)   ((u16)(((ver) >> 32) & 0xFFFF))
 #define NPC_KPU_VER_MIN(ver)   ((u16)(((ver) >> 16) & 0xFFFF))
 #define NPC_KPU_VER_PATCH(ver) ((u16)((ver) & 0xFFFF))
@@ -184,7 +184,6 @@ enum npc_kpu_parser_state {
        NPC_S_KPU2_SBTAG,
        NPC_S_KPU2_QINQ,
        NPC_S_KPU2_ETAG,
-       NPC_S_KPU2_PREHEADER,
        NPC_S_KPU2_EXDSA,
        NPC_S_KPU2_NGIO,
        NPC_S_KPU2_CPT_CTAG,
@@ -1010,7 +1009,7 @@ static struct npc_kpu_profile_action ikpu_action_entries[] = {
                NPC_S_KPU1_CPT_HDR, 40, 0,
                NPC_LID_LA, NPC_LT_NA,
                0,
-               7, 7, 0, 0,
+               0, 7, 0, 0,
 
        },
        {
@@ -1063,6 +1062,10 @@ static struct npc_kpu_profile_action ikpu_action_entries[] = {
 static struct npc_kpu_profile_cam kpu1_cam_entries[] = {
        NPC_KPU_NOP_CAM,
        NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
        {
                NPC_S_KPU1_ETHER, 0xff,
                NPC_ETYPE_IP,
@@ -1380,33 +1383,6 @@ static struct npc_kpu_profile_cam kpu1_cam_entries[] = {
        },
        {
                NPC_S_KPU1_IH, 0xff,
-               NPC_IH_W | NPC_IH_UTAG,
-               NPC_IH_W | NPC_IH_UTAG,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU1_IH, 0xff,
-               NPC_IH_W,
-               NPC_IH_W | NPC_IH_UTAG,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU1_IH, 0xff,
-               0x0000,
-               NPC_IH_W | NPC_IH_UTAG,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU1_IH, 0xff,
                0x0000,
                0x0000,
                0x0000,
@@ -1905,6 +1881,10 @@ static struct npc_kpu_profile_cam kpu1_cam_entries[] = {
 static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
        NPC_KPU_NOP_CAM,
        NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
        {
                NPC_S_KPU2_CTAG, 0xff,
                NPC_ETYPE_IP,
@@ -2626,114 +2606,6 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
                0x0000,
        },
        {
-               NPC_S_KPU2_PREHEADER, 0xff,
-               NPC_ETYPE_IP,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU2_PREHEADER, 0xff,
-               NPC_ETYPE_IP6,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU2_PREHEADER, 0xff,
-               NPC_ETYPE_ARP,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU2_PREHEADER, 0xff,
-               NPC_ETYPE_RARP,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU2_PREHEADER, 0xff,
-               NPC_ETYPE_PTP,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU2_PREHEADER, 0xff,
-               NPC_ETYPE_FCOE,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU2_PREHEADER, 0xff,
-               NPC_ETYPE_CTAG,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU2_PREHEADER, 0xff,
-               NPC_ETYPE_SBTAG,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU2_PREHEADER, 0xff,
-               NPC_ETYPE_QINQ,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU2_PREHEADER, 0xff,
-               NPC_ETYPE_MPLSU,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU2_PREHEADER, 0xff,
-               NPC_ETYPE_MPLSM,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
-               NPC_S_KPU2_PREHEADER, 0xff,
-               NPC_ETYPE_NSH,
-               0xffff,
-               0x0000,
-               0x0000,
-               0x0000,
-               0x0000,
-       },
-       {
                NPC_S_KPU2_EXDSA, 0xff,
                NPC_DSA_EDSA,
                NPC_DSA_EDSA,
@@ -2936,6 +2808,10 @@ static struct npc_kpu_profile_cam kpu2_cam_entries[] = {
 static struct npc_kpu_profile_cam kpu3_cam_entries[] = {
        NPC_KPU_NOP_CAM,
        NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
        {
                NPC_S_KPU3_CTAG, 0xff,
                NPC_ETYPE_IP,
@@ -3913,6 +3789,10 @@ static struct npc_kpu_profile_cam kpu3_cam_entries[] = {
 static struct npc_kpu_profile_cam kpu4_cam_entries[] = {
        NPC_KPU_NOP_CAM,
        NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
        {
                NPC_S_KPU4_MPLS, 0xff,
                NPC_MPLS_S,
@@ -4224,6 +4104,10 @@ static struct npc_kpu_profile_cam kpu4_cam_entries[] = {
 static struct npc_kpu_profile_cam kpu5_cam_entries[] = {
        NPC_KPU_NOP_CAM,
        NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
        {
                NPC_S_KPU5_IP, 0xff,
                0x0000,
@@ -5219,6 +5103,10 @@ static struct npc_kpu_profile_cam kpu5_cam_entries[] = {
 static struct npc_kpu_profile_cam kpu6_cam_entries[] = {
        NPC_KPU_NOP_CAM,
        NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
        {
                NPC_S_KPU6_IP6_EXT, 0xff,
                0x0000,
@@ -5890,6 +5778,10 @@ static struct npc_kpu_profile_cam kpu6_cam_entries[] = {
 static struct npc_kpu_profile_cam kpu7_cam_entries[] = {
        NPC_KPU_NOP_CAM,
        NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
        {
                NPC_S_KPU7_IP6_EXT, 0xff,
                0x0000,
@@ -6210,6 +6102,10 @@ static struct npc_kpu_profile_cam kpu7_cam_entries[] = {
 static struct npc_kpu_profile_cam kpu8_cam_entries[] = {
        NPC_KPU_NOP_CAM,
        NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
        {
                NPC_S_KPU8_TCP, 0xff,
                0x0000,
@@ -6953,6 +6849,10 @@ static struct npc_kpu_profile_cam kpu8_cam_entries[] = {
 static struct npc_kpu_profile_cam kpu9_cam_entries[] = {
        NPC_KPU_NOP_CAM,
        NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
        {
                NPC_S_KPU9_TU_MPLS_IN_GRE, 0xff,
                NPC_MPLS_S,
@@ -7417,6 +7317,10 @@ static struct npc_kpu_profile_cam kpu9_cam_entries[] = {
 static struct npc_kpu_profile_cam kpu10_cam_entries[] = {
        NPC_KPU_NOP_CAM,
        NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
        {
                NPC_S_KPU10_TU_MPLS, 0xff,
                NPC_MPLS_S,
@@ -7584,6 +7488,10 @@ static struct npc_kpu_profile_cam kpu10_cam_entries[] = {
 static struct npc_kpu_profile_cam kpu11_cam_entries[] = {
        NPC_KPU_NOP_CAM,
        NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
        {
                NPC_S_KPU11_TU_ETHER, 0xff,
                NPC_ETYPE_IP,
@@ -7895,6 +7803,10 @@ static struct npc_kpu_profile_cam kpu11_cam_entries[] = {
 static struct npc_kpu_profile_cam kpu12_cam_entries[] = {
        NPC_KPU_NOP_CAM,
        NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
        {
                NPC_S_KPU12_TU_IP, 0xff,
                NPC_IPNH_TCP,
@@ -8152,6 +8064,10 @@ static struct npc_kpu_profile_cam kpu12_cam_entries[] = {
 static struct npc_kpu_profile_cam kpu13_cam_entries[] = {
        NPC_KPU_NOP_CAM,
        NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
        {
                NPC_S_KPU13_TU_IP6_EXT, 0xff,
                0x0000,
@@ -8166,6 +8082,10 @@ static struct npc_kpu_profile_cam kpu13_cam_entries[] = {
 static struct npc_kpu_profile_cam kpu14_cam_entries[] = {
        NPC_KPU_NOP_CAM,
        NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
        {
                NPC_S_KPU14_TU_IP6_EXT, 0xff,
                0x0000,
@@ -8180,6 +8100,10 @@ static struct npc_kpu_profile_cam kpu14_cam_entries[] = {
 static struct npc_kpu_profile_cam kpu15_cam_entries[] = {
        NPC_KPU_NOP_CAM,
        NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
        {
                NPC_S_KPU15_TU_TCP, 0xff,
                0x0000,
@@ -8383,6 +8307,10 @@ static struct npc_kpu_profile_cam kpu15_cam_entries[] = {
 static struct npc_kpu_profile_cam kpu16_cam_entries[] = {
        NPC_KPU_NOP_CAM,
        NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
+       NPC_KPU_NOP_CAM,
        {
                NPC_S_KPU16_TCP_DATA, 0xff,
                0x0000,
@@ -8442,6 +8370,10 @@ static struct npc_kpu_profile_cam kpu16_cam_entries[] = {
 static struct npc_kpu_profile_action kpu1_action_entries[] = {
        NPC_KPU_NOP_ACTION,
        NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                8, 0, 6, 3, 0,
@@ -8728,30 +8660,6 @@ static struct npc_kpu_profile_action kpu1_action_entries[] = {
                0, 0, 0, 0,
        },
        {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               12, 14, 16, 0, 0,
-               NPC_S_KPU2_PREHEADER, 8, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_8_ETHER,
-               0,
-               1, 0xff, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               12, 14, 16, 0, 0,
-               NPC_S_KPU2_PREHEADER, 4, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_4_ETHER,
-               0,
-               1, 0xff, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               12, 14, 16, 0, 0,
-               NPC_S_KPU2_PREHEADER, 2, 1,
-               NPC_LID_LA, NPC_LT_LA_IH_2_ETHER,
-               0,
-               1, 0xff, 0, 0,
-       },
-       {
                NPC_ERRLEV_LA, NPC_EC_IH_LENGTH,
                0, 0, 0, 0, 1,
                NPC_S_NA, 0, 1,
@@ -9210,6 +9118,10 @@ static struct npc_kpu_profile_action kpu1_action_entries[] = {
 static struct npc_kpu_profile_action kpu2_action_entries[] = {
        NPC_KPU_NOP_ACTION,
        NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                8, 0, 6, 2, 0,
@@ -9853,102 +9765,6 @@ static struct npc_kpu_profile_action kpu2_action_entries[] = {
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                8, 0, 6, 2, 0,
-               NPC_S_KPU5_IP, 14, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               6, 0, 0, 2, 0,
-               NPC_S_KPU5_IP6, 14, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_ARP, 14, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_RARP, 14, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_PTP, 14, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               0, 0, 0, 2, 0,
-               NPC_S_KPU5_FCOE, 14, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 0, 0, 0,
-               NPC_S_KPU3_CTAG_C, 14, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 20, 0, 0,
-               NPC_S_KPU3_STAG_C, 14, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 0, 0, 0,
-               NPC_S_KPU3_QINQ_C, 14, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 1, 0,
-               NPC_S_KPU4_MPLS, 14, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 6, 10, 1, 0,
-               NPC_S_KPU4_MPLS, 14, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               2, 0, 0, 1, 0,
-               NPC_S_KPU4_NSH, 14, 0,
-               NPC_LID_LB, NPC_LT_NA,
-               0,
-               0, 0, 0, 0,
-       },
-       {
-               NPC_ERRLEV_RE, NPC_EC_NOERR,
-               8, 0, 6, 2, 0,
                NPC_S_KPU5_IP, 18, 1,
                NPC_LID_LB, NPC_LT_LB_EDSA,
                NPC_F_LB_L_EDSA,
@@ -10127,6 +9943,10 @@ static struct npc_kpu_profile_action kpu2_action_entries[] = {
 static struct npc_kpu_profile_action kpu3_action_entries[] = {
        NPC_KPU_NOP_ACTION,
        NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                8, 0, 6, 1, 0,
@@ -10996,6 +10816,10 @@ static struct npc_kpu_profile_action kpu3_action_entries[] = {
 static struct npc_kpu_profile_action kpu4_action_entries[] = {
        NPC_KPU_NOP_ACTION,
        NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 0, 0,
@@ -11273,6 +11097,10 @@ static struct npc_kpu_profile_action kpu4_action_entries[] = {
 static struct npc_kpu_profile_action kpu5_action_entries[] = {
        NPC_KPU_NOP_ACTION,
        NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_LC, NPC_EC_IP_TTL_0,
                0, 0, 0, 0, 1,
@@ -12158,6 +11986,10 @@ static struct npc_kpu_profile_action kpu5_action_entries[] = {
 static struct npc_kpu_profile_action kpu6_action_entries[] = {
        NPC_KPU_NOP_ACTION,
        NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 0, 1,
@@ -12755,6 +12587,10 @@ static struct npc_kpu_profile_action kpu6_action_entries[] = {
 static struct npc_kpu_profile_action kpu7_action_entries[] = {
        NPC_KPU_NOP_ACTION,
        NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 0, 1,
@@ -13040,6 +12876,10 @@ static struct npc_kpu_profile_action kpu7_action_entries[] = {
 static struct npc_kpu_profile_action kpu8_action_entries[] = {
        NPC_KPU_NOP_ACTION,
        NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_LD, NPC_EC_TCP_FLAGS_FIN_ONLY,
                0, 0, 0, 0, 1,
@@ -13701,6 +13541,10 @@ static struct npc_kpu_profile_action kpu8_action_entries[] = {
 static struct npc_kpu_profile_action kpu9_action_entries[] = {
        NPC_KPU_NOP_ACTION,
        NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 0, 0,
@@ -14114,6 +13958,10 @@ static struct npc_kpu_profile_action kpu9_action_entries[] = {
 static struct npc_kpu_profile_action kpu10_action_entries[] = {
        NPC_KPU_NOP_ACTION,
        NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                8, 0, 6, 1, 0,
@@ -14263,6 +14111,10 @@ static struct npc_kpu_profile_action kpu10_action_entries[] = {
 static struct npc_kpu_profile_action kpu11_action_entries[] = {
        NPC_KPU_NOP_ACTION,
        NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                8, 0, 6, 0, 0,
@@ -14540,6 +14392,10 @@ static struct npc_kpu_profile_action kpu11_action_entries[] = {
 static struct npc_kpu_profile_action kpu12_action_entries[] = {
        NPC_KPU_NOP_ACTION,
        NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                2, 12, 0, 2, 0,
@@ -14769,6 +14625,10 @@ static struct npc_kpu_profile_action kpu12_action_entries[] = {
 static struct npc_kpu_profile_action kpu13_action_entries[] = {
        NPC_KPU_NOP_ACTION,
        NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 0, 1,
@@ -14782,6 +14642,10 @@ static struct npc_kpu_profile_action kpu13_action_entries[] = {
 static struct npc_kpu_profile_action kpu14_action_entries[] = {
        NPC_KPU_NOP_ACTION,
        NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 0, 1,
@@ -14795,6 +14659,10 @@ static struct npc_kpu_profile_action kpu14_action_entries[] = {
 static struct npc_kpu_profile_action kpu15_action_entries[] = {
        NPC_KPU_NOP_ACTION,
        NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_LG, NPC_EC_TCP_FLAGS_FIN_ONLY,
                0, 0, 0, 0, 1,
@@ -14976,6 +14844,10 @@ static struct npc_kpu_profile_action kpu15_action_entries[] = {
 static struct npc_kpu_profile_action kpu16_action_entries[] = {
        NPC_KPU_NOP_ACTION,
        NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
+       NPC_KPU_NOP_ACTION,
        {
                NPC_ERRLEV_RE, NPC_EC_NOERR,
                0, 0, 0, 0, 1,