app/testpmd: convert to new Tx offloads API
[dpdk.git] / app / test-pmd / cmdline.c
index 8dc5c85..f5835c1 100644 (file)
@@ -99,6 +99,8 @@
 #include <rte_pmd_bnxt.h>
 #endif
 #include "testpmd.h"
+#include "cmdline_mtr.h"
+#include "cmdline_tm.h"
 
 static struct cmdline *testpmd_cl;
 
@@ -234,6 +236,23 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "show port (port_id) pctype mapping\n"
                        "    Get flow ptype to pctype mapping on a port\n\n"
 
+                       "show port meter stats (port_id) (meter_id) (clear)\n"
+                       "    Get meter stats on a port\n\n"
+                        "show port tm cap (port_id)\n"
+                        "       Display the port TM capability.\n\n"
+
+                        "show port tm level cap (port_id) (level_id)\n"
+                        "       Display the port TM hierarchical level capability.\n\n"
+
+                        "show port tm node cap (port_id) (node_id)\n"
+                        "       Display the port TM node capability.\n\n"
+
+                        "show port tm node type (port_id) (node_id)\n"
+                        "       Display the port TM node type.\n\n"
+
+                        "show port tm node stats (port_id) (node_id) (clear)\n"
+                        "       Display the port TM node stats.\n\n"
+
                );
        }
 
@@ -507,6 +526,10 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "    e.g., 'set stat_qmap rx 0 2 5' sets rx queue 2"
                        " on port 0 to mapping 5.\n\n"
 
+                       "set xstats-hide-zero on|off\n"
+                       "    Set the option to hide the zero values"
+                       " for xstats display.\n"
+
                        "set port (port_id) vf (vf_id) rx|tx on|off\n"
                        "    Enable/Disable a VF receive/tranmit from a port\n\n"
 
@@ -637,6 +660,11 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "E-tag set filter del e-tag-id (value) port (port_id)\n"
                        "    Delete an E-tag forwarding filter on a port\n\n"
 
+#if defined RTE_LIBRTE_PMD_SOFTNIC && defined RTE_LIBRTE_SCHED
+                       "set port tm hierarchy default (port_id)\n"
+                       "       Set default traffic Management hierarchy on a port\n\n"
+
+#endif
                        "ddp add (port_id) (profile_path[,output_path])\n"
                        "    Load a profile package on a port\n\n"
 
@@ -655,6 +683,117 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "ptype mapping update (port_id) (hw_ptype) (sw_ptype)\n"
                        "    Update a ptype mapping item on a port\n\n"
 
+                       "set port (port_id) queue-region region_id (value) "
+                       "queue_start_index (value) queue_num (value)\n"
+                       "    Set a queue region on a port\n\n"
+
+                       "set port (port_id) queue-region region_id (value) "
+                       "flowtype (value)\n"
+                       "    Set a flowtype region index on a port\n\n"
+
+                       "set port (port_id) queue-region UP (value) region_id (value)\n"
+                       "    Set the mapping of User Priority to "
+                       "queue region on a port\n\n"
+
+                       "set port (port_id) queue-region flush (on|off)\n"
+                       "    flush all queue region related configuration\n\n"
+
+                       "show port meter cap (port_id)\n"
+                       "    Show port meter capability information\n\n"
+
+                       "add port meter profile srtcm_rfc2697 (port_id) (profile_id) (cir) (cbs) (ebs)\n"
+                       "    meter profile add - srtcm rfc 2697\n\n"
+
+                       "add port meter profile trtcm_rfc2698 (port_id) (profile_id) (cir) (pir) (cbs) (pbs)\n"
+                       "    meter profile add - trtcm rfc 2698\n\n"
+
+                       "add port meter profile trtcm_rfc4115 (port_id) (profile_id) (cir) (eir) (cbs) (ebs)\n"
+                       "    meter profile add - trtcm rfc 4115\n\n"
+
+                       "del port meter profile (port_id) (profile_id)\n"
+                       "    meter profile delete\n\n"
+
+                       "create port meter (port_id) (mtr_id) (profile_id) (meter_enable)\n"
+                       "(g_action) (y_action) (r_action) (stats_mask) (shared)\n"
+                       "(use_pre_meter_color) [(dscp_tbl_entry0) (dscp_tbl_entry1)...\n"
+                       "(dscp_tbl_entry63)]\n"
+                       "    meter create\n\n"
+
+                       "enable port meter (port_id) (mtr_id)\n"
+                       "    meter enable\n\n"
+
+                       "disable port meter (port_id) (mtr_id)\n"
+                       "    meter disable\n\n"
+
+                       "del port meter (port_id) (mtr_id)\n"
+                       "    meter delete\n\n"
+
+                       "set port meter profile (port_id) (mtr_id) (profile_id)\n"
+                       "    meter update meter profile\n\n"
+
+                       "set port meter dscp table (port_id) (mtr_id) [(dscp_tbl_entry0)\n"
+                       "(dscp_tbl_entry1)...(dscp_tbl_entry63)]\n"
+                       "    update meter dscp table entries\n\n"
+
+                       "set port meter policer action (port_id) (mtr_id) (action_mask)\n"
+                       "(action0) [(action1) (action2)]\n"
+                       "    meter update policer action\n\n"
+
+                       "set port meter stats mask (port_id) (mtr_id) (stats_mask)\n"
+                       "    meter update stats\n\n"
+
+                       "show port (port_id) queue-region\n"
+                       "    show all queue region related configuration info\n\n"
+
+                       "add port tm node shaper profile (port_id) (shaper_profile_id)"
+                       " (tb_rate) (tb_size) (packet_length_adjust)\n"
+                       "       Add port tm node private shaper profile.\n\n"
+
+                       "del port tm node shaper profile (port_id) (shaper_profile_id)\n"
+                       "       Delete port tm node private shaper profile.\n\n"
+
+                       "add port tm node shared shaper (port_id) (shared_shaper_id)"
+                       " (shaper_profile_id)\n"
+                       "       Add/update port tm node shared shaper.\n\n"
+
+                       "del port tm node shared shaper (port_id) (shared_shaper_id)\n"
+                       "       Delete port tm node shared shaper.\n\n"
+
+                       "set port tm node shaper profile (port_id) (node_id)"
+                       " (shaper_profile_id)\n"
+                       "       Set port tm node shaper profile.\n\n"
+
+                       "add port tm node wred profile (port_id) (wred_profile_id)"
+                       " (color_g) (min_th_g) (max_th_g) (maxp_inv_g) (wq_log2_g)"
+                       " (color_y) (min_th_y) (max_th_y) (maxp_inv_y) (wq_log2_y)"
+                       " (color_r) (min_th_r) (max_th_r) (maxp_inv_r) (wq_log2_r)\n"
+                       "       Add port tm node wred profile.\n\n"
+
+                       "del port tm node wred profile (port_id) (wred_profile_id)\n"
+                       "       Delete port tm node wred profile.\n\n"
+
+                       "add port tm nonleaf node (port_id) (node_id) (parent_node_id)"
+                       " (priority) (weight) (level_id) (shaper_profile_id)"
+                       " (n_sp_priorities) (stats_mask) (n_shared_shapers)"
+                       " [(shared_shaper_id_0) (shared_shaper_id_1)...]\n"
+                       "       Add port tm nonleaf node.\n\n"
+
+                       "add port tm leaf node (port_id) (node_id) (parent_node_id)"
+                       " (priority) (weight) (level_id) (shaper_profile_id)"
+                       " (cman_mode) (wred_profile_id) (stats_mask) (n_shared_shapers)"
+                       " [(shared_shaper_id_0) (shared_shaper_id_1)...]\n"
+                       "       Add port tm leaf node.\n\n"
+
+                       "del port tm node (port_id) (node_id)\n"
+                       "       Delete port tm node.\n\n"
+
+                       "set port tm node parent (port_id) (node_id) (parent_node_id)"
+                       " (priority) (weight)\n"
+                       "       Set port tm node parent.\n\n"
+
+                       "port tm hierarchy commit (port_id) (clean_on_fail)\n"
+                       "       Commit tm hierarchy.\n\n"
+
                        , list_pkt_forwarding_modes()
                );
        }
@@ -693,7 +832,7 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "port config all max-pkt-len (value)\n"
                        "    Set the max packet length.\n\n"
 
-                       "port config all (crc-strip|scatter|rx-cksum|hw-vlan|hw-vlan-filter|"
+                       "port config all (crc-strip|scatter|rx-cksum|rx-timestamp|hw-vlan|hw-vlan-filter|"
                        "hw-vlan-strip|hw-vlan-extend|drop-en)"
                        " (on|off)\n"
                        "    Set crc-strip/scatter/rx-checksum/hardware-vlan/drop_en"
