net/dpaa2: support MPLS distribution

add support for MPLS based distribution is supported.

Signed-off-by: Apeksha Gupta <apeksha.gupta@nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>

diff --git a/drivers/net/dpaa2/base/dpaa2_hw_dpni.c b/drivers/net/dpaa2/base/dpaa2_hw_dpni.c
index 87c893d..9d15653 100644 (file)
--- a/drivers/net/dpaa2/base/dpaa2_hw_dpni.c
+++ b/drivers/net/dpaa2/base/dpaa2_hw_dpni.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
  *   Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved.
- *   Copyright 2016-2019 NXP
+ *   Copyright 2016-2021 NXP
  *
  */
 
@@ -194,9 +194,11 @@ dpaa2_distset_to_dpkg_profile_cfg(
                uint64_t req_dist_set,
                struct dpkg_profile_cfg *kg_cfg)
 {
-       uint32_t loop = 0, i = 0, dist_field = 0;
+       uint32_t loop = 0, i = 0;
+       uint64_t dist_field = 0;
        int l2_configured = 0, l3_configured = 0;
        int l4_configured = 0, sctp_configured = 0;
+       int mpls_configured = 0;
 
        memset(kg_cfg, 0, sizeof(struct dpkg_profile_cfg));
        while (req_dist_set) {
@@ -220,6 +222,43 @@ dpaa2_distset_to_dpkg_profile_cfg(
                                i++;
                        break;
 
+                       case ETH_RSS_MPLS:
+
+                               if (mpls_configured)
+                                       break;
+                               mpls_configured = 1;
+
+                               kg_cfg->extracts[i].extract.from_hdr.prot =
+                                       NET_PROT_MPLS;
+                               kg_cfg->extracts[i].extract.from_hdr.field =
+                                       NH_FLD_MPLS_MPLSL_1;
+                               kg_cfg->extracts[i].type =
+                                       DPKG_EXTRACT_FROM_HDR;
+                               kg_cfg->extracts[i].extract.from_hdr.type =
+                                       DPKG_FULL_FIELD;
+                               i++;
+
+                               kg_cfg->extracts[i].extract.from_hdr.prot =
+                                       NET_PROT_MPLS;
+                               kg_cfg->extracts[i].extract.from_hdr.field =
+                                       NH_FLD_MPLS_MPLSL_2;
+                               kg_cfg->extracts[i].type =
+                                       DPKG_EXTRACT_FROM_HDR;
+                               kg_cfg->extracts[i].extract.from_hdr.type =
+                                       DPKG_FULL_FIELD;
+                               i++;
+
+                               kg_cfg->extracts[i].extract.from_hdr.prot =
+                                       NET_PROT_MPLS;
+                               kg_cfg->extracts[i].extract.from_hdr.field =
+                                       NH_FLD_MPLS_MPLSL_N;
+                               kg_cfg->extracts[i].type =
+                                       DPKG_EXTRACT_FROM_HDR;
+                               kg_cfg->extracts[i].extract.from_hdr.type =
+                                       DPKG_FULL_FIELD;
+                               i++;
+                               break;
+
                        case ETH_RSS_IPV4:
                        case ETH_RSS_FRAG_IPV4:
                        case ETH_RSS_NONFRAG_IPV4_OTHER:
@@ -326,7 +365,7 @@ dpaa2_distset_to_dpkg_profile_cfg(
 
                        default:
                                DPAA2_PMD_WARN(
-                                            "Unsupported flow dist option %x",
+                                     "unsupported flow dist option 0x%" PRIx64,
                                             dist_field);
                                return -EINVAL;
                        }

diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h
index cacb11b..bb49fa9 100644 (file)
--- a/drivers/net/dpaa2/dpaa2_ethdev.h
+++ b/drivers/net/dpaa2/dpaa2_ethdev.h
@@ -65,7 +65,8 @@
        ETH_RSS_IP | \
        ETH_RSS_UDP | \
        ETH_RSS_TCP | \
-       ETH_RSS_SCTP)
+       ETH_RSS_SCTP | \
+       ETH_RSS_MPLS)
 
 /* LX2 FRC Parsed values (Little Endian) */
 #define DPAA2_PKT_TYPE_ETHER           0x0060

diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c
index 003b379..d6c8b31 100644 (file)
--- a/drivers/net/dpaa2/dpaa2_rxtx.c
+++ b/drivers/net/dpaa2/dpaa2_rxtx.c
@@ -166,6 +166,10 @@ dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf,
                goto parse_done;
        }
 
+       if (BIT_ISSET_AT_POS(annotation->word3, L2_MPLS_1_PRESENT |
+                               L2_MPLS_N_PRESENT))
+               pkt_type |= RTE_PTYPE_L2_ETHER_MPLS;
+
        if (BIT_ISSET_AT_POS(annotation->word4, L3_IPV4_1_PRESENT |
                             L3_IPV4_N_PRESENT)) {
                pkt_type |= RTE_PTYPE_L3_IPV4;

diff --git a/drivers/net/dpaa2/mc/fsl_net.h b/drivers/net/dpaa2/mc/fsl_net.h
index 3eaad2f..2d26d5d 100644 (file)
--- a/drivers/net/dpaa2/mc/fsl_net.h
+++ b/drivers/net/dpaa2/mc/fsl_net.h
@@ -343,6 +343,11 @@
 /***************************  GTP fields  ************************************/
 #define NH_FLD_GTP_TEID                       (1)
 
+/***************************  MPLS fields  ************************************/
+#define NH_FLD_MPLS_MPLSL_1                    (1)
+#define NH_FLD_MPLS_MPLSL_2                    (NH_FLD_MPLS_MPLSL_1 << 1)
+#define NH_FLD_MPLS_MPLSL_N                    (NH_FLD_MPLS_MPLSL_1 << 2)
+
 /* Protocol options */
 
 /* Ethernet options */