X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fcnxk%2Fcnxk_ethdev_devargs.c;h=ad7babdf527a109e44a71ece00f53d97b2373200;hb=b922883be94bac9b5c72417349f2f5d25dade0bb;hp=c76b6281c7d7440fe97299a3fb786937299968de;hpb=00242a687de63329de81b363deb96d28c87e0bcc;p=dpdk.git diff --git a/drivers/net/cnxk/cnxk_ethdev_devargs.c b/drivers/net/cnxk/cnxk_ethdev_devargs.c index c76b6281c7..ad7babdf52 100644 --- a/drivers/net/cnxk/cnxk_ethdev_devargs.c +++ b/drivers/net/cnxk/cnxk_ethdev_devargs.c @@ -7,6 +7,67 @@ #include "cnxk_ethdev.h" +struct sdp_channel { + bool is_sdp_mask_set; + uint16_t channel; + uint16_t mask; +}; + +static int +parse_outb_nb_desc(const char *key, const char *value, void *extra_args) +{ + RTE_SET_USED(key); + uint32_t val; + + val = atoi(value); + + *(uint16_t *)extra_args = val; + + return 0; +} + +static int +parse_outb_nb_crypto_qs(const char *key, const char *value, void *extra_args) +{ + RTE_SET_USED(key); + uint32_t val; + + val = atoi(value); + + if (val < 1 || val > 64) + return -EINVAL; + + *(uint16_t *)extra_args = val; + + return 0; +} + +static int +parse_ipsec_in_max_spi(const char *key, const char *value, void *extra_args) +{ + RTE_SET_USED(key); + uint32_t val; + + val = atoi(value); + + *(uint16_t *)extra_args = val; + + return 0; +} + +static int +parse_ipsec_out_max_sa(const char *key, const char *value, void *extra_args) +{ + RTE_SET_USED(key); + uint32_t val; + + val = atoi(value); + + *(uint16_t *)extra_args = val; + + return 0; +} + static int parse_flow_max_priority(const char *key, const char *value, void *extra_args) { @@ -49,11 +110,11 @@ parse_reta_size(const char *key, const char *value, void *extra_args) val = atoi(value); - if (val <= ETH_RSS_RETA_SIZE_64) + if (val <= RTE_ETH_RSS_RETA_SIZE_64) val = ROC_NIX_RSS_RETA_SZ_64; - else if (val > ETH_RSS_RETA_SIZE_64 && val <= ETH_RSS_RETA_SIZE_128) + else if (val > RTE_ETH_RSS_RETA_SIZE_64 && val <= RTE_ETH_RSS_RETA_SIZE_128) val = ROC_NIX_RSS_RETA_SZ_128; - else if (val > ETH_RSS_RETA_SIZE_128 && val <= ETH_RSS_RETA_SIZE_256) + else if (val > RTE_ETH_RSS_RETA_SIZE_128 && val <= RTE_ETH_RSS_RETA_SIZE_256) val = ROC_NIX_RSS_RETA_SZ_256; else val = ROC_NIX_RSS_RETA_SZ_64; @@ -99,6 +160,34 @@ parse_switch_header_type(const char *key, const char *value, void *extra_args) if (strcmp(value, "chlen90b") == 0) *(uint16_t *)extra_args = ROC_PRIV_FLAGS_LEN_90B; + + if (strcmp(value, "exdsa") == 0) + *(uint16_t *)extra_args = ROC_PRIV_FLAGS_EXDSA; + + if (strcmp(value, "vlan_exdsa") == 0) + *(uint16_t *)extra_args = ROC_PRIV_FLAGS_VLAN_EXDSA; + + return 0; +} + +static int +parse_sdp_channel_mask(const char *key, const char *value, void *extra_args) +{ + RTE_SET_USED(key); + uint16_t chan = 0, mask = 0; + char *next = 0; + + /* next will point to the separator '/' */ + chan = strtol(value, &next, 16); + mask = strtol(++next, 0, 16); + + if (chan > GENMASK(11, 0) || mask > GENMASK(11, 0)) + return -EINVAL; + + ((struct sdp_channel *)extra_args)->channel = chan; + ((struct sdp_channel *)extra_args)->mask = mask; + ((struct sdp_channel *)extra_args)->is_sdp_mask_set = true; + return 0; } @@ -110,20 +199,34 @@ parse_switch_header_type(const char *key, const char *value, void *extra_args) #define CNXK_SWITCH_HEADER_TYPE "switch_header" #define CNXK_RSS_TAG_AS_XOR "tag_as_xor" #define CNXK_LOCK_RX_CTX "lock_rx_ctx" +#define CNXK_IPSEC_IN_MAX_SPI "ipsec_in_max_spi" +#define CNXK_IPSEC_OUT_MAX_SA "ipsec_out_max_sa" +#define CNXK_OUTB_NB_DESC "outb_nb_desc" +#define CNXK_FORCE_INB_INL_DEV "force_inb_inl_dev" +#define CNXK_OUTB_NB_CRYPTO_QS "outb_nb_crypto_qs" +#define CNXK_SDP_CHANNEL_MASK "sdp_channel_mask" int cnxk_ethdev_parse_devargs(struct rte_devargs *devargs, struct cnxk_eth_dev *dev) { uint16_t reta_sz = ROC_NIX_RSS_RETA_SZ_64; uint16_t sqb_count = CNXK_NIX_TX_MAX_SQB; - uint16_t flow_prealloc_size = 8; + uint16_t ipsec_in_max_spi = BIT(8) - 1; + uint16_t ipsec_out_max_sa = BIT(12); + uint16_t flow_prealloc_size = 1; uint16_t switch_header_type = 0; uint16_t flow_max_priority = 3; + uint16_t force_inb_inl_dev = 0; + uint16_t outb_nb_crypto_qs = 1; + uint16_t outb_nb_desc = 8200; + struct sdp_channel sdp_chan; uint16_t rss_tag_as_xor = 0; uint16_t scalar_enable = 0; uint8_t lock_rx_ctx = 0; struct rte_kvargs *kvlist; + memset(&sdp_chan, 0, sizeof(sdp_chan)); + if (devargs == NULL) goto null_devargs; @@ -146,10 +249,29 @@ cnxk_ethdev_parse_devargs(struct rte_devargs *devargs, struct cnxk_eth_dev *dev) rte_kvargs_process(kvlist, CNXK_RSS_TAG_AS_XOR, &parse_flag, &rss_tag_as_xor); rte_kvargs_process(kvlist, CNXK_LOCK_RX_CTX, &parse_flag, &lock_rx_ctx); + rte_kvargs_process(kvlist, CNXK_IPSEC_IN_MAX_SPI, + &parse_ipsec_in_max_spi, &ipsec_in_max_spi); + rte_kvargs_process(kvlist, CNXK_IPSEC_OUT_MAX_SA, + &parse_ipsec_out_max_sa, &ipsec_out_max_sa); + rte_kvargs_process(kvlist, CNXK_OUTB_NB_DESC, &parse_outb_nb_desc, + &outb_nb_desc); + rte_kvargs_process(kvlist, CNXK_OUTB_NB_CRYPTO_QS, + &parse_outb_nb_crypto_qs, &outb_nb_crypto_qs); + rte_kvargs_process(kvlist, CNXK_FORCE_INB_INL_DEV, &parse_flag, + &force_inb_inl_dev); + rte_kvargs_process(kvlist, CNXK_SDP_CHANNEL_MASK, + &parse_sdp_channel_mask, &sdp_chan); rte_kvargs_free(kvlist); null_devargs: dev->scalar_ena = !!scalar_enable; + dev->inb.force_inl_dev = !!force_inb_inl_dev; + dev->inb.max_spi = ipsec_in_max_spi; + dev->outb.max_sa = ipsec_out_max_sa; + dev->outb.nb_desc = outb_nb_desc; + dev->outb.nb_crypto_qs = outb_nb_crypto_qs; + dev->nix.ipsec_in_max_spi = ipsec_in_max_spi; + dev->nix.ipsec_out_max_sa = ipsec_out_max_sa; dev->nix.rss_tag_as_xor = !!rss_tag_as_xor; dev->nix.max_sqb_count = sqb_count; dev->nix.reta_sz = reta_sz; @@ -157,8 +279,10 @@ null_devargs: dev->npc.flow_prealloc_size = flow_prealloc_size; dev->npc.flow_max_priority = flow_max_priority; dev->npc.switch_header_type = switch_header_type; + dev->npc.sdp_channel = sdp_chan.channel; + dev->npc.sdp_channel_mask = sdp_chan.mask; + dev->npc.is_sdp_mask_set = sdp_chan.is_sdp_mask_set; return 0; - exit: return -EINVAL; } @@ -170,4 +294,9 @@ RTE_PMD_REGISTER_PARAM_STRING(net_cnxk, CNXK_FLOW_PREALLOC_SIZE "=<1-32>" CNXK_FLOW_MAX_PRIORITY "=<1-32>" CNXK_SWITCH_HEADER_TYPE "=" - CNXK_RSS_TAG_AS_XOR "=1"); + CNXK_RSS_TAG_AS_XOR "=1" + CNXK_IPSEC_IN_MAX_SPI "=<1-65535>" + CNXK_OUTB_NB_DESC "=<1-65535>" + CNXK_OUTB_NB_CRYPTO_QS "=<1-64>" + CNXK_FORCE_INB_INL_DEV "=1" + CNXK_SDP_CHANNEL_MASK "=<1-4095>/<1-4095>");