@@ -1118,7 +1257,7 @@ cmdline_parse_inst_t cmd_operate_attach_port = {
 struct cmd_operate_detach_port_result {
        cmdline_fixed_string_t port;
        cmdline_fixed_string_t keyword;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void cmd_operate_detach_port_parsed(void *parsed_result,
@@ -1141,7 +1280,7 @@ cmdline_parse_token_string_t cmd_operate_detach_port_keyword =
                        keyword, "detach");
 cmdline_parse_token_num_t cmd_operate_detach_port_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_operate_detach_port_result,
-                       port_id, UINT8);
+                       port_id, UINT16);
 
 cmdline_parse_inst_t cmd_operate_detach_port = {
        .f = cmd_operate_detach_port_parsed,
@@ -1455,6 +1594,7 @@ cmd_config_max_pkt_len_parsed(void *parsed_result,
                                __attribute__((unused)) void *data)
 {
        struct cmd_config_max_pkt_len_result *res = parsed_result;
+       uint64_t rx_offloads = rx_mode.offloads;
 
        if (!all_ports_stopped()) {
                printf("Please stop all ports first\n");
@@ -1472,14 +1612,16 @@ cmd_config_max_pkt_len_parsed(void *parsed_result,
 
                rx_mode.max_rx_pkt_len = res->value;
                if (res->value > ETHER_MAX_LEN)
-                       rx_mode.jumbo_frame = 1;
+                       rx_offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME;
                else
-                       rx_mode.jumbo_frame = 0;
+                       rx_offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME;
        } else {
                printf("Unknown parameter\n");
                return;
        }
 
+       rx_mode.offloads = rx_offloads;
+
        init_port_config();
 
        cmd_reconfig_device_queue(RTE_PORT_ALL, 1, 1);
@@ -1520,7 +1662,7 @@ struct cmd_config_mtu_result {
        cmdline_fixed_string_t port;
        cmdline_fixed_string_t keyword;
        cmdline_fixed_string_t mtu;
-       uint8_t port_id;
+       portid_t port_id;
        uint16_t value;
 };
 
@@ -1548,7 +1690,7 @@ cmdline_parse_token_string_t cmd_config_mtu_mtu =
        TOKEN_STRING_INITIALIZER(struct cmd_config_mtu_result, keyword,
                                 "mtu");
 cmdline_parse_token_num_t cmd_config_mtu_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, port_id, UINT16);
 cmdline_parse_token_num_t cmd_config_mtu_value =
        TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, value, UINT16);
 
@@ -1581,6 +1723,7 @@ cmd_config_rx_mode_flag_parsed(void *parsed_result,
                                __attribute__((unused)) void *data)
 {
        struct cmd_config_rx_mode_flag *res = parsed_result;
+       uint64_t rx_offloads = rx_mode.offloads;
 
        if (!all_ports_stopped()) {
                printf("Please stop all ports first\n");
@@ -1589,39 +1732,48 @@ cmd_config_rx_mode_flag_parsed(void *parsed_result,
 
        if (!strcmp(res->name, "crc-strip")) {
                if (!strcmp(res->value, "on"))
-                       rx_mode.hw_strip_crc = 1;
+                       rx_offloads |= DEV_RX_OFFLOAD_CRC_STRIP;
                else if (!strcmp(res->value, "off"))
-                       rx_mode.hw_strip_crc = 0;
+                       rx_offloads &= ~DEV_RX_OFFLOAD_CRC_STRIP;
                else {
                        printf("Unknown parameter\n");
                        return;
                }
        } else if (!strcmp(res->name, "scatter")) {
+               if (!strcmp(res->value, "on")) {
+                       rx_offloads |= DEV_RX_OFFLOAD_SCATTER;
+               } else if (!strcmp(res->value, "off")) {
+                       rx_offloads &= ~DEV_RX_OFFLOAD_SCATTER;
+               } else {
+                       printf("Unknown parameter\n");
+                       return;
+               }
+       } else if (!strcmp(res->name, "rx-cksum")) {
                if (!strcmp(res->value, "on"))
-                       rx_mode.enable_scatter = 1;
+                       rx_offloads |= DEV_RX_OFFLOAD_CHECKSUM;
                else if (!strcmp(res->value, "off"))
-                       rx_mode.enable_scatter = 0;
+                       rx_offloads &= ~DEV_RX_OFFLOAD_CHECKSUM;
                else {
                        printf("Unknown parameter\n");
                        return;
                }
-       } else if (!strcmp(res->name, "rx-cksum")) {
+       } else if (!strcmp(res->name, "rx-timestamp")) {
                if (!strcmp(res->value, "on"))
-                       rx_mode.hw_ip_checksum = 1;
+                       rx_offloads |= DEV_RX_OFFLOAD_TIMESTAMP;
                else if (!strcmp(res->value, "off"))
-                       rx_mode.hw_ip_checksum = 0;
+                       rx_offloads &= ~DEV_RX_OFFLOAD_TIMESTAMP;
                else {
                        printf("Unknown parameter\n");
                        return;
                }
        } else if (!strcmp(res->name, "hw-vlan")) {
                if (!strcmp(res->value, "on")) {
-                       rx_mode.hw_vlan_filter = 1;
-                       rx_mode.hw_vlan_strip  = 1;
+                       rx_offloads |= (DEV_RX_OFFLOAD_VLAN_FILTER |
+                                       DEV_RX_OFFLOAD_VLAN_STRIP);
                }
                else if (!strcmp(res->value, "off")) {
-                       rx_mode.hw_vlan_filter = 0;
-                       rx_mode.hw_vlan_strip  = 0;
+                       rx_offloads &= ~(DEV_RX_OFFLOAD_VLAN_FILTER |
+                                       DEV_RX_OFFLOAD_VLAN_STRIP);
                }
                else {
                        printf("Unknown parameter\n");
@@ -1629,27 +1781,27 @@ cmd_config_rx_mode_flag_parsed(void *parsed_result,
                }
        } else if (!strcmp(res->name, "hw-vlan-filter")) {
                if (!strcmp(res->value, "on"))
-                       rx_mode.hw_vlan_filter = 1;
+                       rx_offloads |= DEV_RX_OFFLOAD_VLAN_FILTER;
                else if (!strcmp(res->value, "off"))
-                       rx_mode.hw_vlan_filter = 0;
+                       rx_offloads &= ~DEV_RX_OFFLOAD_VLAN_FILTER;
                else {
                        printf("Unknown parameter\n");
                        return;
                }
        } else if (!strcmp(res->name, "hw-vlan-strip")) {
                if (!strcmp(res->value, "on"))
-                       rx_mode.hw_vlan_strip  = 1;
+                       rx_offloads |= DEV_RX_OFFLOAD_VLAN_STRIP;
                else if (!strcmp(res->value, "off"))
-                       rx_mode.hw_vlan_strip  = 0;
+                       rx_offloads &= ~DEV_RX_OFFLOAD_VLAN_STRIP;
                else {
                        printf("Unknown parameter\n");
                        return;
                }
        } else if (!strcmp(res->name, "hw-vlan-extend")) {
                if (!strcmp(res->value, "on"))
-                       rx_mode.hw_vlan_extend = 1;
+                       rx_offloads |= DEV_RX_OFFLOAD_VLAN_EXTEND;
                else if (!strcmp(res->value, "off"))
-                       rx_mode.hw_vlan_extend = 0;
+                       rx_offloads &= ~DEV_RX_OFFLOAD_VLAN_EXTEND;
                else {
                        printf("Unknown parameter\n");
                        return;
@@ -1667,6 +1819,7 @@ cmd_config_rx_mode_flag_parsed(void *parsed_result,
                printf("Unknown parameter\n");
                return;
        }
+       rx_mode.offloads = rx_offloads;
 
        init_port_config();
 
@@ -1682,7 +1835,7 @@ cmdline_parse_token_string_t cmd_config_rx_mode_flag_all =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rx_mode_flag, all, "all");
 cmdline_parse_token_string_t cmd_config_rx_mode_flag_name =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rx_mode_flag, name,
-                                       "crc-strip#scatter#rx-cksum#hw-vlan#"
+                                       "crc-strip#scatter#rx-cksum#rx-timestamp#hw-vlan#"
                                        "hw-vlan-filter#hw-vlan-strip#hw-vlan-extend");
 cmdline_parse_token_string_t cmd_config_rx_mode_flag_value =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rx_mode_flag, value,
@@ -1691,7 +1844,7 @@ cmdline_parse_token_string_t cmd_config_rx_mode_flag_value =
 cmdline_parse_inst_t cmd_config_rx_mode_flag = {
        .f = cmd_config_rx_mode_flag_parsed,
        .data = NULL,
-       .help_str = "port config all crc-strip|scatter|rx-cksum|hw-vlan|"
+       .help_str = "port config all crc-strip|scatter|rx-cksum|rx-timestamp|hw-vlan|"
                "hw-vlan-filter|hw-vlan-strip|hw-vlan-extend on|off",
        .tokens = {
                (void *)&cmd_config_rx_mode_flag_port,
@@ -1718,7 +1871,7 @@ cmd_config_rss_parsed(void *parsed_result,
                        __attribute__((unused)) void *data)
 {
        struct cmd_config_rss *res = parsed_result;
-       struct rte_eth_rss_conf rss_conf;
+       struct rte_eth_rss_conf rss_conf = { .rss_key_len = 0, };
        int diag;
        uint8_t i;
 
@@ -1793,7 +1946,7 @@ cmdline_parse_inst_t cmd_config_rss = {
 struct cmd_config_rss_hash_key {
        cmdline_fixed_string_t port;
        cmdline_fixed_string_t config;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t rss_hash_key;
        cmdline_fixed_string_t rss_type;
        cmdline_fixed_string_t key;
@@ -1875,7 +2028,7 @@ cmdline_parse_token_string_t cmd_config_rss_hash_key_config =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key, config,
                                 "config");
 cmdline_parse_token_num_t cmd_config_rss_hash_key_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_config_rss_hash_key, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_rss_hash_key, port_id, UINT16);
 cmdline_parse_token_string_t cmd_config_rss_hash_key_rss_hash_key =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key,
                                 rss_hash_key, "rss-hash-key");
@@ -1910,7 +2063,7 @@ cmdline_parse_inst_t cmd_config_rss_hash_key = {
 /* *** configure port rxq/txq start/stop *** */
 struct cmd_config_rxtx_queue {
        cmdline_fixed_string_t port;
-       uint8_t portid;
+       portid_t portid;
        cmdline_fixed_string_t rxtxq;
        uint16_t qid;
        cmdline_fixed_string_t opname;
@@ -1978,7 +2131,7 @@ cmd_config_rxtx_queue_parsed(void *parsed_result,
 cmdline_parse_token_string_t cmd_config_rxtx_queue_port =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_queue, port, "port");
 cmdline_parse_token_num_t cmd_config_rxtx_queue_portid =
-       TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, portid, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, portid, UINT16);
 cmdline_parse_token_string_t cmd_config_rxtx_queue_rxtxq =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_queue, rxtxq, "rxq#txq");
 cmdline_parse_token_num_t cmd_config_rxtx_queue_qid =
@@ -2005,7 +2158,7 @@ cmdline_parse_inst_t cmd_config_rxtx_queue = {
 struct cmd_config_rss_reta {
        cmdline_fixed_string_t port;
        cmdline_fixed_string_t keyword;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t name;
        cmdline_fixed_string_t list_name;
        cmdline_fixed_string_t list_of_items;
@@ -2114,7 +2267,7 @@ cmdline_parse_token_string_t cmd_config_rss_reta_port =
 cmdline_parse_token_string_t cmd_config_rss_reta_keyword =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rss_reta, keyword, "config");
 cmdline_parse_token_num_t cmd_config_rss_reta_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_config_rss_reta, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_rss_reta, port_id, UINT16);
 cmdline_parse_token_string_t cmd_config_rss_reta_name =
        TOKEN_STRING_INITIALIZER(struct cmd_config_rss_reta, name, "rss");
 cmdline_parse_token_string_t cmd_config_rss_reta_list_name =
@@ -2141,7 +2294,7 @@ cmdline_parse_inst_t cmd_config_rss_reta = {
 struct cmd_showport_reta {
        cmdline_fixed_string_t show;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t rss;
        cmdline_fixed_string_t reta;
        uint16_t size;
@@ -2222,7 +2375,7 @@ cmdline_parse_token_string_t cmd_showport_reta_show =
 cmdline_parse_token_string_t cmd_showport_reta_port =
        TOKEN_STRING_INITIALIZER(struct  cmd_showport_reta, port, "port");
 cmdline_parse_token_num_t cmd_showport_reta_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, port_id, UINT16);
 cmdline_parse_token_string_t cmd_showport_reta_rss =
        TOKEN_STRING_INITIALIZER(struct cmd_showport_reta, rss, "rss");
 cmdline_parse_token_string_t cmd_showport_reta_reta =
@@ -2253,7 +2406,7 @@ cmdline_parse_inst_t cmd_showport_reta = {
 struct cmd_showport_rss_hash {
        cmdline_fixed_string_t show;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t rss_hash;
        cmdline_fixed_string_t rss_type;
        cmdline_fixed_string_t key; /* optional argument */
@@ -2274,7 +2427,7 @@ cmdline_parse_token_string_t cmd_showport_rss_hash_show =
 cmdline_parse_token_string_t cmd_showport_rss_hash_port =
        TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, port, "port");
 cmdline_parse_token_num_t cmd_showport_rss_hash_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_showport_rss_hash, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_showport_rss_hash, port_id, UINT16);
 cmdline_parse_token_string_t cmd_showport_rss_hash_rss_hash =
        TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, rss_hash,
                                 "rss-hash");
@@ -2326,7 +2479,7 @@ cmdline_parse_inst_t cmd_showport_rss_hash_key = {
 struct cmd_config_dcb {
        cmdline_fixed_string_t port;
        cmdline_fixed_string_t config;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t dcb;
        cmdline_fixed_string_t vt;
        cmdline_fixed_string_t vt_en;
@@ -2392,7 +2545,7 @@ cmdline_parse_token_string_t cmd_config_dcb_port =
 cmdline_parse_token_string_t cmd_config_dcb_config =
         TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, config, "config");
 cmdline_parse_token_num_t cmd_config_dcb_port_id =
-        TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, port_id, UINT16);
 cmdline_parse_token_string_t cmd_config_dcb_dcb =
         TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, dcb, "dcb");
 cmdline_parse_token_string_t cmd_config_dcb_vt =
@@ -3029,7 +3182,7 @@ struct cmd_rx_vlan_filter_all_result {
        cmdline_fixed_string_t rx_vlan;
        cmdline_fixed_string_t what;
        cmdline_fixed_string_t all;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
@@ -3056,7 +3209,7 @@ cmdline_parse_token_string_t cmd_rx_vlan_filter_all_all =
                                 all, "all");
 cmdline_parse_token_num_t cmd_rx_vlan_filter_all_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_rx_vlan_filter_all_result,
-                             port_id, UINT8);
+                             port_id, UINT16);
 
 cmdline_parse_inst_t cmd_rx_vlan_filter_all = {
        .f = cmd_rx_vlan_filter_all_parsed,
@@ -3182,7 +3335,7 @@ struct cmd_vlan_tpid_result {
        cmdline_fixed_string_t vlan_type;
        cmdline_fixed_string_t what;
        uint16_t tp_id;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
@@ -3221,7 +3374,7 @@ cmdline_parse_token_num_t cmd_vlan_tpid_tpid =
                              tp_id, UINT16);
 cmdline_parse_token_num_t cmd_vlan_tpid_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_vlan_tpid_result,
-                             port_id, UINT8);
+                             port_id, UINT16);
 
 cmdline_parse_inst_t cmd_vlan_tpid = {
        .f = cmd_vlan_tpid_parsed,
@@ -3244,7 +3397,7 @@ struct cmd_rx_vlan_filter_result {
        cmdline_fixed_string_t rx_vlan;
        cmdline_fixed_string_t what;
        uint16_t vlan_id;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
@@ -3271,7 +3424,7 @@ cmdline_parse_token_num_t cmd_rx_vlan_filter_vlanid =
                              vlan_id, UINT16);
 cmdline_parse_token_num_t cmd_rx_vlan_filter_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_rx_vlan_filter_result,
-                             port_id, UINT8);
+                             port_id, UINT16);
 
 cmdline_parse_inst_t cmd_rx_vlan_filter = {
        .f = cmd_rx_vlan_filter_parsed,
@@ -3292,7 +3445,7 @@ cmdline_parse_inst_t cmd_rx_vlan_filter = {
 struct cmd_tx_vlan_set_result {
        cmdline_fixed_string_t tx_vlan;
        cmdline_fixed_string_t set;
-       uint8_t port_id;
+       portid_t port_id;
        uint16_t vlan_id;
 };
 
@@ -3303,7 +3456,14 @@ cmd_tx_vlan_set_parsed(void *parsed_result,
 {
        struct cmd_tx_vlan_set_result *res = parsed_result;
 
+       if (!port_is_stopped(res->port_id)) {
+               printf("Please stop port %d first\n", res->port_id);
+               return;
+       }
+
        tx_vlan_set(res->port_id, res->vlan_id);
+
+       cmd_reconfig_device_queue(res->port_id, 1, 1);
 }
 
 cmdline_parse_token_string_t cmd_tx_vlan_set_tx_vlan =
@@ -3314,7 +3474,7 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_set =
                                 set, "set");
 cmdline_parse_token_num_t cmd_tx_vlan_set_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_result,
-                             port_id, UINT8);
+                             port_id, UINT16);
 cmdline_parse_token_num_t cmd_tx_vlan_set_vlanid =
        TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_result,
                              vlan_id, UINT16);
@@ -3338,7 +3498,7 @@ cmdline_parse_inst_t cmd_tx_vlan_set = {
 struct cmd_tx_vlan_set_qinq_result {
        cmdline_fixed_string_t tx_vlan;
        cmdline_fixed_string_t set;
-       uint8_t port_id;
+       portid_t port_id;
        uint16_t vlan_id;
        uint16_t vlan_id_outer;
 };
@@ -3350,7 +3510,14 @@ cmd_tx_vlan_set_qinq_parsed(void *parsed_result,
 {
        struct cmd_tx_vlan_set_qinq_result *res = parsed_result;
 
+       if (!port_is_stopped(res->port_id)) {
+               printf("Please stop port %d first\n", res->port_id);
+               return;
+       }
+
        tx_qinq_set(res->port_id, res->vlan_id, res->vlan_id_outer);
+
+       cmd_reconfig_device_queue(res->port_id, 1, 1);
 }
 
 cmdline_parse_token_string_t cmd_tx_vlan_set_qinq_tx_vlan =
@@ -3361,7 +3528,7 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_qinq_set =
                set, "set");
 cmdline_parse_token_num_t cmd_tx_vlan_set_qinq_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_qinq_result,
-               port_id, UINT8);
+               port_id, UINT16);
 cmdline_parse_token_num_t cmd_tx_vlan_set_qinq_vlanid =
        TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_qinq_result,
                vlan_id, UINT16);
@@ -3390,7 +3557,7 @@ struct cmd_tx_vlan_set_pvid_result {
        cmdline_fixed_string_t tx_vlan;
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t pvid;
-       uint8_t port_id;
+       portid_t port_id;
        uint16_t vlan_id;
        cmdline_fixed_string_t mode;
 };
@@ -3419,7 +3586,7 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_pvid_pvid =
                                 pvid, "pvid");
 cmdline_parse_token_num_t cmd_tx_vlan_set_pvid_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
-                            port_id, UINT8);
+                            port_id, UINT16);
 cmdline_parse_token_num_t cmd_tx_vlan_set_pvid_vlan_id =
        TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
                              vlan_id, UINT16);
