net/mvpp2: support custom header in config file

Extend 'start_hdr' options with custom header.

Signed-off-by: Dana Vardi <danat@marvell.com>
Reviewed-by: Liron Himi <lironh@marvell.com>

diff --git a/doc/guides/nics/mvpp2.rst b/doc/guides/nics/mvpp2.rst
index f72e251..354a201 100644 (file)
--- a/doc/guides/nics/mvpp2.rst
+++ b/doc/guides/nics/mvpp2.rst
@@ -261,7 +261,7 @@ Where:
 
 - ``<portnum>``: DPDK Port number (0..n).
 
-- ``<start_hdr>``: Indicate what is the start header mode (`none` (eth), `dsa`, or `ext_dsa`).
+- ``<start_hdr>``: Indicate what is the start header mode (`none` (eth), `dsa`, `ext_dsa` or `custom`).
 
 - ``<default_tc>``: Default traffic class (e.g. 0)
 

diff --git a/drivers/net/mvpp2/mrvl_qos.c b/drivers/net/mvpp2/mrvl_qos.c
index e420c0c..9fec3c1 100644 (file)
--- a/drivers/net/mvpp2/mrvl_qos.c
+++ b/drivers/net/mvpp2/mrvl_qos.c
@@ -23,6 +23,7 @@
 #define MRVL_TOK_START_HDR "start_hdr"
 #define MRVL_TOK_START_HDR_NONE "none"
 #define MRVL_TOK_START_HDR_DSA "dsa"
+#define MRVL_TOK_START_HDR_CUSTOM "custom"
 #define MRVL_TOK_START_HDR_EXT_DSA "ext_dsa"
 #define MRVL_TOK_DEFAULT_TC "default_tc"
 #define MRVL_TOK_DSCP "dscp"
@@ -742,6 +743,10 @@ mrvl_get_cfg(const char *key __rte_unused, const char *path, void *extra_args)
                                sizeof(MRVL_TOK_START_HDR_DSA)))
                                (*cfg)->port[n].eth_start_hdr =
                                PP2_PPIO_HDR_ETH_DSA;
+                       else if (!strncmp(entry, MRVL_TOK_START_HDR_CUSTOM,
+                               sizeof(MRVL_TOK_START_HDR_CUSTOM)))
+                               (*cfg)->port[n].eth_start_hdr =
+                               PP2_PPIO_HDR_ETH_CUSTOM;
                        else if (!strncmp(entry, MRVL_TOK_START_HDR_EXT_DSA,
                                sizeof(MRVL_TOK_START_HDR_EXT_DSA))) {
                                (*cfg)->port[n].eth_start_hdr =