common/cnxk: fix nibble parsing order when dumping MCAM

Fix the order in which layer flags and layer type fields
are parsed when dumping the MCAM data.

Fixes: 9869c39918a0 ("common/cnxk: support flow entry dump")
Cc: stable@dpdk.org
Signed-off-by: Satheesh Paul <psatheesh@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>

diff --git a/drivers/common/cnxk/roc_npc_mcam_dump.c b/drivers/common/cnxk/roc_npc_mcam_dump.c
index 19b4901a52f7f27a3301145e4960e4ccc4f7c12d..278056591e7b7cfcda16eac7940af2c7c62b77c6 100644 (file)
--- a/drivers/common/cnxk/roc_npc_mcam_dump.c
+++ b/drivers/common/cnxk/roc_npc_mcam_dump.c
@@ -159,6 +159,12 @@ npc_flow_print_parse_nibbles(FILE *file, struct roc_npc_flow *flow,
                offset += 4;
        }
 
+       if (rx_parse->laflags) {
+               data = npc_get_nibbles(flow, 2, offset);
+               fprintf(file, "\tNPC_PARSE_NIBBLE_LA_FLAGS:%#02X\n", data);
+               offset += 8;
+       }
+
        if (rx_parse->latype) {
                data = npc_get_nibbles(flow, 1, offset);
                fprintf(file, "\tNPC_PARSE_NIBBLE_LA_LTYPE:%s\n",
@@ -166,9 +172,9 @@ npc_flow_print_parse_nibbles(FILE *file, struct roc_npc_flow *flow,
                offset += 4;
        }
 
-       if (rx_parse->laflags) {
+       if (rx_parse->lbflags) {
                data = npc_get_nibbles(flow, 2, offset);
-               fprintf(file, "\tNPC_PARSE_NIBBLE_LA_FLAGS:%#02X\n", data);
+               fprintf(file, "\tNPC_PARSE_NIBBLE_LB_FLAGS:%#02X\n", data);
                offset += 8;
        }
 
@@ -179,9 +185,9 @@ npc_flow_print_parse_nibbles(FILE *file, struct roc_npc_flow *flow,
                offset += 4;
        }
 
-       if (rx_parse->lbflags) {
+       if (rx_parse->lcflags) {
                data = npc_get_nibbles(flow, 2, offset);
-               fprintf(file, "\tNPC_PARSE_NIBBLE_LB_FLAGS:%#02X\n", data);
+               fprintf(file, "\tNPC_PARSE_NIBBLE_LC_FLAGS:%#02X\n", data);
                offset += 8;
        }
 
@@ -192,9 +198,9 @@ npc_flow_print_parse_nibbles(FILE *file, struct roc_npc_flow *flow,
                offset += 4;
        }
 
-       if (rx_parse->lcflags) {
+       if (rx_parse->ldflags) {
                data = npc_get_nibbles(flow, 2, offset);
-               fprintf(file, "\tNPC_PARSE_NIBBLE_LC_FLAGS:%#02X\n", data);
+               fprintf(file, "\tNPC_PARSE_NIBBLE_LD_FLAGS:%#02X\n", data);
                offset += 8;
        }
 
@@ -205,9 +211,9 @@ npc_flow_print_parse_nibbles(FILE *file, struct roc_npc_flow *flow,
                offset += 4;
        }
 
-       if (rx_parse->ldflags) {
+       if (rx_parse->leflags) {
                data = npc_get_nibbles(flow, 2, offset);
-               fprintf(file, "\tNPC_PARSE_NIBBLE_LD_FLAGS:%#02X\n", data);
+               fprintf(file, "\tNPC_PARSE_NIBBLE_LE_FLAGS:%#02X\n", data);
                offset += 8;
        }
 
@@ -218,9 +224,9 @@ npc_flow_print_parse_nibbles(FILE *file, struct roc_npc_flow *flow,
                offset += 4;
        }
 
-       if (rx_parse->leflags) {
+       if (rx_parse->lfflags) {
                data = npc_get_nibbles(flow, 2, offset);
-               fprintf(file, "\tNPC_PARSE_NIBBLE_LE_FLAGS:%#02X\n", data);
+               fprintf(file, "\tNPC_PARSE_NIBBLE_LF_FLAGS:%#02X\n", data);
                offset += 8;
        }
 
@@ -231,9 +237,9 @@ npc_flow_print_parse_nibbles(FILE *file, struct roc_npc_flow *flow,
                offset += 4;
        }
 
-       if (rx_parse->lfflags) {
+       if (rx_parse->lgflags) {
                data = npc_get_nibbles(flow, 2, offset);
-               fprintf(file, "\tNPC_PARSE_NIBBLE_LF_FLAGS:%#02X\n", data);
+               fprintf(file, "\tNPC_PARSE_NIBBLE_LG_FLAGS:%#02X\n", data);
                offset += 8;
        }
 
@@ -244,10 +250,9 @@ npc_flow_print_parse_nibbles(FILE *file, struct roc_npc_flow *flow,
                offset += 4;
        }
 
-       if (rx_parse->lgflags) {
+       if (rx_parse->lhflags) {
                data = npc_get_nibbles(flow, 2, offset);
-               fprintf(file, "\tNPC_PARSE_NIBBLE_LG_FLAGS:%#02X\n", data);
-               offset += 8;
+               fprintf(file, "\tNPC_PARSE_NIBBLE_LH_FLAGS:%#02X\n", data);
        }
 
        if (rx_parse->lhtype) {
@@ -256,11 +261,6 @@ npc_flow_print_parse_nibbles(FILE *file, struct roc_npc_flow *flow,
                        ltype_str[NPC_LID_LH][data]);
                offset += 4;
        }
-
-       if (rx_parse->lhflags) {
-               data = npc_get_nibbles(flow, 2, offset);
-               fprintf(file, "\tNPC_PARSE_NIBBLE_LH_FLAGS:%#02X\n", data);
-       }
 }
 
 static void