@@ -3446,7 +3613,7 @@ cmdline_parse_inst_t cmd_tx_vlan_set_pvid = {
 struct cmd_tx_vlan_reset_result {
        cmdline_fixed_string_t tx_vlan;
        cmdline_fixed_string_t reset;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
@@ -3456,7 +3623,14 @@ cmd_tx_vlan_reset_parsed(void *parsed_result,
 {
        struct cmd_tx_vlan_reset_result *res = parsed_result;
 
+       if (!port_is_stopped(res->port_id)) {
+               printf("Please stop port %d first\n", res->port_id);
+               return;
+       }
+
        tx_vlan_reset(res->port_id);
+
+       cmd_reconfig_device_queue(res->port_id, 1, 1);
 }
 
 cmdline_parse_token_string_t cmd_tx_vlan_reset_tx_vlan =
@@ -3467,7 +3641,7 @@ cmdline_parse_token_string_t cmd_tx_vlan_reset_reset =
                                 reset, "reset");
 cmdline_parse_token_num_t cmd_tx_vlan_reset_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_reset_result,
-                             port_id, UINT8);
+                             port_id, UINT16);
 
 cmdline_parse_inst_t cmd_tx_vlan_reset = {
        .f = cmd_tx_vlan_reset_parsed,
@@ -3489,7 +3663,7 @@ struct cmd_csum_result {
        cmdline_fixed_string_t mode;
        cmdline_fixed_string_t proto;
        cmdline_fixed_string_t hwsw;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
@@ -3549,11 +3723,16 @@ cmd_csum_parsed(void *parsed_result,
        struct cmd_csum_result *res = parsed_result;
        int hw = 0;
        uint16_t mask = 0;
+       uint64_t csum_offloads = 0;
 
        if (port_id_is_invalid(res->port_id, ENABLED_WARN)) {
                printf("invalid port %d\n", res->port_id);
                return;
        }
+       if (!port_is_stopped(res->port_id)) {
+               printf("Please stop port %d first\n", res->port_id);
+               return;
+       }
 
        if (!strcmp(res->mode, "set")) {
 
@@ -3562,22 +3741,34 @@ cmd_csum_parsed(void *parsed_result,
 
                if (!strcmp(res->proto, "ip")) {
                        mask = TESTPMD_TX_OFFLOAD_IP_CKSUM;
+                       csum_offloads |= DEV_TX_OFFLOAD_IPV4_CKSUM;
                } else if (!strcmp(res->proto, "udp")) {
                        mask = TESTPMD_TX_OFFLOAD_UDP_CKSUM;
+                       csum_offloads |= DEV_TX_OFFLOAD_UDP_CKSUM;
                } else if (!strcmp(res->proto, "tcp")) {
                        mask = TESTPMD_TX_OFFLOAD_TCP_CKSUM;
+                       csum_offloads |= DEV_TX_OFFLOAD_TCP_CKSUM;
                } else if (!strcmp(res->proto, "sctp")) {
                        mask = TESTPMD_TX_OFFLOAD_SCTP_CKSUM;
+                       csum_offloads |= DEV_TX_OFFLOAD_SCTP_CKSUM;
                } else if (!strcmp(res->proto, "outer-ip")) {
                        mask = TESTPMD_TX_OFFLOAD_OUTER_IP_CKSUM;
+                       csum_offloads |= DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM;
                }
 
-               if (hw)
+               if (hw) {
                        ports[res->port_id].tx_ol_flags |= mask;
-               else
+                       ports[res->port_id].dev_conf.txmode.offloads |=
+                                                       csum_offloads;
+               } else {
                        ports[res->port_id].tx_ol_flags &= (~mask);
+                       ports[res->port_id].dev_conf.txmode.offloads &=
+                                                       (~csum_offloads);
+               }
        }
        csum_show(res->port_id);
+
+       cmd_reconfig_device_queue(res->port_id, 1, 1);
 }
 
 cmdline_parse_token_string_t cmd_csum_csum =
@@ -3594,7 +3785,7 @@ cmdline_parse_token_string_t cmd_csum_hwsw =
                                hwsw, "hw#sw");
 cmdline_parse_token_num_t cmd_csum_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_csum_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_csum_set = {
        .f = cmd_csum_parsed,
@@ -3633,7 +3824,7 @@ struct cmd_csum_tunnel_result {
        cmdline_fixed_string_t csum;
        cmdline_fixed_string_t parse;
        cmdline_fixed_string_t onoff;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
@@ -3667,7 +3858,7 @@ cmdline_parse_token_string_t cmd_csum_tunnel_onoff =
                                onoff, "on#off");
 cmdline_parse_token_num_t cmd_csum_tunnel_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_csum_tunnel_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_csum_tunnel = {
        .f = cmd_csum_tunnel_parsed,
@@ -3688,7 +3879,7 @@ struct cmd_tso_set_result {
        cmdline_fixed_string_t tso;
        cmdline_fixed_string_t mode;
        uint16_t tso_segsz;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
@@ -3701,15 +3892,24 @@ cmd_tso_set_parsed(void *parsed_result,
 
        if (port_id_is_invalid(res->port_id, ENABLED_WARN))
                return;
+       if (!port_is_stopped(res->port_id)) {
+               printf("Please stop port %d first\n", res->port_id);
+               return;
+       }
 
        if (!strcmp(res->mode, "set"))
                ports[res->port_id].tso_segsz = res->tso_segsz;
 
-       if (ports[res->port_id].tso_segsz == 0)
+       if (ports[res->port_id].tso_segsz == 0) {
+               ports[res->port_id].dev_conf.txmode.offloads &=
+                                               ~DEV_TX_OFFLOAD_TCP_TSO;
                printf("TSO for non-tunneled packets is disabled\n");
-       else
+       } else {
+               ports[res->port_id].dev_conf.txmode.offloads |=
+                                               DEV_TX_OFFLOAD_TCP_TSO;
                printf("TSO segment size for non-tunneled packets is %d\n",
                        ports[res->port_id].tso_segsz);
+       }
 
        /* display warnings if configuration is not supported by the NIC */
        rte_eth_dev_info_get(res->port_id, &dev_info);
@@ -3718,6 +3918,8 @@ cmd_tso_set_parsed(void *parsed_result,
                printf("Warning: TSO enabled but not "
                        "supported by port %d\n", res->port_id);
        }
+
+       cmd_reconfig_device_queue(res->port_id, 1, 1);
 }
 
 cmdline_parse_token_string_t cmd_tso_set_tso =
@@ -3731,7 +3933,7 @@ cmdline_parse_token_num_t cmd_tso_set_tso_segsz =
                                tso_segsz, UINT16);
 cmdline_parse_token_num_t cmd_tso_set_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_tso_set_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_tso_set = {
        .f = cmd_tso_set_parsed,
@@ -3771,11 +3973,11 @@ struct cmd_tunnel_tso_set_result {
        cmdline_fixed_string_t tso;
        cmdline_fixed_string_t mode;
        uint16_t tso_segsz;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
-check_tunnel_tso_nic_support(uint8_t port_id)
+check_tunnel_tso_nic_support(portid_t port_id)
 {
        struct rte_eth_dev_info dev_info;
 
@@ -3803,13 +4005,27 @@ cmd_tunnel_tso_set_parsed(void *parsed_result,
 
        if (port_id_is_invalid(res->port_id, ENABLED_WARN))
                return;
+       if (!port_is_stopped(res->port_id)) {
+               printf("Please stop port %d first\n", res->port_id);
+               return;
+       }
 
        if (!strcmp(res->mode, "set"))
                ports[res->port_id].tunnel_tso_segsz = res->tso_segsz;
 
-       if (ports[res->port_id].tunnel_tso_segsz == 0)
+       if (ports[res->port_id].tunnel_tso_segsz == 0) {
+               ports[res->port_id].dev_conf.txmode.offloads &=
+                       ~(DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
+                         DEV_TX_OFFLOAD_GRE_TNL_TSO |
+                         DEV_TX_OFFLOAD_IPIP_TNL_TSO |
+                         DEV_TX_OFFLOAD_GENEVE_TNL_TSO);
                printf("TSO for tunneled packets is disabled\n");
-       else {
+       } else {
+               ports[res->port_id].dev_conf.txmode.offloads |=
+                       (DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
+                        DEV_TX_OFFLOAD_GRE_TNL_TSO |
+                        DEV_TX_OFFLOAD_IPIP_TNL_TSO |
+                        DEV_TX_OFFLOAD_GENEVE_TNL_TSO);
                printf("TSO segment size for tunneled packets is %d\n",
                        ports[res->port_id].tunnel_tso_segsz);
 
@@ -3835,6 +4051,8 @@ cmd_tunnel_tso_set_parsed(void *parsed_result,
                        printf("Warning: csum set outer-ip must be set to hw "
                                "if outer L3 is IPv4; not necessary for IPv6\n");
        }
+
+       cmd_reconfig_device_queue(res->port_id, 1, 1);
 }
 
 cmdline_parse_token_string_t cmd_tunnel_tso_set_tso =
@@ -3848,7 +4066,7 @@ cmdline_parse_token_num_t cmd_tunnel_tso_set_tso_segsz =
                                tso_segsz, UINT16);
 cmdline_parse_token_num_t cmd_tunnel_tso_set_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_tunnel_tso_set_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_tunnel_tso_set = {
        .f = cmd_tunnel_tso_set_parsed,
@@ -4278,7 +4496,7 @@ struct cmd_set_bypass_mode_result {
        cmdline_fixed_string_t bypass;
        cmdline_fixed_string_t mode;
        cmdline_fixed_string_t value;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
@@ -4321,7 +4539,7 @@ cmdline_parse_token_string_t cmd_setbypass_mode_value =
                        value, "normal#bypass#isolate");
 cmdline_parse_token_num_t cmd_setbypass_mode_port =
        TOKEN_NUM_INITIALIZER(struct cmd_set_bypass_mode_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_set_bypass_mode = {
        .f = cmd_set_bypass_mode_parsed,
@@ -4346,7 +4564,7 @@ struct cmd_set_bypass_event_result {
        cmdline_fixed_string_t event_value;
        cmdline_fixed_string_t mode;
        cmdline_fixed_string_t mode_value;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
@@ -4427,7 +4645,7 @@ cmdline_parse_token_string_t cmd_setbypass_event_mode_value =
                        mode_value, "normal#bypass#isolate");
 cmdline_parse_token_num_t cmd_setbypass_event_port =
        TOKEN_NUM_INITIALIZER(struct cmd_set_bypass_event_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_set_bypass_event = {
        .f = cmd_set_bypass_event_parsed,
@@ -4515,7 +4733,7 @@ struct cmd_show_bypass_config_result {
        cmdline_fixed_string_t show;
        cmdline_fixed_string_t bypass;
        cmdline_fixed_string_t config;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
@@ -4594,7 +4812,7 @@ cmdline_parse_token_string_t cmd_showbypass_config_config =
                        config, "config");
 cmdline_parse_token_num_t cmd_showbypass_config_port =
        TOKEN_NUM_INITIALIZER(struct cmd_show_bypass_config_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_show_bypass_config = {
        .f = cmd_show_bypass_config_parsed,
@@ -4617,7 +4835,7 @@ struct cmd_set_bonding_mode_result {
        cmdline_fixed_string_t bonding;
        cmdline_fixed_string_t mode;
        uint8_t value;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void cmd_set_bonding_mode_parsed(void *parsed_result,
@@ -4646,7 +4864,7 @@ TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result,
                value, UINT8);
 cmdline_parse_token_num_t cmd_setbonding_mode_port =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result,
-               port_id, UINT8);
+               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_set_bonding_mode = {
                .f = cmd_set_bonding_mode_parsed,
@@ -4669,7 +4887,7 @@ struct cmd_set_bonding_lacp_dedicated_queues_result {
        cmdline_fixed_string_t bonding;
        cmdline_fixed_string_t lacp;
        cmdline_fixed_string_t dedicated_queues;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t mode;
 };
 
@@ -4720,7 +4938,7 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
                dedicated_queues, "dedicated_queues");
 cmdline_parse_token_num_t cmd_setbonding_lacp_dedicated_queues_port_id =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
-               port_id, UINT8);
+               port_id, UINT16);
 cmdline_parse_token_string_t cmd_setbonding_lacp_dedicated_queues_mode =
 TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
                mode, "enable#disable");
@@ -4747,7 +4965,7 @@ struct cmd_set_bonding_balance_xmit_policy_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t bonding;
        cmdline_fixed_string_t balance_xmit_policy;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t policy;
 };
 
@@ -4788,7 +5006,7 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result,
                balance_xmit_policy, "balance_xmit_policy");
 cmdline_parse_token_num_t cmd_setbonding_balance_xmit_policy_port =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result,
-               port_id, UINT8);
+               port_id, UINT16);
 cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_policy =
 TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result,
                policy, "l2#l23#l34");
@@ -4936,7 +5154,7 @@ TOKEN_STRING_INITIALIZER(struct cmd_show_bonding_config_result,
                config, "config");
 cmdline_parse_token_num_t cmd_showbonding_config_port =
 TOKEN_NUM_INITIALIZER(struct cmd_show_bonding_config_result,
-               port_id, UINT8);
+               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_show_bonding_config = {
                .f = cmd_show_bonding_config_parsed,
@@ -4957,8 +5175,8 @@ struct cmd_set_bonding_primary_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t bonding;
        cmdline_fixed_string_t primary;
-       uint8_t slave_id;
-       uint8_t port_id;
+       portid_t slave_id;
+       portid_t port_id;
 };
 
 static void cmd_set_bonding_primary_parsed(void *parsed_result,
@@ -4989,10 +5207,10 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_primary_result,
                primary, "primary");
 cmdline_parse_token_num_t cmd_setbonding_primary_slave =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result,
-               slave_id, UINT8);
+               slave_id, UINT16);
 cmdline_parse_token_num_t cmd_setbonding_primary_port =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result,
-               port_id, UINT8);
+               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_set_bonding_primary = {
                .f = cmd_set_bonding_primary_parsed,
@@ -5014,8 +5232,8 @@ struct cmd_add_bonding_slave_result {
        cmdline_fixed_string_t add;
        cmdline_fixed_string_t bonding;
        cmdline_fixed_string_t slave;
-       uint8_t slave_id;
-       uint8_t port_id;
+       portid_t slave_id;
+       portid_t port_id;
 };
 
 static void cmd_add_bonding_slave_parsed(void *parsed_result,
@@ -5047,10 +5265,10 @@ TOKEN_STRING_INITIALIZER(struct cmd_add_bonding_slave_result,
                slave, "slave");
 cmdline_parse_token_num_t cmd_addbonding_slave_slaveid =
 TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result,
-               slave_id, UINT8);
+               slave_id, UINT16);
 cmdline_parse_token_num_t cmd_addbonding_slave_port =
 TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result,
-               port_id, UINT8);
+               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_add_bonding_slave = {
                .f = cmd_add_bonding_slave_parsed,
@@ -5072,8 +5290,8 @@ struct cmd_remove_bonding_slave_result {
        cmdline_fixed_string_t remove;
        cmdline_fixed_string_t bonding;
        cmdline_fixed_string_t slave;
-       uint8_t slave_id;
-       uint8_t port_id;
+       portid_t slave_id;
+       portid_t port_id;
 };
 
 static void cmd_remove_bonding_slave_parsed(void *parsed_result,
@@ -5105,10 +5323,10 @@ cmdline_parse_token_string_t cmd_removebonding_slave_slave =
                                slave, "slave");
 cmdline_parse_token_num_t cmd_removebonding_slave_slaveid =
                TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result,
-                               slave_id, UINT8);
+                               slave_id, UINT16);
 cmdline_parse_token_num_t cmd_removebonding_slave_port =
                TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_remove_bonding_slave = {
                .f = cmd_remove_bonding_slave_parsed,
@@ -5205,7 +5423,7 @@ struct cmd_set_bond_mac_addr_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t bonding;
        cmdline_fixed_string_t mac_addr;
-       uint8_t port_num;
+       uint16_t port_num;
        struct ether_addr address;
 };
 
@@ -5235,7 +5453,8 @@ cmdline_parse_token_string_t cmd_set_bond_mac_addr_mac =
                TOKEN_STRING_INITIALIZER(struct cmd_set_bond_mac_addr_result, mac_addr,
                                "mac_addr");
 cmdline_parse_token_num_t cmd_set_bond_mac_addr_portnum =
-               TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mac_addr_result, port_num, UINT8);
+               TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mac_addr_result,
+                               port_num, UINT16);
 cmdline_parse_token_etheraddr_t cmd_set_bond_mac_addr_addr =
                TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_bond_mac_addr_result, address);
 
@@ -5259,7 +5478,7 @@ struct cmd_set_bond_mon_period_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t bonding;
        cmdline_fixed_string_t mon_period;
-       uint8_t port_num;
+       uint16_t port_num;
        uint32_t period_ms;
 };
 
@@ -5293,7 +5512,7 @@ cmdline_parse_token_string_t cmd_set_bond_mon_period_mon_period =
                                mon_period,     "mon_period");
 cmdline_parse_token_num_t cmd_set_bond_mon_period_portnum =
                TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mon_period_result,
-                               port_num, UINT8);
+                               port_num, UINT16);
 cmdline_parse_token_num_t cmd_set_bond_mon_period_period_ms =
                TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mon_period_result,
                                period_ms, UINT32);
@@ -5318,7 +5537,7 @@ struct cmd_set_bonding_agg_mode_policy_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t bonding;
        cmdline_fixed_string_t agg_mode;
-       uint8_t port_num;
+       uint16_t port_num;
        cmdline_fixed_string_t policy;
 };
 
@@ -5361,7 +5580,7 @@ cmdline_parse_token_string_t cmd_set_bonding_agg_mode_agg_mode =
 
 cmdline_parse_token_num_t cmd_set_bonding_agg_mode_portnum =
        TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_agg_mode_policy_result,
-                               port_num, UINT8);
+                               port_num, UINT16);
 
 cmdline_parse_token_string_t cmd_set_bonding_agg_mode_policy_string =
        TOKEN_STRING_INITIALIZER(
@@ -5575,7 +5794,7 @@ struct cmd_set_promisc_mode_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t promisc;
        cmdline_fixed_string_t port_all; /* valid if "allports" argument == 1 */
-       uint8_t port_num;                /* valid if "allports" argument == 0 */
+       uint16_t port_num;               /* valid if "allports" argument == 0 */
        cmdline_fixed_string_t mode;
 };
 
@@ -5655,7 +5874,7 @@ struct cmd_set_allmulti_mode_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t allmulti;
        cmdline_fixed_string_t port_all; /* valid if "allports" argument == 1 */
-       uint8_t port_num;                /* valid if "allports" argument == 0 */
+       uint16_t port_num;               /* valid if "allports" argument == 0 */
        cmdline_fixed_string_t mode;
 };
 
@@ -5699,7 +5918,7 @@ cmdline_parse_token_string_t cmd_setallmulti_portall =
                                 "all");
 cmdline_parse_token_num_t cmd_setallmulti_portnum =
        TOKEN_NUM_INITIALIZER(struct cmd_set_allmulti_mode_result, port_num,
-                             UINT8);
+                             UINT16);
 cmdline_parse_token_string_t cmd_setallmulti_mode =
        TOKEN_STRING_INITIALIZER(struct cmd_set_allmulti_mode_result, mode,
                                 "on#off");
@@ -5751,7 +5970,7 @@ struct cmd_link_flow_ctrl_set_result {
        uint16_t pause_time;
        cmdline_fixed_string_t xon_str;
        uint16_t send_xon;
-       uint8_t  port_id;
+       portid_t port_id;
 };
 
 cmdline_parse_token_string_t cmd_lfc_set_set =
@@ -5810,7 +6029,7 @@ cmdline_parse_token_string_t cmd_lfc_set_autoneg =
                                autoneg, "on#off");
 cmdline_parse_token_num_t cmd_lfc_set_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 
 /* forward declaration */
 static void
@@ -6049,7 +6268,7 @@ struct cmd_priority_flow_ctrl_set_result {
        uint32_t low_water;
        uint16_t pause_time;
        uint8_t  priority;
-       uint8_t  port_id;
+       portid_t port_id;
 };
 
 static void
