Skip to contentSkip to conversation

common/cnxk: move ICMP ltype to end of enum

PATCH Applied [email protected] 2 participants 2 messages Dec 1, 2022 – Jan 9, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 common/cnxk: move ICMP ltype to end of enum

From: Kiran Kumar K <[email protected]>

While configuring the RSS key, mask has been created to match multiple ltypes for L4. Since ICMP is placed in between, it is also being considered for RSS. So, moving the ICMP to end of enum.

---
 drivers/common/cnxk/hw/npc.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/common/cnxk/hw/npc.h +6 -6
index b8218e25af..4164c6ac2e 100644
@@ -219,8 +219,7 @@ enum npc_kpu_lc_ltype {
 enum npc_kpu_ld_ltype {
 	NPC_LT_LD_TCP = 1,
 	NPC_LT_LD_UDP,
-	NPC_LT_LD_ICMP,
-	NPC_LT_LD_SCTP,
+	NPC_LT_LD_SCTP = 4,
 	NPC_LT_LD_ICMP6,
 	NPC_LT_LD_CUSTOM0,
 	NPC_LT_LD_CUSTOM1,
@@ -231,6 +230,7 @@ enum npc_kpu_ld_ltype {
 	NPC_LT_LD_NSH,
 	NPC_LT_LD_TU_MPLS_IN_NSH,
 	NPC_LT_LD_TU_MPLS_IN_IP,
+	NPC_LT_LD_ICMP,
 };
 
 enum npc_kpu_le_ltype {
@@ -276,14 +276,14 @@ enum npc_kpu_lg_ltype {
 enum npc_kpu_lh_ltype {
 	NPC_LT_LH_TU_TCP = 1,
 	NPC_LT_LH_TU_UDP,
-	NPC_LT_LH_TU_ICMP,
-	NPC_LT_LH_TU_SCTP,
+	NPC_LT_LH_TU_SCTP = 4,
 	NPC_LT_LH_TU_ICMP6,
+	NPC_LT_LH_CUSTOM0,
+	NPC_LT_LH_CUSTOM1,
 	NPC_LT_LH_TU_IGMP = 8,
 	NPC_LT_LH_TU_ESP,
 	NPC_LT_LH_TU_AH,
-	NPC_LT_LH_CUSTOM0 = 0xE,
-	NPC_LT_LH_CUSTOM1 = 0xF,
+	NPC_LT_LH_TU_ICMP = 0xF,
 };
 
 enum npc_kpu_lb_uflag {
Signature · 1 line
2.35.3
Applied
#1 lore raw
Quoted 9 lines · On Thu, Dec 1, 2022 at 9:33 AM <[email protected]> wrote:

From: Kiran Kumar K <[email protected]>

While configuring the RSS key, mask has been created to match multiple ltypes for L4. Since ICMP is placed in between, it is also being considered for RSS. So, moving the ICMP to end of enum.

Applied to dpdk-next-net-mrvl/for-next-net. Thanks

Quoted 48 lines
---
 drivers/common/cnxk/hw/npc.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/common/cnxk/hw/npc.h +6 -7
index b8218e25af..4164c6ac2e 100644
@@ -219,8 +219,7 @@ enum npc_kpu_lc_ltype {
 enum npc_kpu_ld_ltype {
        NPC_LT_LD_TCP = 1,
        NPC_LT_LD_UDP,
-       NPC_LT_LD_ICMP,
-       NPC_LT_LD_SCTP,
+       NPC_LT_LD_SCTP = 4,
        NPC_LT_LD_ICMP6,
        NPC_LT_LD_CUSTOM0,
        NPC_LT_LD_CUSTOM1,
@@ -231,6 +230,7 @@ enum npc_kpu_ld_ltype {
        NPC_LT_LD_NSH,
        NPC_LT_LD_TU_MPLS_IN_NSH,
        NPC_LT_LD_TU_MPLS_IN_IP,
+       NPC_LT_LD_ICMP,
 };
 
 enum npc_kpu_le_ltype {
@@ -276,14 +276,14 @@ enum npc_kpu_lg_ltype {
 enum npc_kpu_lh_ltype {
        NPC_LT_LH_TU_TCP = 1,
        NPC_LT_LH_TU_UDP,
-       NPC_LT_LH_TU_ICMP,
-       NPC_LT_LH_TU_SCTP,
+       NPC_LT_LH_TU_SCTP = 4,
        NPC_LT_LH_TU_ICMP6,
+       NPC_LT_LH_CUSTOM0,
+       NPC_LT_LH_CUSTOM1,
        NPC_LT_LH_TU_IGMP = 8,
        NPC_LT_LH_TU_ESP,
        NPC_LT_LH_TU_AH,
-       NPC_LT_LH_CUSTOM0 = 0xE,
-       NPC_LT_LH_CUSTOM1 = 0xF,
+       NPC_LT_LH_TU_ICMP = 0xF,
 };
 
 enum npc_kpu_lb_uflag {
--

2.35.3