net/sfc: fix jumbo frame flag condition for MTU set

[dpdk.git] / app / test-pmd / cmdline.c

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 2ccbaa0..89034c8 100644 (file)
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -845,7 +845,7 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "fdir_inset|fdir_flx_inset clear all"
                        "    Clear RSS|FDIR|FDIR_FLX input set completely for some pctype\n\n"
 
-                       "port config (port_id) udp_tunnel_port add|rm vxlan|geneve (udp_port)\n\n"
+                       "port config (port_id) udp_tunnel_port add|rm vxlan|geneve|ecpri (udp_port)\n\n"
                        "    Add/remove UDP tunnel port for tunneling offload\n\n"
 
                        "port config <port_id> rx_offload vlan_strip|"
@@ -1886,7 +1886,6 @@ cmd_config_max_pkt_len_parsed(void *parsed_result,
 
        RTE_ETH_FOREACH_DEV(pid) {
                struct rte_port *port = &ports[pid];
-               uint64_t rx_offloads = port->dev_conf.rxmode.offloads;
 
                if (!strcmp(res->name, "max-pkt-len")) {
                        if (res->value < RTE_ETHER_MIN_LEN) {
@@ -1898,11 +1897,6 @@ cmd_config_max_pkt_len_parsed(void *parsed_result,
                                return;
 
                        port->dev_conf.rxmode.max_rx_pkt_len = res->value;
-                       if (res->value > RTE_ETHER_MAX_LEN)
-                               rx_offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME;
-                       else
-                               rx_offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME;
-                       port->dev_conf.rxmode.offloads = rx_offloads;
                } else {
                        printf("Unknown parameter\n");
                        return;
@@ -9175,6 +9169,8 @@ cmd_cfg_tunnel_udp_port_parsed(void *parsed_result,
                tunnel_udp.prot_type = RTE_TUNNEL_TYPE_GENEVE;
        } else if (!strcmp(res->tunnel_type, "vxlan-gpe")) {
                tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN_GPE;
+       } else if (!strcmp(res->tunnel_type, "ecpri")) {
+               tunnel_udp.prot_type = RTE_TUNNEL_TYPE_ECPRI;
        } else {
                printf("Invalid tunnel type\n");
                return;
@@ -9209,7 +9205,7 @@ cmdline_parse_token_string_t cmd_config_tunnel_udp_port_action =
                                 "add#rm");
 cmdline_parse_token_string_t cmd_config_tunnel_udp_port_tunnel_type =
        TOKEN_STRING_INITIALIZER(struct cmd_config_tunnel_udp_port, tunnel_type,
-                                "vxlan#geneve#vxlan-gpe");
+                                "vxlan#geneve#vxlan-gpe#ecpri");
 cmdline_parse_token_num_t cmd_config_tunnel_udp_port_value =
        TOKEN_NUM_INITIALIZER(struct cmd_config_tunnel_udp_port, udp_port,
                              RTE_UINT16);
@@ -9217,7 +9213,8 @@ cmdline_parse_token_num_t cmd_config_tunnel_udp_port_value =
 cmdline_parse_inst_t cmd_cfg_tunnel_udp_port = {
        .f = cmd_cfg_tunnel_udp_port_parsed,
        .data = NULL,
-       .help_str = "port config <port_id> udp_tunnel_port add|rm vxlan|geneve|vxlan-gpe <udp_port>",
+       .help_str = "port config <port_id> udp_tunnel_port add|rm vxlan|"
+               "geneve|vxlan-gpe|ecpri <udp_port>",
        .tokens = {
                (void *)&cmd_config_tunnel_udp_port_port,
                (void *)&cmd_config_tunnel_udp_port_config,
@@ -16263,11 +16260,9 @@ cmd_show_fec_capability_parsed(void *parsed_result,
                __rte_unused struct cmdline *cl,
                __rte_unused void *data)
 {
-#define FEC_CAP_NUM 2
        struct cmd_show_fec_capability_result *res = parsed_result;
-       struct rte_eth_fec_capa speed_fec_capa[FEC_CAP_NUM];
-       unsigned int num = FEC_CAP_NUM;
-       unsigned int ret_num;
+       struct rte_eth_fec_capa *speed_fec_capa;
+       unsigned int num;
        int ret;
 
        if (!rte_eth_dev_is_valid_port(res->cmd_pid)) {
@@ -16275,17 +16270,31 @@ cmd_show_fec_capability_parsed(void *parsed_result,
                return;
        }
 
-       ret = rte_eth_fec_get_capability(res->cmd_pid, speed_fec_capa, num);
+       ret = rte_eth_fec_get_capability(res->cmd_pid, NULL, 0);
        if (ret == -ENOTSUP) {
                printf("Function not implemented\n");
                return;
        } else if (ret < 0) {
-               printf("Get FEC capability failed\n");
+               printf("Get FEC capability failed: %d\n", ret);
+               return;
+       }
+
+       num = (unsigned int)ret;
+       speed_fec_capa = calloc(num, sizeof(*speed_fec_capa));
+       if (speed_fec_capa == NULL) {
+               printf("Failed to alloc FEC capability buffer\n");
                return;
        }
 
-       ret_num = (unsigned int)ret;
-       show_fec_capability(ret_num, speed_fec_capa);
+       ret = rte_eth_fec_get_capability(res->cmd_pid, speed_fec_capa, num);
+       if (ret < 0) {
+               printf("Error getting FEC capability: %d\n", ret);
+               goto out;
+       }
+
+       show_fec_capability(num, speed_fec_capa);
+out:
+       free(speed_fec_capa);
 }
 
 cmdline_parse_token_string_t cmd_show_fec_capability_show =