@@ -6117,7 +6336,7 @@ cmdline_parse_token_num_t cmd_pfc_set_priority =
                                priority, UINT8);
 cmdline_parse_token_num_t cmd_pfc_set_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_priority_flow_control_set = {
        .f = cmd_priority_flow_ctrl_set_parsed,
@@ -6275,7 +6494,7 @@ struct cmd_set_link_up_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t link_up;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 cmdline_parse_token_string_t cmd_set_link_up_set =
@@ -6286,7 +6505,7 @@ cmdline_parse_token_string_t cmd_set_link_up_link_up =
 cmdline_parse_token_string_t cmd_set_link_up_port =
        TOKEN_STRING_INITIALIZER(struct cmd_set_link_up_result, port, "port");
 cmdline_parse_token_num_t cmd_set_link_up_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_set_link_up_result, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_set_link_up_result, port_id, UINT16);
 
 static void cmd_set_link_up_parsed(__attribute__((unused)) void *parsed_result,
                             __attribute__((unused)) struct cmdline *cl,
@@ -6314,7 +6533,7 @@ struct cmd_set_link_down_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t link_down;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 cmdline_parse_token_string_t cmd_set_link_down_set =
@@ -6325,7 +6544,7 @@ cmdline_parse_token_string_t cmd_set_link_down_link_down =
 cmdline_parse_token_string_t cmd_set_link_down_port =
        TOKEN_STRING_INITIALIZER(struct cmd_set_link_down_result, port, "port");
 cmdline_parse_token_num_t cmd_set_link_down_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_set_link_down_result, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_set_link_down_result, port_id, UINT16);
 
 static void cmd_set_link_down_parsed(
                                __attribute__((unused)) void *parsed_result,
@@ -6465,7 +6684,7 @@ struct cmd_showport_result {
        cmdline_fixed_string_t show;
        cmdline_fixed_string_t port;
        cmdline_fixed_string_t what;
-       uint8_t portnum;
+       uint16_t portnum;
 };
 
 static void cmd_showport_parsed(void *parsed_result,
@@ -6503,7 +6722,7 @@ cmdline_parse_token_string_t cmd_showport_what =
        TOKEN_STRING_INITIALIZER(struct cmd_showport_result, what,
                                 "info#stats#xstats#fdir#stat_qmap#dcb_tc#cap");
 cmdline_parse_token_num_t cmd_showport_portnum =
-       TOKEN_NUM_INITIALIZER(struct cmd_showport_result, portnum, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_showport_result, portnum, UINT16);
 
 cmdline_parse_inst_t cmd_showport = {
        .f = cmd_showport_parsed,
@@ -6525,7 +6744,7 @@ struct cmd_showqueue_result {
        cmdline_fixed_string_t show;
        cmdline_fixed_string_t type;
        cmdline_fixed_string_t what;
-       uint8_t portnum;
+       uint16_t portnum;
        uint16_t queuenum;
 };
 
@@ -6549,7 +6768,7 @@ cmdline_parse_token_string_t cmd_showqueue_type =
 cmdline_parse_token_string_t cmd_showqueue_what =
        TOKEN_STRING_INITIALIZER(struct cmd_showqueue_result, what, "info");
 cmdline_parse_token_num_t cmd_showqueue_portnum =
-       TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, portnum, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, portnum, UINT16);
 cmdline_parse_token_num_t cmd_showqueue_queuenum =
        TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, queuenum, UINT16);
 
@@ -6571,7 +6790,7 @@ cmdline_parse_inst_t cmd_showqueue = {
 struct cmd_read_reg_result {
        cmdline_fixed_string_t read;
        cmdline_fixed_string_t reg;
-       uint8_t port_id;
+       portid_t port_id;
        uint32_t reg_off;
 };
 
@@ -6589,7 +6808,7 @@ cmdline_parse_token_string_t cmd_read_reg_read =
 cmdline_parse_token_string_t cmd_read_reg_reg =
        TOKEN_STRING_INITIALIZER(struct cmd_read_reg_result, reg, "reg");
 cmdline_parse_token_num_t cmd_read_reg_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, port_id, UINT16);
 cmdline_parse_token_num_t cmd_read_reg_reg_off =
        TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, reg_off, UINT32);
 
@@ -6610,7 +6829,7 @@ cmdline_parse_inst_t cmd_read_reg = {
 struct cmd_read_reg_bit_field_result {
        cmdline_fixed_string_t read;
        cmdline_fixed_string_t regfield;
-       uint8_t port_id;
+       portid_t port_id;
        uint32_t reg_off;
        uint8_t bit1_pos;
        uint8_t bit2_pos;
@@ -6634,7 +6853,7 @@ cmdline_parse_token_string_t cmd_read_reg_bit_field_regfield =
                                 regfield, "regfield");
 cmdline_parse_token_num_t cmd_read_reg_bit_field_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, port_id,
-                             UINT8);
+                             UINT16);
 cmdline_parse_token_num_t cmd_read_reg_bit_field_reg_off =
        TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, reg_off,
                              UINT32);
@@ -6665,7 +6884,7 @@ cmdline_parse_inst_t cmd_read_reg_bit_field = {
 struct cmd_read_reg_bit_result {
        cmdline_fixed_string_t read;
        cmdline_fixed_string_t regbit;
-       uint8_t port_id;
+       portid_t port_id;
        uint32_t reg_off;
        uint8_t bit_pos;
 };
@@ -6685,7 +6904,7 @@ cmdline_parse_token_string_t cmd_read_reg_bit_regbit =
        TOKEN_STRING_INITIALIZER(struct cmd_read_reg_bit_result,
                                 regbit, "regbit");
 cmdline_parse_token_num_t cmd_read_reg_bit_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, port_id, UINT16);
 cmdline_parse_token_num_t cmd_read_reg_bit_reg_off =
        TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, reg_off, UINT32);
 cmdline_parse_token_num_t cmd_read_reg_bit_bit_pos =
@@ -6709,7 +6928,7 @@ cmdline_parse_inst_t cmd_read_reg_bit = {
 struct cmd_write_reg_result {
        cmdline_fixed_string_t write;
        cmdline_fixed_string_t reg;
-       uint8_t port_id;
+       portid_t port_id;
        uint32_t reg_off;
        uint32_t value;
 };
@@ -6728,7 +6947,7 @@ cmdline_parse_token_string_t cmd_write_reg_write =
 cmdline_parse_token_string_t cmd_write_reg_reg =
        TOKEN_STRING_INITIALIZER(struct cmd_write_reg_result, reg, "reg");
 cmdline_parse_token_num_t cmd_write_reg_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, port_id, UINT16);
 cmdline_parse_token_num_t cmd_write_reg_reg_off =
        TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, reg_off, UINT32);
 cmdline_parse_token_num_t cmd_write_reg_value =
@@ -6752,7 +6971,7 @@ cmdline_parse_inst_t cmd_write_reg = {
 struct cmd_write_reg_bit_field_result {
        cmdline_fixed_string_t write;
        cmdline_fixed_string_t regfield;
-       uint8_t port_id;
+       portid_t port_id;
        uint32_t reg_off;
        uint8_t bit1_pos;
        uint8_t bit2_pos;
@@ -6777,7 +6996,7 @@ cmdline_parse_token_string_t cmd_write_reg_bit_field_regfield =
                                 regfield, "regfield");
 cmdline_parse_token_num_t cmd_write_reg_bit_field_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, port_id,
-                             UINT8);
+                             UINT16);
 cmdline_parse_token_num_t cmd_write_reg_bit_field_reg_off =
        TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, reg_off,
                              UINT32);
@@ -6813,7 +7032,7 @@ cmdline_parse_inst_t cmd_write_reg_bit_field = {
 struct cmd_write_reg_bit_result {
        cmdline_fixed_string_t write;
        cmdline_fixed_string_t regbit;
-       uint8_t port_id;
+       portid_t port_id;
        uint32_t reg_off;
        uint8_t bit_pos;
        uint8_t value;
@@ -6835,7 +7054,7 @@ cmdline_parse_token_string_t cmd_write_reg_bit_regbit =
        TOKEN_STRING_INITIALIZER(struct cmd_write_reg_bit_result,
                                 regbit, "regbit");
 cmdline_parse_token_num_t cmd_write_reg_bit_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, port_id, UINT16);
 cmdline_parse_token_num_t cmd_write_reg_bit_reg_off =
        TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, reg_off, UINT32);
 cmdline_parse_token_num_t cmd_write_reg_bit_bit_pos =
@@ -6863,7 +7082,7 @@ cmdline_parse_inst_t cmd_write_reg_bit = {
 struct cmd_read_rxd_txd_result {
        cmdline_fixed_string_t read;
        cmdline_fixed_string_t rxd_txd;
-       uint8_t port_id;
+       portid_t port_id;
        uint16_t queue_id;
        uint16_t desc_id;
 };
@@ -6887,7 +7106,7 @@ cmdline_parse_token_string_t cmd_read_rxd_txd_rxd_txd =
        TOKEN_STRING_INITIALIZER(struct cmd_read_rxd_txd_result, rxd_txd,
                                 "rxd#txd");
 cmdline_parse_token_num_t cmd_read_rxd_txd_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, port_id, UINT16);
 cmdline_parse_token_num_t cmd_read_rxd_txd_queue_id =
        TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, queue_id, UINT16);
 cmdline_parse_token_num_t cmd_read_rxd_txd_desc_id =
@@ -6937,7 +7156,7 @@ cmdline_parse_inst_t cmd_quit = {
 struct cmd_mac_addr_result {
        cmdline_fixed_string_t mac_addr_cmd;
        cmdline_fixed_string_t what;
-       uint8_t port_num;
+       uint16_t port_num;
        struct ether_addr address;
 };
 
@@ -6969,7 +7188,8 @@ cmdline_parse_token_string_t cmd_mac_addr_what =
        TOKEN_STRING_INITIALIZER(struct cmd_mac_addr_result, what,
                                "add#remove#set");
 cmdline_parse_token_num_t cmd_mac_addr_portnum =
-               TOKEN_NUM_INITIALIZER(struct cmd_mac_addr_result, port_num, UINT8);
+               TOKEN_NUM_INITIALIZER(struct cmd_mac_addr_result, port_num,
+                                       UINT16);
 cmdline_parse_token_etheraddr_t cmd_mac_addr_addr =
                TOKEN_ETHERADDR_INITIALIZER(struct cmd_mac_addr_result, address);
 
@@ -6993,7 +7213,7 @@ struct cmd_set_qmap_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t qmap;
        cmdline_fixed_string_t what;
-       uint8_t port_id;
+       portid_t port_id;
        uint16_t queue_id;
        uint8_t map_value;
 };
@@ -7020,7 +7240,7 @@ cmdline_parse_token_string_t cmd_setqmap_what =
                                 what, "tx#rx");
 cmdline_parse_token_num_t cmd_setqmap_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_qmap_result,
-                             port_id, UINT8);
+                             port_id, UINT16);
 cmdline_parse_token_num_t cmd_setqmap_queueid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_qmap_result,
                              queue_id, UINT16);
@@ -7044,11 +7264,53 @@ cmdline_parse_inst_t cmd_set_qmap = {
        },
 };
 
+/* *** SET OPTION TO HIDE ZERO VALUES FOR XSTATS  DISPLAY *** */
+struct cmd_set_xstats_hide_zero_result {
+       cmdline_fixed_string_t keyword;
+       cmdline_fixed_string_t name;
+       cmdline_fixed_string_t on_off;
+};
+
+static void
+cmd_set_xstats_hide_zero_parsed(void *parsed_result,
+                       __attribute__((unused)) struct cmdline *cl,
+                       __attribute__((unused)) void *data)
+{
+       struct cmd_set_xstats_hide_zero_result *res;
+       uint16_t on_off = 0;
+
+       res = parsed_result;
+       on_off = !strcmp(res->on_off, "on") ? 1 : 0;
+       set_xstats_hide_zero(on_off);
+}
+
+cmdline_parse_token_string_t cmd_set_xstats_hide_zero_keyword =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_xstats_hide_zero_result,
+                                keyword, "set");
+cmdline_parse_token_string_t cmd_set_xstats_hide_zero_name =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_xstats_hide_zero_result,
+                                name, "xstats-hide-zero");
+cmdline_parse_token_string_t cmd_set_xstats_hide_zero_on_off =
+       TOKEN_STRING_INITIALIZER(struct cmd_set_xstats_hide_zero_result,
+                                on_off, "on#off");
+
+cmdline_parse_inst_t cmd_set_xstats_hide_zero = {
+       .f = cmd_set_xstats_hide_zero_parsed,
+       .data = NULL,
+       .help_str = "set xstats-hide-zero on|off",
+       .tokens = {
+               (void *)&cmd_set_xstats_hide_zero_keyword,
+               (void *)&cmd_set_xstats_hide_zero_name,
+               (void *)&cmd_set_xstats_hide_zero_on_off,
+               NULL,
+       },
+};
+
 /* *** CONFIGURE UNICAST HASH TABLE *** */
 struct cmd_set_uc_hash_table {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t what;
        struct ether_addr address;
        cmdline_fixed_string_t mode;
@@ -7080,7 +7342,7 @@ cmdline_parse_token_string_t cmd_set_uc_hash_port =
                                 port, "port");
 cmdline_parse_token_num_t cmd_set_uc_hash_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_uc_hash_table,
-                             port_id, UINT8);
+                             port_id, UINT16);
 cmdline_parse_token_string_t cmd_set_uc_hash_what =
        TOKEN_STRING_INITIALIZER(struct cmd_set_uc_hash_table,
                                 what, "uta");
@@ -7109,7 +7371,7 @@ cmdline_parse_inst_t cmd_set_uc_hash_filter = {
 struct cmd_set_uc_all_hash_table {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t what;
        cmdline_fixed_string_t value;
        cmdline_fixed_string_t mode;
@@ -7141,7 +7403,7 @@ cmdline_parse_token_string_t cmd_set_uc_all_hash_port =
                                 port, "port");
 cmdline_parse_token_num_t cmd_set_uc_all_hash_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_uc_all_hash_table,
-                             port_id, UINT8);
+                             port_id, UINT16);
 cmdline_parse_token_string_t cmd_set_uc_all_hash_what =
        TOKEN_STRING_INITIALIZER(struct cmd_set_uc_all_hash_table,
                                 what, "uta");
@@ -7171,7 +7433,7 @@ cmdline_parse_inst_t cmd_set_uc_all_hash_filter = {
 struct cmd_set_vf_macvlan_filter {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t vf;
        uint8_t vf_id;
        struct ether_addr address;
@@ -7233,7 +7495,7 @@ cmdline_parse_token_string_t cmd_set_vf_macvlan_port =
                                 port, "port");
 cmdline_parse_token_num_t cmd_set_vf_macvlan_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_vf_macvlan_filter,
-                             port_id, UINT8);
+                             port_id, UINT16);
 cmdline_parse_token_string_t cmd_set_vf_macvlan_vf =
        TOKEN_STRING_INITIALIZER(struct cmd_set_vf_macvlan_filter,
                                 vf, "vf");
@@ -7275,7 +7537,7 @@ cmdline_parse_inst_t cmd_set_vf_macvlan_filter = {
 struct cmd_set_vf_traffic {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t vf;
        uint8_t vf_id;
        cmdline_fixed_string_t what;
@@ -7302,7 +7564,7 @@ cmdline_parse_token_string_t cmd_setvf_traffic_port =
                                 port, "port");
 cmdline_parse_token_num_t cmd_setvf_traffic_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_vf_traffic,
-                             port_id, UINT8);
+                             port_id, UINT16);
 cmdline_parse_token_string_t cmd_setvf_traffic_vf =
        TOKEN_STRING_INITIALIZER(struct cmd_set_vf_traffic,
                                 vf, "vf");
@@ -7336,7 +7598,7 @@ cmdline_parse_inst_t cmd_set_vf_traffic = {
 struct cmd_set_vf_rxmode {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t vf;
        uint8_t vf_id;
        cmdline_fixed_string_t what;
@@ -7365,6 +7627,8 @@ cmd_set_vf_rxmode_parsed(void *parsed_result,
                        rx_mode |= ETH_VMDQ_ACCEPT_MULTICAST;
        }
 
+       RTE_SET_USED(is_on);
+
 #ifdef RTE_LIBRTE_IXGBE_PMD
        if (ret == -ENOTSUP)
                ret = rte_pmd_ixgbe_set_vf_rxmode(res->port_id, res->vf_id,
@@ -7388,7 +7652,7 @@ cmdline_parse_token_string_t cmd_set_vf_rxmode_port =
                                 port, "port");
 cmdline_parse_token_num_t cmd_set_vf_rxmode_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_vf_rxmode,
-                             port_id, UINT8);
+                             port_id, UINT16);
 cmdline_parse_token_string_t cmd_set_vf_rxmode_vf =
        TOKEN_STRING_INITIALIZER(struct cmd_set_vf_rxmode,
                                 vf, "vf");
@@ -7428,7 +7692,7 @@ struct cmd_vf_mac_addr_result {
        cmdline_fixed_string_t mac_addr_cmd;
        cmdline_fixed_string_t what;
        cmdline_fixed_string_t port;
-       uint8_t port_num;
+       uint16_t port_num;
        cmdline_fixed_string_t vf;
        uint8_t vf_num;
        struct ether_addr address;
@@ -7471,7 +7735,7 @@ cmdline_parse_token_string_t cmd_vf_mac_addr_port =
                                port,"port");
 cmdline_parse_token_num_t cmd_vf_mac_addr_portnum =
        TOKEN_NUM_INITIALIZER(struct cmd_vf_mac_addr_result,
-                               port_num, UINT8);
+                               port_num, UINT16);
 cmdline_parse_token_string_t cmd_vf_mac_addr_vf =
        TOKEN_STRING_INITIALIZER(struct cmd_vf_mac_addr_result,
                                vf,"vf");
@@ -7505,7 +7769,7 @@ struct cmd_vf_rx_vlan_filter {
        cmdline_fixed_string_t what;
        uint16_t vlan_id;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t vf;
        uint64_t vf_mask;
 };
@@ -7568,7 +7832,7 @@ cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_port =
                                 port, "port");
 cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_vf_rx_vlan_filter,
