On Thu, Oct 17, 2019 at 5:50 PM <pbhagavat...@marvell.com> wrote:
>
> From: Pavan Nikhilesh <pbhagavat...@marvell.com>
>
> Add support to set supported ptypes for octeontx2.
>
> Signed-off-by: Pavan Nikhilesh <pbhagavat...@marvell.com>
> ---
> v2 Changes:
> ----------
> - Update documentation.
See below.
> - Use positive logic.
>
> drivers/net/octeontx2/otx2_ethdev.c | 1 +
> drivers/net/octeontx2/otx2_ethdev.h | 2 ++
> drivers/net/octeontx2/otx2_ethdev_devargs.c | 21 ---------------------
> drivers/net/octeontx2/otx2_lookup.c | 15 +++++++++++++++
It looks like forgot to update the documentation file.
4 files changed, 18 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/net/octeontx2/otx2_ethdev.c
> b/drivers/net/octeontx2/otx2_ethdev.c
> index 4a60f9f74..361a3d993 100644
> --- a/drivers/net/octeontx2/otx2_ethdev.c
> +++ b/drivers/net/octeontx2/otx2_ethdev.c
> @@ -1944,6 +1944,7 @@ static const struct eth_dev_ops otx2_eth_dev_ops = {
> .dev_set_link_up = otx2_nix_dev_set_link_up,
> .dev_set_link_down = otx2_nix_dev_set_link_down,
> .dev_supported_ptypes_get = otx2_nix_supported_ptypes_get,
> + .dev_supported_ptypes_set = otx2_nix_supported_ptypes_set,
> .dev_reset = otx2_nix_dev_reset,
> .stats_get = otx2_nix_dev_stats_get,
> .stats_reset = otx2_nix_dev_stats_reset,
> diff --git a/drivers/net/octeontx2/otx2_ethdev.h
> b/drivers/net/octeontx2/otx2_ethdev.h
> index 33fa0c60b..a5bf89090 100644
> --- a/drivers/net/octeontx2/otx2_ethdev.h
> +++ b/drivers/net/octeontx2/otx2_ethdev.h
> @@ -506,6 +506,8 @@ void *otx2_nix_fastpath_lookup_mem_get(void);
>
> /* PTYPES */
> const uint32_t *otx2_nix_supported_ptypes_get(struct rte_eth_dev *dev);
> +int otx2_nix_supported_ptypes_set(struct rte_eth_dev *eth_dev,
> + uint32_t ptype_mask);
>
> /* Mac address handling */
> int otx2_nix_mac_addr_set(struct rte_eth_dev *eth_dev,
> diff --git a/drivers/net/octeontx2/otx2_ethdev_devargs.c
> b/drivers/net/octeontx2/otx2_ethdev_devargs.c
> index 7dc6e92be..9ad00c6f4 100644
> --- a/drivers/net/octeontx2/otx2_ethdev_devargs.c
> +++ b/drivers/net/octeontx2/otx2_ethdev_devargs.c
> @@ -63,21 +63,6 @@ parse_reta_size(const char *key, const char *value, void
> *extra_args)
> return 0;
> }
>
> -static int
> -parse_ptype_flag(const char *key, const char *value, void *extra_args)
> -{
> - RTE_SET_USED(key);
> - uint32_t val;
> -
> - val = atoi(value);
> - if (val)
> - val = 0; /* Disable NIX_RX_OFFLOAD_PTYPE_F */
> -
> - *(uint16_t *)extra_args = val;
> -
> - return 0;
> -}
> -
> static int
> parse_flag(const char *key, const char *value, void *extra_args)
> {
> @@ -105,7 +90,6 @@ parse_sqb_count(const char *key, const char *value, void
> *extra_args)
> }
>
> #define OTX2_RSS_RETA_SIZE "reta_size"
> -#define OTX2_PTYPE_DISABLE "ptype_disable"
> #define OTX2_SCL_ENABLE "scalar_enable"
> #define OTX2_MAX_SQB_COUNT "max_sqb_count"
> #define OTX2_FLOW_PREALLOC_SIZE "flow_prealloc_size"
> @@ -114,7 +98,6 @@ parse_sqb_count(const char *key, const char *value, void
> *extra_args)
> int
> otx2_ethdev_parse_devargs(struct rte_devargs *devargs, struct otx2_eth_dev
> *dev)
> {
> - uint16_t offload_flag = NIX_RX_OFFLOAD_PTYPE_F;
> uint16_t rss_size = NIX_RSS_RETA_SIZE;
> uint16_t sqb_count = NIX_MAX_SQB;
> uint16_t flow_prealloc_size = 8;
> @@ -129,8 +112,6 @@ otx2_ethdev_parse_devargs(struct rte_devargs *devargs,
> struct otx2_eth_dev *dev)
> if (kvlist == NULL)
> goto exit;
>
> - rte_kvargs_process(kvlist, OTX2_PTYPE_DISABLE,
> - &parse_ptype_flag, &offload_flag);
> rte_kvargs_process(kvlist, OTX2_RSS_RETA_SIZE,
> &parse_reta_size, &rss_size);
> rte_kvargs_process(kvlist, OTX2_SCL_ENABLE,
> @@ -144,7 +125,6 @@ otx2_ethdev_parse_devargs(struct rte_devargs *devargs,
> struct otx2_eth_dev *dev)
> rte_kvargs_free(kvlist);
>
> null_devargs:
> - dev->rx_offload_flags = offload_flag;
> dev->scalar_ena = scalar_enable;
> dev->max_sqb_count = sqb_count;
> dev->rss_info.rss_size = rss_size;
> @@ -158,7 +138,6 @@ otx2_ethdev_parse_devargs(struct rte_devargs *devargs,
> struct otx2_eth_dev *dev)
>
> RTE_PMD_REGISTER_PARAM_STRING(net_octeontx2,
> OTX2_RSS_RETA_SIZE "=<64|128|256>"
> - OTX2_PTYPE_DISABLE "=1"
> OTX2_SCL_ENABLE "=1"
> OTX2_MAX_SQB_COUNT "=<8-512>"
> OTX2_FLOW_PREALLOC_SIZE "=<1-32>"
> diff --git a/drivers/net/octeontx2/otx2_lookup.c
> b/drivers/net/octeontx2/otx2_lookup.c
> index 3071278fc..8e15b59a0 100644
> --- a/drivers/net/octeontx2/otx2_lookup.c
> +++ b/drivers/net/octeontx2/otx2_lookup.c
> @@ -62,6 +62,21 @@ otx2_nix_supported_ptypes_get(struct rte_eth_dev *eth_dev)
> return NULL;
> }
>
> +int
> +otx2_nix_supported_ptypes_set(struct rte_eth_dev *eth_dev, uint32_t
> ptype_mask)
> +{
> + struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
> +
> + if (ptype_mask)
> + dev->rx_offload_flags |= NIX_RX_OFFLOAD_PTYPE_F;
> + else
> + dev->rx_offload_flags &= ~NIX_RX_OFFLOAD_PTYPE_F;
> +
> + otx2_eth_set_rx_function(eth_dev);
> +
> + return 0;
> +}
> +
> /*
> * +------------------ +------------------ +
> * | | IL4 | IL3| IL2 | TU | L4 | L3 | L2 |
> --
> 2.17.1
>
