net/octeontx2: support HIGIG2

Adding support to parse higig2 header in RTE flow for octeontx2.
And added devargs to configure port for higig2.

Signed-off-by: Kiran Kumar K <kirankumark@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>

diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index adf7c71..eb7aaa4 100644 (file)
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -288,6 +288,8 @@ Patterns:
    +----+--------------------------------+
    | 23 | RTE_FLOW_ITEM_TYPE_GRE_KEY     |
    +----+--------------------------------+
+   | 24 | RTE_FLOW_ITEM_TYPE_HIGIG2      |
+   +----+--------------------------------+
 
 .. note::
 

diff --git a/drivers/common/octeontx2/hw/otx2_npc.h b/drivers/common/octeontx2/hw/otx2_npc.h
index 5b8d3ed..a0536e0 100644 (file)
--- a/drivers/common/octeontx2/hw/otx2_npc.h
+++ b/drivers/common/octeontx2/hw/otx2_npc.h
@@ -182,6 +182,8 @@ enum npc_kpu_la_ltype {
        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_IH_NIX_HIGIG2_ETHER,
 };
 
 enum npc_kpu_lb_ltype {

diff --git a/drivers/net/octeontx2/otx2_flow.c b/drivers/net/octeontx2/otx2_flow.c
index bdbf123..f1fb9f9 100644 (file)
--- a/drivers/net/octeontx2/otx2_flow.c
+++ b/drivers/net/octeontx2/otx2_flow.c
@@ -325,6 +325,7 @@ flow_parse_pattern(struct rte_eth_dev *dev,
 {
        flow_parse_stage_func_t parse_stage_funcs[] = {
                flow_parse_meta_items,
+               otx2_flow_parse_higig2_hdr,
                otx2_flow_parse_la,
                otx2_flow_parse_lb,
                otx2_flow_parse_lc,

diff --git a/drivers/net/octeontx2/otx2_flow.h b/drivers/net/octeontx2/otx2_flow.h
index 6bfd5af..df78f41 100644 (file)
--- a/drivers/net/octeontx2/otx2_flow.h
+++ b/drivers/net/octeontx2/otx2_flow.h
@@ -29,6 +29,7 @@ enum {
 
 #define NPC_IH_LENGTH                  8
 #define NPC_TPID_LENGTH                        2
+#define NPC_HIGIG2_LENGTH              16
 #define NPC_COUNTER_NONE               (-1)
 /* 32 bytes from LDATA_CFG & 32 bytes from FLAGS_CFG */
 #define NPC_MAX_EXTRACT_DATA_LEN       (64)
@@ -382,6 +383,8 @@ int otx2_flow_parse_lb(struct otx2_parse_state *pst);
 
 int otx2_flow_parse_la(struct otx2_parse_state *pst);
 
+int otx2_flow_parse_higig2_hdr(struct otx2_parse_state *pst);
+
 int otx2_flow_parse_actions(struct rte_eth_dev *dev,
                            const struct rte_flow_attr *attr,
                            const struct rte_flow_action actions[],

diff --git a/drivers/net/octeontx2/otx2_flow_parse.c b/drivers/net/octeontx2/otx2_flow_parse.c
index 6b2617b..2d9a585 100644 (file)
--- a/drivers/net/octeontx2/otx2_flow_parse.c
+++ b/drivers/net/octeontx2/otx2_flow_parse.c
@@ -675,6 +675,15 @@ otx2_flow_parse_la(struct otx2_parse_state *pst)
        if (pst->flow->nix_intf == NIX_INTF_TX) {
                lt = NPC_LT_LA_IH_NIX_ETHER;
                info.hw_hdr_len = NPC_IH_LENGTH;
+               if (pst->npc->switch_header_type == OTX2_PRIV_FLAGS_HIGIG) {
+                       lt = NPC_LT_LA_IH_NIX_HIGIG2_ETHER;
+                       info.hw_hdr_len += NPC_HIGIG2_LENGTH;
+               }
+       } else {
+               if (pst->npc->switch_header_type == OTX2_PRIV_FLAGS_HIGIG) {
+                       lt = NPC_LT_LA_HIGIG2_ETHER;
+                       info.hw_hdr_len = NPC_HIGIG2_LENGTH;
+               }
        }
 
        /* Prepare for parsing the item */
@@ -694,6 +703,44 @@ otx2_flow_parse_la(struct otx2_parse_state *pst)
        return otx2_flow_update_parse_state(pst, &info, lid, lt, 0);
 }
 
+int
+otx2_flow_parse_higig2_hdr(struct otx2_parse_state *pst)
+{
+       struct rte_flow_item_higig2_hdr hw_mask;
+       struct otx2_flow_item_info info;
+       int lid, lt;
+       int rc;
+
+       /* Identify the pattern type into lid, lt */
+       if (pst->pattern->type != RTE_FLOW_ITEM_TYPE_HIGIG2)
+               return 0;
+
+       lid = NPC_LID_LA;
+       lt = NPC_LT_LA_HIGIG2_ETHER;
+       info.hw_hdr_len = 0;
+
+       if (pst->flow->nix_intf == NIX_INTF_TX) {
+               lt = NPC_LT_LA_IH_NIX_HIGIG2_ETHER;
+               info.hw_hdr_len = NPC_IH_LENGTH;
+       }
+
+       /* Prepare for parsing the item */
+       info.def_mask = &rte_flow_item_higig2_hdr_mask;
+       info.hw_mask = &hw_mask;
+       info.len = sizeof(struct rte_flow_item_higig2_hdr);
+       otx2_flow_get_hw_supp_mask(pst, &info, lid, lt);
+       info.spec = NULL;
+       info.mask = NULL;
+
+       /* Basic validation of item parameters */
+       rc = otx2_flow_parse_item_basic(pst->pattern, &info, pst->error);
+       if (rc)
+               return rc;
+
+       /* Update pst if not validate only? clash check? */
+       return otx2_flow_update_parse_state(pst, &info, lid, lt, 0);
+}
+
 static int
 parse_rss_action(struct rte_eth_dev *dev,
                 const struct rte_flow_attr *attr,