-                             port_id, UINT8);
+                             port_id, UINT16);
 cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_vf =
        TOKEN_STRING_INITIALIZER(struct cmd_vf_rx_vlan_filter,
                                 vf, "vf");
@@ -7597,7 +7861,7 @@ cmdline_parse_inst_t cmd_vf_rxvlan_filter = {
 struct cmd_queue_rate_limit_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t port;
-       uint8_t port_num;
+       uint16_t port_num;
        cmdline_fixed_string_t queue;
        uint8_t queue_num;
        cmdline_fixed_string_t rate;
@@ -7629,7 +7893,7 @@ cmdline_parse_token_string_t cmd_queue_rate_limit_port =
                                port, "port");
 cmdline_parse_token_num_t cmd_queue_rate_limit_portnum =
        TOKEN_NUM_INITIALIZER(struct cmd_queue_rate_limit_result,
-                               port_num, UINT8);
+                               port_num, UINT16);
 cmdline_parse_token_string_t cmd_queue_rate_limit_queue =
        TOKEN_STRING_INITIALIZER(struct cmd_queue_rate_limit_result,
                                queue, "queue");
@@ -7664,7 +7928,7 @@ cmdline_parse_inst_t cmd_queue_rate_limit = {
 struct cmd_vf_rate_limit_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t port;
-       uint8_t port_num;
+       uint16_t port_num;
        cmdline_fixed_string_t vf;
        uint8_t vf_num;
        cmdline_fixed_string_t rate;
@@ -7699,7 +7963,7 @@ cmdline_parse_token_string_t cmd_vf_rate_limit_port =
                                port, "port");
 cmdline_parse_token_num_t cmd_vf_rate_limit_portnum =
        TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
-                               port_num, UINT8);
+                               port_num, UINT16);
 cmdline_parse_token_string_t cmd_vf_rate_limit_vf =
        TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result,
                                vf, "vf");
@@ -7743,7 +8007,7 @@ cmdline_parse_inst_t cmd_vf_rate_limit = {
 struct cmd_tunnel_filter_result {
        cmdline_fixed_string_t cmd;
        cmdline_fixed_string_t what;
-       uint8_t port_id;
+       portid_t port_id;
        struct ether_addr outer_mac;
        struct ether_addr inner_mac;
        cmdline_ipaddr_t ip_value;
@@ -7837,7 +8101,7 @@ cmdline_parse_token_string_t cmd_tunnel_filter_what =
        what, "add#rm");
 cmdline_parse_token_num_t cmd_tunnel_filter_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
-       port_id, UINT8);
+       port_id, UINT16);
 cmdline_parse_token_etheraddr_t cmd_tunnel_filter_outer_mac =
        TOKEN_ETHERADDR_INITIALIZER(struct cmd_tunnel_filter_result,
        outer_mac);
@@ -7893,7 +8157,7 @@ struct cmd_tunnel_udp_config {
        cmdline_fixed_string_t cmd;
        cmdline_fixed_string_t what;
        uint16_t udp_port;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
@@ -7932,7 +8196,7 @@ cmdline_parse_token_num_t cmd_tunnel_udp_config_udp_port =
                                udp_port, UINT16);
 cmdline_parse_token_num_t cmd_tunnel_udp_config_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_tunnel_udp_config,
-                               port_id, UINT8);
+                               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_tunnel_udp_config = {
        .f = cmd_tunnel_udp_config_parsed,
@@ -7951,7 +8215,7 @@ cmdline_parse_inst_t cmd_tunnel_udp_config = {
 /* *** GLOBAL CONFIG *** */
 struct cmd_global_config_result {
        cmdline_fixed_string_t cmd;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t cfg_type;
        uint8_t len;
 };
@@ -7978,7 +8242,8 @@ cmdline_parse_token_string_t cmd_global_config_cmd =
        TOKEN_STRING_INITIALIZER(struct cmd_global_config_result, cmd,
                "global_config");
 cmdline_parse_token_num_t cmd_global_config_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_global_config_result, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_global_config_result, port_id,
+                              UINT16);
 cmdline_parse_token_string_t cmd_global_config_type =
        TOKEN_STRING_INITIALIZER(struct cmd_global_config_result,
                cfg_type, "gre-key-len");
@@ -8003,7 +8268,7 @@ cmdline_parse_inst_t cmd_global_config = {
 struct cmd_set_mirror_mask_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t mirror;
        uint8_t rule_id;
        cmdline_fixed_string_t what;
@@ -8021,7 +8286,7 @@ cmdline_parse_token_string_t cmd_mirror_mask_port =
                                port, "port");
 cmdline_parse_token_num_t cmd_mirror_mask_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_mask_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 cmdline_parse_token_string_t cmd_mirror_mask_mirror =
        TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
                                mirror, "mirror-rule");
@@ -8119,7 +8384,7 @@ cmdline_parse_inst_t cmd_set_mirror_mask = {
 struct cmd_set_mirror_link_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t mirror;
        uint8_t rule_id;
        cmdline_fixed_string_t what;
@@ -8136,7 +8401,7 @@ cmdline_parse_token_string_t cmd_mirror_link_port =
                                port, "port");
 cmdline_parse_token_num_t cmd_mirror_link_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_link_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 cmdline_parse_token_string_t cmd_mirror_link_mirror =
        TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result,
                                mirror, "mirror-rule");
@@ -8209,7 +8474,7 @@ cmdline_parse_inst_t cmd_set_mirror_link = {
 struct cmd_rm_mirror_rule_result {
        cmdline_fixed_string_t reset;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t mirror;
        uint8_t rule_id;
 };
@@ -8222,7 +8487,7 @@ cmdline_parse_token_string_t cmd_rm_mirror_rule_port =
                                port, "port");
 cmdline_parse_token_num_t cmd_rm_mirror_rule_portid =
        TOKEN_NUM_INITIALIZER(struct cmd_rm_mirror_rule_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 cmdline_parse_token_string_t cmd_rm_mirror_rule_mirror =
        TOKEN_STRING_INITIALIZER(struct cmd_rm_mirror_rule_result,
                                mirror, "mirror-rule");
@@ -8367,7 +8632,7 @@ cmdline_parse_inst_t cmd_dump_one = {
 /* *** Add/Del syn filter *** */
 struct cmd_syn_filter_result {
        cmdline_fixed_string_t filter;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t ops;
        cmdline_fixed_string_t priority;
        cmdline_fixed_string_t high;
@@ -8421,7 +8686,7 @@ cmdline_parse_token_string_t cmd_syn_filter_filter =
        filter, "syn_filter");
 cmdline_parse_token_num_t cmd_syn_filter_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_syn_filter_result,
-       port_id, UINT8);
+       port_id, UINT16);
 cmdline_parse_token_string_t cmd_syn_filter_ops =
        TOKEN_STRING_INITIALIZER(struct cmd_syn_filter_result,
        ops, "add#del");
@@ -8455,10 +8720,452 @@ cmdline_parse_inst_t cmd_syn_filter = {
        },
 };
 
+/* *** queue region set *** */
+struct cmd_queue_region_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t port;
+       portid_t port_id;
+       cmdline_fixed_string_t cmd;
+       cmdline_fixed_string_t region;
+       uint8_t  region_id;
+       cmdline_fixed_string_t queue_start_index;
+       uint8_t  queue_id;
+       cmdline_fixed_string_t queue_num;
+       uint8_t  queue_num_value;
+};
+
+static void
+cmd_queue_region_parsed(void *parsed_result,
+                       __attribute__((unused)) struct cmdline *cl,
+                       __attribute__((unused)) void *data)
+{
+       struct cmd_queue_region_result *res = parsed_result;
+       int ret = -ENOTSUP;
+#ifdef RTE_LIBRTE_I40E_PMD
+       struct rte_pmd_i40e_queue_region_conf region_conf;
+       enum rte_pmd_i40e_queue_region_op op_type;
+#endif
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       memset(&region_conf, 0, sizeof(region_conf));
+       op_type = RTE_PMD_I40E_RSS_QUEUE_REGION_SET;
+       region_conf.region_id = res->region_id;
+       region_conf.queue_num = res->queue_num_value;
+       region_conf.queue_start_index = res->queue_id;
+
+       ret = rte_pmd_i40e_rss_queue_region_conf(res->port_id,
+                               op_type, &region_conf);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -ENOTSUP:
+               printf("function not implemented or supported\n");
+               break;
+       default:
+               printf("queue region config error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_token_string_t cmd_queue_region_set =
+TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
+               set, "set");
+cmdline_parse_token_string_t cmd_queue_region_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result, port, "port");
+cmdline_parse_token_num_t cmd_queue_region_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
+                               port_id, UINT16);
+cmdline_parse_token_string_t cmd_queue_region_cmd =
+       TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
+                                cmd, "queue-region");
+cmdline_parse_token_string_t cmd_queue_region_id =
+       TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
+                               region, "region_id");
+cmdline_parse_token_num_t cmd_queue_region_index =
+       TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
+                               region_id, UINT8);
+cmdline_parse_token_string_t cmd_queue_region_queue_start_index =
+       TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
+                               queue_start_index, "queue_start_index");
+cmdline_parse_token_num_t cmd_queue_region_queue_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
+                               queue_id, UINT8);
+cmdline_parse_token_string_t cmd_queue_region_queue_num =
+       TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
+                               queue_num, "queue_num");
+cmdline_parse_token_num_t cmd_queue_region_queue_num_value =
+       TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
+                               queue_num_value, UINT8);
+
+cmdline_parse_inst_t cmd_queue_region = {
+       .f = cmd_queue_region_parsed,
+       .data = NULL,
+       .help_str = "set port <port_id> queue-region region_id <value> "
+               "queue_start_index <value> queue_num <value>: Set a queue region",
+       .tokens = {
+               (void *)&cmd_queue_region_set,
+               (void *)&cmd_queue_region_port,
+               (void *)&cmd_queue_region_port_id,
+               (void *)&cmd_queue_region_cmd,
+               (void *)&cmd_queue_region_id,
+               (void *)&cmd_queue_region_index,
+               (void *)&cmd_queue_region_queue_start_index,
+               (void *)&cmd_queue_region_queue_id,
+               (void *)&cmd_queue_region_queue_num,
+               (void *)&cmd_queue_region_queue_num_value,
+               NULL,
+       },
+};
+
+/* *** queue region and flowtype set *** */
+struct cmd_region_flowtype_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t port;
+       portid_t port_id;
+       cmdline_fixed_string_t cmd;
+       cmdline_fixed_string_t region;
+       uint8_t  region_id;
+       cmdline_fixed_string_t flowtype;
+       uint8_t  flowtype_id;
+};
+
+static void
+cmd_region_flowtype_parsed(void *parsed_result,
+                       __attribute__((unused)) struct cmdline *cl,
+                       __attribute__((unused)) void *data)
+{
+       struct cmd_region_flowtype_result *res = parsed_result;
+       int ret = -ENOTSUP;
+#ifdef RTE_LIBRTE_I40E_PMD
+       struct rte_pmd_i40e_queue_region_conf region_conf;
+       enum rte_pmd_i40e_queue_region_op op_type;
+#endif
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       memset(&region_conf, 0, sizeof(region_conf));
+
+       op_type = RTE_PMD_I40E_RSS_QUEUE_REGION_FLOWTYPE_SET;
+       region_conf.region_id = res->region_id;
+       region_conf.hw_flowtype = res->flowtype_id;
+
+       ret = rte_pmd_i40e_rss_queue_region_conf(res->port_id,
+                       op_type, &region_conf);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -ENOTSUP:
+               printf("function not implemented or supported\n");
+               break;
+       default:
+               printf("region flowtype config error: (%s)\n", strerror(-ret));
+       }
+}
+
+cmdline_parse_token_string_t cmd_region_flowtype_set =
+TOKEN_STRING_INITIALIZER(struct cmd_region_flowtype_result,
+                               set, "set");
+cmdline_parse_token_string_t cmd_region_flowtype_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_region_flowtype_result,
+                               port, "port");
+cmdline_parse_token_num_t cmd_region_flowtype_port_index =
+       TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result,
+                               port_id, UINT16);
+cmdline_parse_token_string_t cmd_region_flowtype_cmd =
+       TOKEN_STRING_INITIALIZER(struct cmd_region_flowtype_result,
+                               cmd, "queue-region");
+cmdline_parse_token_string_t cmd_region_flowtype_index =
+       TOKEN_STRING_INITIALIZER(struct cmd_region_flowtype_result,
+                               region, "region_id");
+cmdline_parse_token_num_t cmd_region_flowtype_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result,
+                               region_id, UINT8);
+cmdline_parse_token_string_t cmd_region_flowtype_flow_index =
+       TOKEN_STRING_INITIALIZER(struct cmd_region_flowtype_result,
+                               flowtype, "flowtype");
+cmdline_parse_token_num_t cmd_region_flowtype_flow_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result,
+                               flowtype_id, UINT8);
+cmdline_parse_inst_t cmd_region_flowtype = {
+       .f = cmd_region_flowtype_parsed,
+       .data = NULL,
+       .help_str = "set port <port_id> queue-region region_id <value> "
+               "flowtype <value>: Set a flowtype region index",
+       .tokens = {
+               (void *)&cmd_region_flowtype_set,
+               (void *)&cmd_region_flowtype_port,
+               (void *)&cmd_region_flowtype_port_index,
+               (void *)&cmd_region_flowtype_cmd,
+               (void *)&cmd_region_flowtype_index,
+               (void *)&cmd_region_flowtype_id,
+               (void *)&cmd_region_flowtype_flow_index,
+               (void *)&cmd_region_flowtype_flow_id,
+               NULL,
+       },
+};
+
+/* *** User Priority (UP) to queue region (region_id) set *** */
+struct cmd_user_priority_region_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t port;
+       portid_t port_id;
+       cmdline_fixed_string_t cmd;
+       cmdline_fixed_string_t user_priority;
+       uint8_t  user_priority_id;
+       cmdline_fixed_string_t region;
+       uint8_t  region_id;
+};
+
+static void
+cmd_user_priority_region_parsed(void *parsed_result,
+                       __attribute__((unused)) struct cmdline *cl,
+                       __attribute__((unused)) void *data)
+{
+       struct cmd_user_priority_region_result *res = parsed_result;
+       int ret = -ENOTSUP;
+#ifdef RTE_LIBRTE_I40E_PMD
+       struct rte_pmd_i40e_queue_region_conf region_conf;
+       enum rte_pmd_i40e_queue_region_op op_type;
+#endif
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       memset(&region_conf, 0, sizeof(region_conf));
+       op_type = RTE_PMD_I40E_RSS_QUEUE_REGION_USER_PRIORITY_SET;
+       region_conf.user_priority = res->user_priority_id;
+       region_conf.region_id = res->region_id;
+
+       ret = rte_pmd_i40e_rss_queue_region_conf(res->port_id,
+                               op_type, &region_conf);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -ENOTSUP:
+               printf("function not implemented or supported\n");
+               break;
+       default:
+               printf("user_priority region config error: (%s)\n",
+                               strerror(-ret));
+       }
+}
+
+cmdline_parse_token_string_t cmd_user_priority_region_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_user_priority_region_result,
+                               set, "set");
+cmdline_parse_token_string_t cmd_user_priority_region_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_user_priority_region_result,
+                               port, "port");
+cmdline_parse_token_num_t cmd_user_priority_region_port_index =
+       TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result,
+                               port_id, UINT16);
+cmdline_parse_token_string_t cmd_user_priority_region_cmd =
+       TOKEN_STRING_INITIALIZER(struct cmd_user_priority_region_result,
+                               cmd, "queue-region");
+cmdline_parse_token_string_t cmd_user_priority_region_UP =
+       TOKEN_STRING_INITIALIZER(struct cmd_user_priority_region_result,
+                               user_priority, "UP");
+cmdline_parse_token_num_t cmd_user_priority_region_UP_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result,
+                               user_priority_id, UINT8);
+cmdline_parse_token_string_t cmd_user_priority_region_region =
+       TOKEN_STRING_INITIALIZER(struct cmd_user_priority_region_result,
+                               region, "region_id");
+cmdline_parse_token_num_t cmd_user_priority_region_region_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result,
+                               region_id, UINT8);
+
+cmdline_parse_inst_t cmd_user_priority_region = {
+       .f = cmd_user_priority_region_parsed,
+       .data = NULL,
+       .help_str = "set port <port_id> queue-region UP <value> "
+               "region_id <value>: Set the mapping of User Priority (UP) "
+               "to queue region (region_id) ",
+       .tokens = {
+               (void *)&cmd_user_priority_region_set,
+               (void *)&cmd_user_priority_region_port,
+               (void *)&cmd_user_priority_region_port_index,
+               (void *)&cmd_user_priority_region_cmd,
+               (void *)&cmd_user_priority_region_UP,
+               (void *)&cmd_user_priority_region_UP_id,
+               (void *)&cmd_user_priority_region_region,
+               (void *)&cmd_user_priority_region_region_id,
+               NULL,
+       },
+};
+
+/* *** flush all queue region related configuration *** */
+struct cmd_flush_queue_region_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t port;
+       portid_t port_id;
+       cmdline_fixed_string_t cmd;
+       cmdline_fixed_string_t flush;
+       cmdline_fixed_string_t what;
+};
+
+static void
+cmd_flush_queue_region_parsed(void *parsed_result,
+                       __attribute__((unused)) struct cmdline *cl,
+                       __attribute__((unused)) void *data)
+{
+       struct cmd_flush_queue_region_result *res = parsed_result;
+       int ret = -ENOTSUP;
+#ifdef RTE_LIBRTE_I40E_PMD
+       struct rte_pmd_i40e_queue_region_conf region_conf;
+       enum rte_pmd_i40e_queue_region_op op_type;
+#endif
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       memset(&region_conf, 0, sizeof(region_conf));
+
+       if (strcmp(res->what, "on") == 0)
+               op_type = RTE_PMD_I40E_RSS_QUEUE_REGION_ALL_FLUSH_ON;
+       else
+               op_type = RTE_PMD_I40E_RSS_QUEUE_REGION_ALL_FLUSH_OFF;
+
+       ret = rte_pmd_i40e_rss_queue_region_conf(res->port_id,
+                               op_type, &region_conf);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -ENOTSUP:
+               printf("function not implemented or supported\n");
+               break;
+       default:
+               printf("queue region config flush error: (%s)\n",
+                               strerror(-ret));
+       }
+}
+
+cmdline_parse_token_string_t cmd_flush_queue_region_set =
+       TOKEN_STRING_INITIALIZER(struct cmd_flush_queue_region_result,
+                               set, "set");
+cmdline_parse_token_string_t cmd_flush_queue_region_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_flush_queue_region_result,
+                               port, "port");
+cmdline_parse_token_num_t cmd_flush_queue_region_port_index =
+       TOKEN_NUM_INITIALIZER(struct cmd_flush_queue_region_result,
+                               port_id, UINT16);
+cmdline_parse_token_string_t cmd_flush_queue_region_cmd =
+       TOKEN_STRING_INITIALIZER(struct cmd_flush_queue_region_result,
+                               cmd, "queue-region");
+cmdline_parse_token_string_t cmd_flush_queue_region_flush =
+       TOKEN_STRING_INITIALIZER(struct cmd_flush_queue_region_result,
+                               flush, "flush");
+cmdline_parse_token_string_t cmd_flush_queue_region_what =
+       TOKEN_STRING_INITIALIZER(struct cmd_flush_queue_region_result,
+                               what, "on#off");
+
+cmdline_parse_inst_t cmd_flush_queue_region = {
+       .f = cmd_flush_queue_region_parsed,
+       .data = NULL,
+       .help_str = "set port <port_id> queue-region flush on|off"
+               ": flush all queue region related configuration",
+       .tokens = {
+               (void *)&cmd_flush_queue_region_set,
+               (void *)&cmd_flush_queue_region_port,
+               (void *)&cmd_flush_queue_region_port_index,
+               (void *)&cmd_flush_queue_region_cmd,
+               (void *)&cmd_flush_queue_region_flush,
+               (void *)&cmd_flush_queue_region_what,
+               NULL,
+       },
+};
+
+/* *** get all queue region related configuration info *** */
+struct cmd_show_queue_region_info {
+       cmdline_fixed_string_t show;
+       cmdline_fixed_string_t port;
+       portid_t port_id;
+       cmdline_fixed_string_t cmd;
+};
+
+static void
+cmd_show_queue_region_info_parsed(void *parsed_result,
+                       __attribute__((unused)) struct cmdline *cl,
+                       __attribute__((unused)) void *data)
+{
+       struct cmd_show_queue_region_info *res = parsed_result;
+       int ret = -ENOTSUP;
+#ifdef RTE_LIBRTE_I40E_PMD
+       struct rte_pmd_i40e_queue_regions rte_pmd_regions;
+       enum rte_pmd_i40e_queue_region_op op_type;
+#endif
+
+       if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       memset(&rte_pmd_regions, 0, sizeof(rte_pmd_regions));
+
+       op_type = RTE_PMD_I40E_RSS_QUEUE_REGION_INFO_GET;
+
+       ret = rte_pmd_i40e_rss_queue_region_conf(res->port_id,
+                                       op_type, &rte_pmd_regions);
+
+       port_queue_region_info_display(res->port_id, &rte_pmd_regions);
+#endif
+
+       switch (ret) {
+       case 0:
+               break;
+       case -ENOTSUP:
+               printf("function not implemented or supported\n");
+               break;
+       default:
+               printf("queue region config info show error: (%s)\n",
+                               strerror(-ret));
+       }
+}
+
+cmdline_parse_token_string_t cmd_show_queue_region_info_get =
+TOKEN_STRING_INITIALIZER(struct cmd_show_queue_region_info,
+                               show, "show");
+cmdline_parse_token_string_t cmd_show_queue_region_info_port =
+       TOKEN_STRING_INITIALIZER(struct cmd_show_queue_region_info,
+                               port, "port");
+cmdline_parse_token_num_t cmd_show_queue_region_info_port_index =
+       TOKEN_NUM_INITIALIZER(struct cmd_show_queue_region_info,
+                               port_id, UINT16);
+cmdline_parse_token_string_t cmd_show_queue_region_info_cmd =
+       TOKEN_STRING_INITIALIZER(struct cmd_show_queue_region_info,
+                               cmd, "queue-region");
+
+cmdline_parse_inst_t cmd_show_queue_region_info_all = {
+       .f = cmd_show_queue_region_info_parsed,
+       .data = NULL,
+       .help_str = "show port <port_id> queue-region"
+               ": show all queue region related configuration info",
+       .tokens = {
+               (void *)&cmd_show_queue_region_info_get,
+               (void *)&cmd_show_queue_region_info_port,
+               (void *)&cmd_show_queue_region_info_port_index,
+               (void *)&cmd_show_queue_region_info_cmd,
+               NULL,
+       },
+};
+
 /* *** ADD/REMOVE A 2tuple FILTER *** */
 struct cmd_2tuple_filter_result {
        cmdline_fixed_string_t filter;
-       uint8_t  port_id;
+       portid_t port_id;
        cmdline_fixed_string_t ops;
        cmdline_fixed_string_t dst_port;
        uint16_t dst_port_value;
@@ -8537,7 +9244,7 @@ cmdline_parse_token_string_t cmd_2tuple_filter_filter =
                                 filter, "2tuple_filter");
 cmdline_parse_token_num_t cmd_2tuple_filter_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 cmdline_parse_token_string_t cmd_2tuple_filter_ops =
        TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
                                 ops, "add#del");
@@ -8607,7 +9314,7 @@ cmdline_parse_inst_t cmd_2tuple_filter = {
 /* *** ADD/REMOVE A 5tuple FILTER *** */
 struct cmd_5tuple_filter_result {
        cmdline_fixed_string_t filter;
-       uint8_t  port_id;
+       portid_t port_id;
        cmdline_fixed_string_t ops;
        cmdline_fixed_string_t dst_ip;
        cmdline_ipaddr_t dst_ip_value;
@@ -8716,7 +9423,7 @@ cmdline_parse_token_string_t cmd_5tuple_filter_filter =
                                 filter, "5tuple_filter");
 cmdline_parse_token_num_t cmd_5tuple_filter_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 cmdline_parse_token_string_t cmd_5tuple_filter_ops =
        TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
                                 ops, "add#del");
@@ -8812,7 +9519,7 @@ cmdline_parse_inst_t cmd_5tuple_filter = {
 struct cmd_flex_filter_result {
        cmdline_fixed_string_t filter;
        cmdline_fixed_string_t ops;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t len;
        uint8_t len_value;
        cmdline_fixed_string_t bytes;
@@ -8939,7 +9646,7 @@ cmdline_parse_token_string_t cmd_flex_filter_filter =
                                filter, "flex_filter");
 cmdline_parse_token_num_t cmd_flex_filter_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result,
-                               port_id, UINT8);
+                               port_id, UINT16);
 cmdline_parse_token_string_t cmd_flex_filter_ops =
        TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
                                ops, "add#del");
@@ -9002,7 +9709,7 @@ cmdline_parse_inst_t cmd_flex_filter = {
 /* *** deal with ethertype filter *** */
 struct cmd_ethertype_filter_result {
        cmdline_fixed_string_t filter;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t ops;
        cmdline_fixed_string_t mac;
        struct ether_addr mac_addr;
@@ -9018,7 +9725,7 @@ cmdline_parse_token_string_t cmd_ethertype_filter_filter =
                                 filter, "ethertype_filter");
 cmdline_parse_token_num_t cmd_ethertype_filter_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result,
-                             port_id, UINT8);
+                             port_id, UINT16);
 cmdline_parse_token_string_t cmd_ethertype_filter_ops =
        TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
                                 ops, "add#del");
@@ -9111,7 +9818,7 @@ cmdline_parse_inst_t cmd_ethertype_filter = {
 /* *** deal with flow director filter *** */
 struct cmd_flow_director_result {
        cmdline_fixed_string_t flow_director_filter;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t mode;
        cmdline_fixed_string_t mode_value;
        cmdline_fixed_string_t ops;
@@ -9462,7 +10169,7 @@ cmdline_parse_token_string_t cmd_flow_director_filter =
                                 flow_director_filter, "flow_director_filter");
 cmdline_parse_token_num_t cmd_flow_director_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-                             port_id, UINT8);
+                             port_id, UINT16);
 cmdline_parse_token_string_t cmd_flow_director_ops =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
                                 ops, "add#del#update");
@@ -9591,7 +10298,7 @@ cmdline_parse_inst_t cmd_add_del_ip_flow_director = {
                "ipv6-other|ipv6-frag|ipv6-tcp|ipv6-udp|ipv6-sctp|"
                "l2_payload src <src_ip> dst <dst_ip> tos <tos_value> "
                "proto <proto_value> ttl <ttl_value> vlan <vlan_value> "
-               "flexbytes <flexbyte_vaues> drop|fw <pf_vf> queue <queue_id> "
+               "flexbytes <flexbyte_values> drop|fw <pf_vf> queue <queue_id> "
                "fd_id <fd_id_value>: "
                "Add or delete an ip flow director entry on NIC",
        .tokens = {
@@ -9787,7 +10494,7 @@ cmdline_parse_inst_t cmd_add_del_tunnel_flow_director = {
 
 struct cmd_flush_flow_director_result {
        cmdline_fixed_string_t flush_flow_director;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 cmdline_parse_token_string_t cmd_flush_flow_director_flush =
@@ -9795,7 +10502,7 @@ cmdline_parse_token_string_t cmd_flush_flow_director_flush =
                                 flush_flow_director, "flush_flow_director");
 cmdline_parse_token_num_t cmd_flush_flow_director_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_flush_flow_director_result,
-                             port_id, UINT8);
+                             port_id, UINT16);
 
 static void
 cmd_flush_flow_director_parsed(void *parsed_result,
@@ -9834,7 +10541,7 @@ cmdline_parse_inst_t cmd_flush_flow_director = {
 /* *** deal with flow director mask *** */
 struct cmd_flow_director_mask_result {
        cmdline_fixed_string_t flow_director_mask;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t mode;
        cmdline_fixed_string_t mode_value;
        cmdline_fixed_string_t vlan;
@@ -9918,7 +10625,7 @@ cmdline_parse_token_string_t cmd_flow_director_mask =
                                 flow_director_mask, "flow_director_mask");
 cmdline_parse_token_num_t cmd_flow_director_mask_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-                             port_id, UINT8);
+                             port_id, UINT16);
 cmdline_parse_token_string_t cmd_flow_director_mask_vlan =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
                                 vlan, "vlan");
@@ -10046,7 +10753,7 @@ cmdline_parse_inst_t cmd_set_flow_director_tunnel_mask = {
 /* *** deal with flow director mask on flexible payload *** */
 struct cmd_flow_director_flex_mask_result {
        cmdline_fixed_string_t flow_director_flexmask;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t flow;
        cmdline_fixed_string_t flow_type;
        cmdline_fixed_string_t mask;
@@ -10138,7 +10845,7 @@ cmdline_parse_token_string_t cmd_flow_director_flexmask =
                                 "flow_director_flex_mask");
 cmdline_parse_token_num_t cmd_flow_director_flexmask_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_flow_director_flex_mask_result,
-                             port_id, UINT8);
+                             port_id, UINT16);
 cmdline_parse_token_string_t cmd_flow_director_flexmask_flow =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flex_mask_result,
                                 flow, "flow");
@@ -10168,7 +10875,7 @@ cmdline_parse_inst_t cmd_set_flow_director_flex_mask = {
 /* *** deal with flow director flexible payload configuration *** */
 struct cmd_flow_director_flexpayload_result {
        cmdline_fixed_string_t flow_director_flexpayload;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t payload_layer;
        cmdline_fixed_string_t payload_cfg;
 };
@@ -10261,7 +10968,7 @@ cmdline_parse_token_string_t cmd_flow_director_flexpayload =
                                 "flow_director_flex_payload");
 cmdline_parse_token_num_t cmd_flow_director_flexpayload_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_flow_director_flexpayload_result,
-                             port_id, UINT8);
+                             port_id, UINT16);
 cmdline_parse_token_string_t cmd_flow_director_flexpayload_payload_layer =
        TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flexpayload_result,
                                 payload_layer, "raw#l2#l3#l4");
@@ -10290,7 +10997,7 @@ extern cmdline_parse_inst_t cmd_flow;
 /* *** Get symmetric hash enable per port *** */
 struct cmd_get_sym_hash_ena_per_port_result {
        cmdline_fixed_string_t get_sym_hash_ena_per_port;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
@@ -10329,7 +11036,7 @@ cmdline_parse_token_string_t cmd_get_sym_hash_ena_per_port_all =
                get_sym_hash_ena_per_port, "get_sym_hash_ena_per_port");
 cmdline_parse_token_num_t cmd_get_sym_hash_ena_per_port_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_get_sym_hash_ena_per_port_result,
-               port_id, UINT8);
+               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_get_sym_hash_ena_per_port = {
        .f = cmd_get_sym_hash_per_port_parsed,
@@ -10346,7 +11053,7 @@ cmdline_parse_inst_t cmd_get_sym_hash_ena_per_port = {
 struct cmd_set_sym_hash_ena_per_port_result {
        cmdline_fixed_string_t set_sym_hash_ena_per_port;
        cmdline_fixed_string_t enable;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static void
@@ -10385,7 +11092,7 @@ cmdline_parse_token_string_t cmd_set_sym_hash_ena_per_port_all =
                set_sym_hash_ena_per_port, "set_sym_hash_ena_per_port");
 cmdline_parse_token_num_t cmd_set_sym_hash_ena_per_port_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_set_sym_hash_ena_per_port_result,
-               port_id, UINT8);
+               port_id, UINT16);
 cmdline_parse_token_string_t cmd_set_sym_hash_ena_per_port_enable =
        TOKEN_STRING_INITIALIZER(struct cmd_set_sym_hash_ena_per_port_result,
                enable, "enable#disable");
@@ -10405,7 +11112,7 @@ cmdline_parse_inst_t cmd_set_sym_hash_ena_per_port = {
 /* Get global config of hash function */
 struct cmd_get_hash_global_config_result {
        cmdline_fixed_string_t get_hash_global_config;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 static char *
@@ -10506,7 +11213,7 @@ cmdline_parse_token_string_t cmd_get_hash_global_config_all =
                get_hash_global_config, "get_hash_global_config");
 cmdline_parse_token_num_t cmd_get_hash_global_config_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_get_hash_global_config_result,
-               port_id, UINT8);
+               port_id, UINT16);
 
 cmdline_parse_inst_t cmd_get_hash_global_config = {
        .f = cmd_get_hash_global_config_parsed,
@@ -10522,7 +11229,7 @@ cmdline_parse_inst_t cmd_get_hash_global_config = {
 /* Set global config of hash function */
 struct cmd_set_hash_global_config_result {
        cmdline_fixed_string_t set_hash_global_config;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t hash_func;
        cmdline_fixed_string_t flow_type;
        cmdline_fixed_string_t enable;
@@ -10578,7 +11285,7 @@ cmdline_parse_token_string_t cmd_set_hash_global_config_all =
                set_hash_global_config, "set_hash_global_config");
 cmdline_parse_token_num_t cmd_set_hash_global_config_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_set_hash_global_config_result,
-               port_id, UINT8);
+               port_id, UINT16);
 cmdline_parse_token_string_t cmd_set_hash_global_config_hash_func =
        TOKEN_STRING_INITIALIZER(struct cmd_set_hash_global_config_result,
                hash_func, "toeplitz#simple_xor#default");
@@ -10612,7 +11319,7 @@ cmdline_parse_inst_t cmd_set_hash_global_config = {
 /* Set hash input set */
 struct cmd_set_hash_input_set_result {
        cmdline_fixed_string_t set_hash_input_set;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t flow_type;
        cmdline_fixed_string_t inset_field;
        cmdline_fixed_string_t select;
@@ -10694,7 +11401,7 @@ cmdline_parse_token_string_t cmd_set_hash_input_set_cmd =
                set_hash_input_set, "set_hash_input_set");
 cmdline_parse_token_num_t cmd_set_hash_input_set_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_set_hash_input_set_result,
-               port_id, UINT8);
+               port_id, UINT16);
 cmdline_parse_token_string_t cmd_set_hash_input_set_flow_type =
        TOKEN_STRING_INITIALIZER(struct cmd_set_hash_input_set_result,
                flow_type, NULL);
@@ -10735,7 +11442,7 @@ cmdline_parse_inst_t cmd_set_hash_input_set = {
 /* Set flow director input set */
 struct cmd_set_fdir_input_set_result {
        cmdline_fixed_string_t set_fdir_input_set;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t flow_type;
        cmdline_fixed_string_t inset_field;
        cmdline_fixed_string_t select;
@@ -10767,7 +11474,7 @@ cmdline_parse_token_string_t cmd_set_fdir_input_set_cmd =
        set_fdir_input_set, "set_fdir_input_set");
 cmdline_parse_token_num_t cmd_set_fdir_input_set_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_set_fdir_input_set_result,
-       port_id, UINT8);
+       port_id, UINT16);
 cmdline_parse_token_string_t cmd_set_fdir_input_set_flow_type =
        TOKEN_STRING_INITIALIZER(struct cmd_set_fdir_input_set_result,
        flow_type,
@@ -10810,7 +11517,7 @@ cmdline_parse_inst_t cmd_set_fdir_input_set = {
 struct cmd_mcast_addr_result {
        cmdline_fixed_string_t mcast_addr_cmd;
        cmdline_fixed_string_t what;
-       uint8_t port_num;
+       uint16_t port_num;
        struct ether_addr mc_addr;
 };
 
@@ -10840,7 +11547,7 @@ cmdline_parse_token_string_t cmd_mcast_addr_what =
        TOKEN_STRING_INITIALIZER(struct cmd_mcast_addr_result, what,
                                 "add#remove");
 cmdline_parse_token_num_t cmd_mcast_addr_portnum =
-       TOKEN_NUM_INITIALIZER(struct cmd_mcast_addr_result, port_num, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_mcast_addr_result, port_num, UINT16);
 cmdline_parse_token_etheraddr_t cmd_mcast_addr_addr =
        TOKEN_ETHERADDR_INITIALIZER(struct cmd_mac_addr_result, address);
 
@@ -11144,7 +11851,7 @@ struct cmd_config_e_tag_result {
        cmdline_fixed_string_t dst_pool;
        uint8_t dst_pool_val;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t vf;
        uint8_t vf_id;
 };
@@ -11225,7 +11932,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_port =
 cmdline_parse_token_num_t cmd_config_e_tag_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_config_e_tag_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_string_t cmd_config_e_tag_vf =
        TOKEN_STRING_INITIALIZER
                (struct cmd_config_e_tag_result,
@@ -11527,7 +12234,7 @@ struct cmd_vf_vlan_anti_spoof_result {
        cmdline_fixed_string_t vf;
        cmdline_fixed_string_t vlan;
        cmdline_fixed_string_t antispoof;
-       uint8_t port_id;
+       portid_t port_id;
        uint32_t vf_id;
        cmdline_fixed_string_t on_off;
 };
@@ -11552,7 +12259,7 @@ cmdline_parse_token_string_t cmd_vf_vlan_anti_spoof_antispoof =
 cmdline_parse_token_num_t cmd_vf_vlan_anti_spoof_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_vlan_anti_spoof_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_num_t cmd_vf_vlan_anti_spoof_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_vlan_anti_spoof_result,
@@ -11633,7 +12340,7 @@ struct cmd_vf_mac_anti_spoof_result {
        cmdline_fixed_string_t vf;
        cmdline_fixed_string_t mac;
        cmdline_fixed_string_t antispoof;
-       uint8_t port_id;
+       portid_t port_id;
        uint32_t vf_id;
        cmdline_fixed_string_t on_off;
 };
@@ -11658,7 +12365,7 @@ cmdline_parse_token_string_t cmd_vf_mac_anti_spoof_antispoof =
 cmdline_parse_token_num_t cmd_vf_mac_anti_spoof_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_mac_anti_spoof_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_num_t cmd_vf_mac_anti_spoof_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_mac_anti_spoof_result,
@@ -11764,7 +12471,7 @@ cmdline_parse_token_string_t cmd_vf_vlan_stripq_stripq =
 cmdline_parse_token_num_t cmd_vf_vlan_stripq_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_vlan_stripq_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_num_t cmd_vf_vlan_stripq_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_vlan_stripq_result,
@@ -11845,7 +12552,7 @@ struct cmd_vf_vlan_insert_result {
        cmdline_fixed_string_t vf;
        cmdline_fixed_string_t vlan;
        cmdline_fixed_string_t insert;
-       uint8_t port_id;
+       portid_t port_id;
        uint16_t vf_id;
        uint16_t vlan_id;
 };
@@ -11870,7 +12577,7 @@ cmdline_parse_token_string_t cmd_vf_vlan_insert_insert =
 cmdline_parse_token_num_t cmd_vf_vlan_insert_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_vlan_insert_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_num_t cmd_vf_vlan_insert_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_vlan_insert_result,
@@ -11948,7 +12655,7 @@ struct cmd_tx_loopback_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t tx;
        cmdline_fixed_string_t loopback;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t on_off;
 };
 
@@ -11968,7 +12675,7 @@ cmdline_parse_token_string_t cmd_tx_loopback_loopback =
 cmdline_parse_token_num_t cmd_tx_loopback_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_tx_loopback_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_string_t cmd_tx_loopback_on_off =
        TOKEN_STRING_INITIALIZER
                (struct cmd_tx_loopback_result,
@@ -12040,7 +12747,7 @@ struct cmd_all_queues_drop_en_result {
        cmdline_fixed_string_t all;
        cmdline_fixed_string_t queues;
        cmdline_fixed_string_t drop;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t on_off;
 };
 
@@ -12064,7 +12771,7 @@ cmdline_parse_token_string_t cmd_all_queues_drop_en_drop =
 cmdline_parse_token_num_t cmd_all_queues_drop_en_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_all_queues_drop_en_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_string_t cmd_all_queues_drop_en_on_off =
        TOKEN_STRING_INITIALIZER
                (struct cmd_all_queues_drop_en_result,
@@ -12131,7 +12838,7 @@ struct cmd_vf_split_drop_en_result {
        cmdline_fixed_string_t vf;
        cmdline_fixed_string_t split;
        cmdline_fixed_string_t drop;
-       uint8_t port_id;
+       portid_t port_id;
        uint16_t vf_id;
        cmdline_fixed_string_t on_off;
 };
@@ -12156,7 +12863,7 @@ cmdline_parse_token_string_t cmd_vf_split_drop_en_drop =
 cmdline_parse_token_num_t cmd_vf_split_drop_en_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_split_drop_en_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_num_t cmd_vf_split_drop_en_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_split_drop_en_result,
@@ -12224,7 +12931,7 @@ struct cmd_set_vf_mac_addr_result {
        cmdline_fixed_string_t vf;
        cmdline_fixed_string_t mac;
        cmdline_fixed_string_t addr;
-       uint8_t port_id;
+       portid_t port_id;
        uint16_t vf_id;
        struct ether_addr mac_addr;
 
@@ -12250,7 +12957,7 @@ cmdline_parse_token_string_t cmd_set_vf_mac_addr_addr =
 cmdline_parse_token_num_t cmd_set_vf_mac_addr_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_set_vf_mac_addr_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_num_t cmd_set_vf_mac_addr_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_set_vf_mac_addr_result,
@@ -12327,7 +13034,7 @@ struct cmd_macsec_offload_on_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t macsec;
        cmdline_fixed_string_t offload;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t on;
        cmdline_fixed_string_t encrypt;
        cmdline_fixed_string_t en_on_off;
@@ -12351,7 +13058,7 @@ cmdline_parse_token_string_t cmd_macsec_offload_on_offload =
 cmdline_parse_token_num_t cmd_macsec_offload_on_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_macsec_offload_on_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_string_t cmd_macsec_offload_on_on =
        TOKEN_STRING_INITIALIZER
                (struct cmd_macsec_offload_on_result,
@@ -12387,8 +13094,13 @@ cmd_set_macsec_offload_on_parsed(
 
        if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
+       if (!port_is_stopped(port_id)) {
+               printf("Please stop port %d first\n", port_id);
+               return;
+       }
 
        ports[port_id].tx_ol_flags |= TESTPMD_TX_OFFLOAD_MACSEC;
+       ports[port_id].dev_conf.txmode.offloads |= DEV_TX_OFFLOAD_MACSEC_INSERT;
 #ifdef RTE_LIBRTE_IXGBE_PMD
        ret = rte_pmd_ixgbe_macsec_enable(port_id, en, rp);
 #endif
@@ -12397,6 +13109,7 @@ cmd_set_macsec_offload_on_parsed(
 
        switch (ret) {
        case 0:
+               cmd_reconfig_device_queue(port_id, 1, 1);
                break;
        case -ENODEV:
                printf("invalid port_id %d\n", port_id);
@@ -12433,7 +13146,7 @@ struct cmd_macsec_offload_off_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t macsec;
        cmdline_fixed_string_t offload;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t off;
 };
 
@@ -12453,7 +13166,7 @@ cmdline_parse_token_string_t cmd_macsec_offload_off_offload =
 cmdline_parse_token_num_t cmd_macsec_offload_off_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_macsec_offload_off_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_string_t cmd_macsec_offload_off_off =
        TOKEN_STRING_INITIALIZER
                (struct cmd_macsec_offload_off_result,
@@ -12471,14 +13184,21 @@ cmd_set_macsec_offload_off_parsed(
 
        if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
+       if (!port_is_stopped(port_id)) {
+               printf("Please stop port %d first\n", port_id);
+               return;
+       }
 
        ports[port_id].tx_ol_flags &= ~TESTPMD_TX_OFFLOAD_MACSEC;
+       ports[port_id].dev_conf.txmode.offloads &=
+                                       ~DEV_TX_OFFLOAD_MACSEC_INSERT;
 #ifdef RTE_LIBRTE_IXGBE_PMD
        ret = rte_pmd_ixgbe_macsec_disable(port_id);
 #endif
 
        switch (ret) {
        case 0:
+               cmd_reconfig_device_queue(port_id, 1, 1);
                break;
        case -ENODEV:
                printf("invalid port_id %d\n", port_id);
@@ -12511,7 +13231,7 @@ struct cmd_macsec_sc_result {
        cmdline_fixed_string_t macsec;
        cmdline_fixed_string_t sc;
        cmdline_fixed_string_t tx_rx;
-       uint8_t port_id;
+       portid_t port_id;
        struct ether_addr mac;
        uint16_t pi;
 };
@@ -12536,7 +13256,7 @@ cmdline_parse_token_string_t cmd_macsec_sc_tx_rx =
 cmdline_parse_token_num_t cmd_macsec_sc_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_macsec_sc_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_etheraddr_t cmd_macsec_sc_mac =
        TOKEN_ETHERADDR_INITIALIZER
                (struct cmd_macsec_sc_result,
@@ -12601,7 +13321,7 @@ struct cmd_macsec_sa_result {
        cmdline_fixed_string_t macsec;
        cmdline_fixed_string_t sa;
        cmdline_fixed_string_t tx_rx;
-       uint8_t port_id;
+       portid_t port_id;
        uint8_t idx;
        uint8_t an;
        uint32_t pn;
@@ -12628,7 +13348,7 @@ cmdline_parse_token_string_t cmd_macsec_sa_tx_rx =
 cmdline_parse_token_num_t cmd_macsec_sa_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_macsec_sa_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_num_t cmd_macsec_sa_idx =
        TOKEN_NUM_INITIALIZER
                (struct cmd_macsec_sa_result,
@@ -12727,7 +13447,7 @@ struct cmd_vf_promisc_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t vf;
        cmdline_fixed_string_t promisc;
-       uint8_t port_id;
+       portid_t port_id;
        uint32_t vf_id;
        cmdline_fixed_string_t on_off;
 };
@@ -12748,7 +13468,7 @@ cmdline_parse_token_string_t cmd_vf_promisc_promisc =
 cmdline_parse_token_num_t cmd_vf_promisc_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_promisc_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_num_t cmd_vf_promisc_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_promisc_result,
@@ -12817,7 +13537,7 @@ struct cmd_vf_allmulti_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t vf;
        cmdline_fixed_string_t allmulti;
-       uint8_t port_id;
+       portid_t port_id;
        uint32_t vf_id;
        cmdline_fixed_string_t on_off;
 };
@@ -12838,7 +13558,7 @@ cmdline_parse_token_string_t cmd_vf_allmulti_allmulti =
 cmdline_parse_token_num_t cmd_vf_allmulti_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_allmulti_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_num_t cmd_vf_allmulti_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_allmulti_result,
@@ -12907,7 +13627,7 @@ struct cmd_set_vf_broadcast_result {
        cmdline_fixed_string_t set;
        cmdline_fixed_string_t vf;
        cmdline_fixed_string_t broadcast;
-       uint8_t port_id;
+       portid_t port_id;
        uint16_t vf_id;
        cmdline_fixed_string_t on_off;
 };
@@ -12928,7 +13648,7 @@ cmdline_parse_token_string_t cmd_set_vf_broadcast_broadcast =
 cmdline_parse_token_num_t cmd_set_vf_broadcast_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_set_vf_broadcast_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_num_t cmd_set_vf_broadcast_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_set_vf_broadcast_result,
@@ -12997,7 +13717,7 @@ struct cmd_set_vf_vlan_tag_result {
        cmdline_fixed_string_t vf;
        cmdline_fixed_string_t vlan;
        cmdline_fixed_string_t tag;
-       uint8_t port_id;
+       portid_t port_id;
        uint16_t vf_id;
        cmdline_fixed_string_t on_off;
 };
@@ -13022,7 +13742,7 @@ cmdline_parse_token_string_t cmd_set_vf_vlan_tag_tag =
 cmdline_parse_token_num_t cmd_set_vf_vlan_tag_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_set_vf_vlan_tag_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_num_t cmd_set_vf_vlan_tag_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_set_vf_vlan_tag_result,
@@ -13093,7 +13813,7 @@ struct cmd_vf_tc_bw_result {
        cmdline_fixed_string_t min_bw;
        cmdline_fixed_string_t max_bw;
        cmdline_fixed_string_t strict_link_prio;
-       uint8_t port_id;
+       portid_t port_id;
        uint16_t vf_id;
        uint8_t tc_no;
        uint32_t bw;
@@ -13132,7 +13852,7 @@ cmdline_parse_token_string_t cmd_vf_tc_bw_max_bw =
 cmdline_parse_token_num_t cmd_vf_tc_bw_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_tc_bw_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_num_t cmd_vf_tc_bw_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_vf_tc_bw_result,
@@ -13424,6 +14144,86 @@ cmdline_parse_inst_t cmd_vf_tc_max_bw = {
        },
 };
 
+
+#if defined RTE_LIBRTE_PMD_SOFTNIC && defined RTE_LIBRTE_SCHED
+
+/* *** Set Port default Traffic Management Hierarchy *** */
+struct cmd_set_port_tm_hierarchy_default_result {
+       cmdline_fixed_string_t set;
+       cmdline_fixed_string_t port;
+       cmdline_fixed_string_t tm;
+       cmdline_fixed_string_t hierarchy;
+       cmdline_fixed_string_t def;
+       portid_t port_id;
+};
+
+cmdline_parse_token_string_t cmd_set_port_tm_hierarchy_default_set =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_set_port_tm_hierarchy_default_result, set, "set");
+cmdline_parse_token_string_t cmd_set_port_tm_hierarchy_default_port =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_set_port_tm_hierarchy_default_result, port, "port");
+cmdline_parse_token_string_t cmd_set_port_tm_hierarchy_default_tm =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_set_port_tm_hierarchy_default_result, tm, "tm");
+cmdline_parse_token_string_t cmd_set_port_tm_hierarchy_default_hierarchy =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_set_port_tm_hierarchy_default_result,
+                       hierarchy, "hierarchy");
+cmdline_parse_token_string_t cmd_set_port_tm_hierarchy_default_default =
+       TOKEN_STRING_INITIALIZER(
+               struct cmd_set_port_tm_hierarchy_default_result,
+                       def, "default");
+cmdline_parse_token_num_t cmd_set_port_tm_hierarchy_default_port_id =
+       TOKEN_NUM_INITIALIZER(
+               struct cmd_set_port_tm_hierarchy_default_result,
+                       port_id, UINT16);
+
+static void cmd_set_port_tm_hierarchy_default_parsed(void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_set_port_tm_hierarchy_default_result *res = parsed_result;
+       struct rte_port *p;
+       portid_t port_id = res->port_id;
+
+       if (port_id_is_invalid(port_id, ENABLED_WARN))
+               return;
+
+       p = &ports[port_id];
+
+       /* Port tm flag */
+       if (p->softport.tm_flag == 0) {
+               printf("  tm not enabled on port %u (error)\n", port_id);
+               return;
+       }
+
+       /* Forward mode: tm */
+       if (strcmp(cur_fwd_config.fwd_eng->fwd_mode_name, "tm")) {
+               printf("  tm mode not enabled(error)\n");
+               return;
+       }
+
+       /* Set the default tm hierarchy */
+       p->softport.tm.default_hierarchy_enable = 1;
+}
+
+cmdline_parse_inst_t cmd_set_port_tm_hierarchy_default = {
+       .f = cmd_set_port_tm_hierarchy_default_parsed,
+       .data = NULL,
+       .help_str = "set port tm hierarchy default <port_id>",
+       .tokens = {
+               (void *)&cmd_set_port_tm_hierarchy_default_set,
+               (void *)&cmd_set_port_tm_hierarchy_default_port,
+               (void *)&cmd_set_port_tm_hierarchy_default_tm,
+               (void *)&cmd_set_port_tm_hierarchy_default_hierarchy,
+               (void *)&cmd_set_port_tm_hierarchy_default_default,
+               (void *)&cmd_set_port_tm_hierarchy_default_port_id,
+               NULL,
+       },
+};
+#endif
+
 /* Strict link priority scheduling mode setting */
 static void
 cmd_strict_link_prio_parsed(
@@ -13476,7 +14276,7 @@ cmdline_parse_inst_t cmd_strict_link_prio = {
 struct cmd_ddp_add_result {
        cmdline_fixed_string_t ddp;
        cmdline_fixed_string_t add;
-       uint8_t port_id;
+       portid_t port_id;
        char filepath[];
 };
 
@@ -13485,7 +14285,7 @@ cmdline_parse_token_string_t cmd_ddp_add_ddp =
 cmdline_parse_token_string_t cmd_ddp_add_add =
        TOKEN_STRING_INITIALIZER(struct cmd_ddp_add_result, add, "add");
 cmdline_parse_token_num_t cmd_ddp_add_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_ddp_add_result, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_ddp_add_result, port_id, UINT16);
 cmdline_parse_token_string_t cmd_ddp_add_filepath =
        TOKEN_STRING_INITIALIZER(struct cmd_ddp_add_result, filepath, NULL);
 
@@ -13561,7 +14361,7 @@ cmdline_parse_inst_t cmd_ddp_add = {
 struct cmd_ddp_del_result {
        cmdline_fixed_string_t ddp;
        cmdline_fixed_string_t del;
-       uint8_t port_id;
+       portid_t port_id;
        char filepath[];
 };
 
@@ -13570,7 +14370,7 @@ cmdline_parse_token_string_t cmd_ddp_del_ddp =
 cmdline_parse_token_string_t cmd_ddp_del_del =
        TOKEN_STRING_INITIALIZER(struct cmd_ddp_del_result, del, "del");
 cmdline_parse_token_num_t cmd_ddp_del_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_ddp_del_result, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_ddp_del_result, port_id, UINT16);
 cmdline_parse_token_string_t cmd_ddp_del_filepath =
        TOKEN_STRING_INITIALIZER(struct cmd_ddp_del_result, filepath, NULL);
 
@@ -13662,7 +14462,7 @@ cmd_ddp_info_parsed(
        uint32_t dev_num = 0;
        struct rte_pmd_i40e_ddp_device_id *devs;
        uint32_t proto_num = 0;
-       struct rte_pmd_i40e_proto_info *proto;
+       struct rte_pmd_i40e_proto_info *proto = NULL;
        uint32_t pctype_num = 0;
        struct rte_pmd_i40e_ptype_info *pctype;
        uint32_t ptype_num = 0;
@@ -13841,9 +14641,10 @@ no_print_pctypes:
        free(ptype);
        printf("\n");
 
-       free(proto);
        ret = 0;
 no_print_return:
+       if (proto)
+               free(proto);
 #endif
        if (ret == -ENOTSUP)
                printf("Function not supported in PMD driver\n");
@@ -13871,7 +14672,7 @@ struct cmd_ddp_get_list_result {
        cmdline_fixed_string_t ddp;
        cmdline_fixed_string_t get;
        cmdline_fixed_string_t list;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 cmdline_parse_token_string_t cmd_ddp_get_list_ddp =
@@ -13881,7 +14682,7 @@ cmdline_parse_token_string_t cmd_ddp_get_list_get =
 cmdline_parse_token_string_t cmd_ddp_get_list_list =
        TOKEN_STRING_INITIALIZER(struct cmd_ddp_get_list_result, list, "list");
 cmdline_parse_token_num_t cmd_ddp_get_list_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_ddp_get_list_result, port_id, UINT8);
+       TOKEN_NUM_INITIALIZER(struct cmd_ddp_get_list_result, port_id, UINT16);
 
 static void
 cmd_ddp_get_list_parsed(
@@ -13958,7 +14759,7 @@ struct cmd_show_vf_stats_result {
        cmdline_fixed_string_t show;
        cmdline_fixed_string_t vf;
        cmdline_fixed_string_t stats;
-       uint8_t port_id;
+       portid_t port_id;
        uint16_t vf_id;
 };
 
@@ -13978,7 +14779,7 @@ cmdline_parse_token_string_t cmd_show_vf_stats_stats =
 cmdline_parse_token_num_t cmd_show_vf_stats_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_show_vf_stats_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_num_t cmd_show_vf_stats_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_show_vf_stats_result,
@@ -14067,7 +14868,7 @@ struct cmd_clear_vf_stats_result {
        cmdline_fixed_string_t clear;
        cmdline_fixed_string_t vf;
        cmdline_fixed_string_t stats;
-       uint8_t port_id;
+       portid_t port_id;
        uint16_t vf_id;
 };
 
@@ -14087,7 +14888,7 @@ cmdline_parse_token_string_t cmd_clear_vf_stats_stats =
 cmdline_parse_token_num_t cmd_clear_vf_stats_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_clear_vf_stats_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_num_t cmd_clear_vf_stats_vf_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_clear_vf_stats_result,
@@ -14153,7 +14954,7 @@ cmdline_parse_inst_t cmd_clear_vf_stats = {
 struct cmd_pctype_mapping_reset_result {
        cmdline_fixed_string_t port;
        cmdline_fixed_string_t config;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t pctype;
        cmdline_fixed_string_t mapping;
        cmdline_fixed_string_t reset;
@@ -14171,7 +14972,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_reset_config =
 cmdline_parse_token_num_t cmd_pctype_mapping_reset_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_pctype_mapping_reset_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_string_t cmd_pctype_mapping_reset_pctype =
        TOKEN_STRING_INITIALIZER
                (struct cmd_pctype_mapping_reset_result,
@@ -14236,7 +15037,7 @@ cmdline_parse_inst_t cmd_pctype_mapping_reset = {
 struct cmd_pctype_mapping_get_result {
        cmdline_fixed_string_t show;
        cmdline_fixed_string_t port;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t pctype;
        cmdline_fixed_string_t mapping;
 };
@@ -14253,7 +15054,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_get_port =
 cmdline_parse_token_num_t cmd_pctype_mapping_get_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_pctype_mapping_get_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_string_t cmd_pctype_mapping_get_pctype =
        TOKEN_STRING_INITIALIZER
                (struct cmd_pctype_mapping_get_result,
@@ -14337,7 +15138,7 @@ cmdline_parse_inst_t cmd_pctype_mapping_get = {
 struct cmd_pctype_mapping_update_result {
        cmdline_fixed_string_t port;
        cmdline_fixed_string_t config;
-       uint8_t port_id;
+       portid_t port_id;
        cmdline_fixed_string_t pctype;
        cmdline_fixed_string_t mapping;
        cmdline_fixed_string_t update;
@@ -14357,7 +15158,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_update_config =
 cmdline_parse_token_num_t cmd_pctype_mapping_update_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_pctype_mapping_update_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_string_t cmd_pctype_mapping_update_pctype =
        TOKEN_STRING_INITIALIZER
                (struct cmd_pctype_mapping_update_result,
@@ -14451,7 +15252,7 @@ struct cmd_ptype_mapping_get_result {
        cmdline_fixed_string_t ptype;
        cmdline_fixed_string_t mapping;
        cmdline_fixed_string_t get;
-       uint8_t port_id;
+       portid_t port_id;
        uint8_t valid_only;
 };
 
@@ -14471,7 +15272,7 @@ cmdline_parse_token_string_t cmd_ptype_mapping_get_get =
 cmdline_parse_token_num_t cmd_ptype_mapping_get_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_ptype_mapping_get_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_num_t cmd_ptype_mapping_get_valid_only =
        TOKEN_NUM_INITIALIZER
                (struct cmd_ptype_mapping_get_result,
@@ -14546,7 +15347,7 @@ struct cmd_ptype_mapping_replace_result {
        cmdline_fixed_string_t ptype;
        cmdline_fixed_string_t mapping;
        cmdline_fixed_string_t replace;
-       uint8_t port_id;
+       portid_t port_id;
        uint32_t target;
        uint8_t mask;
        uint32_t pkt_type;
@@ -14568,7 +15369,7 @@ cmdline_parse_token_string_t cmd_ptype_mapping_replace_replace =
 cmdline_parse_token_num_t cmd_ptype_mapping_replace_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_ptype_mapping_replace_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_num_t cmd_ptype_mapping_replace_target =
        TOKEN_NUM_INITIALIZER
                (struct cmd_ptype_mapping_replace_result,
@@ -14643,7 +15444,7 @@ struct cmd_ptype_mapping_reset_result {
        cmdline_fixed_string_t ptype;
        cmdline_fixed_string_t mapping;
        cmdline_fixed_string_t reset;
-       uint8_t port_id;
+       portid_t port_id;
 };
 
 /* Common CLI fields for ptype mapping reset*/
@@ -14662,7 +15463,7 @@ cmdline_parse_token_string_t cmd_ptype_mapping_reset_reset =
 cmdline_parse_token_num_t cmd_ptype_mapping_reset_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_ptype_mapping_reset_result,
-                port_id, UINT8);
+                port_id, UINT16);
 
 static void
 cmd_ptype_mapping_reset_parsed(
@@ -14714,7 +15515,7 @@ struct cmd_ptype_mapping_update_result {
        cmdline_fixed_string_t ptype;
        cmdline_fixed_string_t mapping;
        cmdline_fixed_string_t reset;
-       uint8_t port_id;
+       portid_t port_id;
        uint8_t hw_ptype;
        uint32_t sw_ptype;
 };
@@ -14735,7 +15536,7 @@ cmdline_parse_token_string_t cmd_ptype_mapping_update_update =
 cmdline_parse_token_num_t cmd_ptype_mapping_update_port_id =
        TOKEN_NUM_INITIALIZER
                (struct cmd_ptype_mapping_update_result,
-                port_id, UINT8);
+                port_id, UINT16);
 cmdline_parse_token_num_t cmd_ptype_mapping_update_hw_ptype =
        TOKEN_NUM_INITIALIZER
                (struct cmd_ptype_mapping_update_result,
@@ -14925,6 +15726,7 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_stop,
        (cmdline_parse_inst_t *)&cmd_mac_addr,
        (cmdline_parse_inst_t *)&cmd_set_qmap,
+       (cmdline_parse_inst_t *)&cmd_set_xstats_hide_zero,
        (cmdline_parse_inst_t *)&cmd_operate_port,
        (cmdline_parse_inst_t *)&cmd_operate_specific_port,
        (cmdline_parse_inst_t *)&cmd_operate_attach_port,
@@ -14983,6 +15785,19 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_set_hash_input_set,
        (cmdline_parse_inst_t *)&cmd_set_fdir_input_set,
        (cmdline_parse_inst_t *)&cmd_flow,
+       (cmdline_parse_inst_t *)&cmd_show_port_meter_cap,
+       (cmdline_parse_inst_t *)&cmd_add_port_meter_profile_srtcm,
+       (cmdline_parse_inst_t *)&cmd_add_port_meter_profile_trtcm,
+       (cmdline_parse_inst_t *)&cmd_del_port_meter_profile,
+       (cmdline_parse_inst_t *)&cmd_create_port_meter,
+       (cmdline_parse_inst_t *)&cmd_enable_port_meter,
+       (cmdline_parse_inst_t *)&cmd_disable_port_meter,
+       (cmdline_parse_inst_t *)&cmd_del_port_meter,
+       (cmdline_parse_inst_t *)&cmd_set_port_meter_profile,
+       (cmdline_parse_inst_t *)&cmd_set_port_meter_dscp_table,
+       (cmdline_parse_inst_t *)&cmd_set_port_meter_policer_action,
+       (cmdline_parse_inst_t *)&cmd_set_port_meter_stats_mask,
+       (cmdline_parse_inst_t *)&cmd_show_port_meter_stats,
        (cmdline_parse_inst_t *)&cmd_mcast_addr,
        (cmdline_parse_inst_t *)&cmd_config_l2_tunnel_eth_type_all,
        (cmdline_parse_inst_t *)&cmd_config_l2_tunnel_eth_type_specific,
@@ -15019,6 +15834,9 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_vf_tc_max_bw,
        (cmdline_parse_inst_t *)&cmd_strict_link_prio,
        (cmdline_parse_inst_t *)&cmd_tc_min_bw,
+#if defined RTE_LIBRTE_PMD_SOFTNIC && defined RTE_LIBRTE_SCHED
+       (cmdline_parse_inst_t *)&cmd_set_port_tm_hierarchy_default,
+#endif
        (cmdline_parse_inst_t *)&cmd_ddp_add,
        (cmdline_parse_inst_t *)&cmd_ddp_del,
        (cmdline_parse_inst_t *)&cmd_ddp_get_list,
@@ -15033,6 +15851,28 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_pctype_mapping_get,
        (cmdline_parse_inst_t *)&cmd_pctype_mapping_reset,
        (cmdline_parse_inst_t *)&cmd_pctype_mapping_update,
+       (cmdline_parse_inst_t *)&cmd_queue_region,
+       (cmdline_parse_inst_t *)&cmd_region_flowtype,
+       (cmdline_parse_inst_t *)&cmd_user_priority_region,
+       (cmdline_parse_inst_t *)&cmd_flush_queue_region,
+       (cmdline_parse_inst_t *)&cmd_show_queue_region_info_all,
+       (cmdline_parse_inst_t *)&cmd_show_port_tm_cap,
+       (cmdline_parse_inst_t *)&cmd_show_port_tm_level_cap,
+       (cmdline_parse_inst_t *)&cmd_show_port_tm_node_cap,
+       (cmdline_parse_inst_t *)&cmd_show_port_tm_node_type,
+       (cmdline_parse_inst_t *)&cmd_show_port_tm_node_stats,
+       (cmdline_parse_inst_t *)&cmd_add_port_tm_node_shaper_profile,
+       (cmdline_parse_inst_t *)&cmd_del_port_tm_node_shaper_profile,
+       (cmdline_parse_inst_t *)&cmd_add_port_tm_node_shared_shaper,
+       (cmdline_parse_inst_t *)&cmd_del_port_tm_node_shared_shaper,
+       (cmdline_parse_inst_t *)&cmd_add_port_tm_node_wred_profile,
+       (cmdline_parse_inst_t *)&cmd_del_port_tm_node_wred_profile,
+       (cmdline_parse_inst_t *)&cmd_set_port_tm_node_shaper_profile,
+       (cmdline_parse_inst_t *)&cmd_add_port_tm_nonleaf_node,
+       (cmdline_parse_inst_t *)&cmd_add_port_tm_leaf_node,
+       (cmdline_parse_inst_t *)&cmd_del_port_tm_node,
+       (cmdline_parse_inst_t *)&cmd_set_port_tm_node_parent,
+       (cmdline_parse_inst_t *)&cmd_port_tm_hierarchy_commit,
        NULL,
 };