app/testpmd: add commands traffic metering and policing

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

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index f996ee3..130de92 100644 (file)
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -99,6 +99,7 @@
 #include <rte_pmd_bnxt.h>
 #endif
 #include "testpmd.h"
+#include "cmdline_mtr.h"
 
 static struct cmdline *testpmd_cl;
 
@@ -234,6 +235,8 @@ 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"
                );
        }
 
@@ -660,6 +663,51 @@ 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"
+
+                       "add port meter profile srtcm_rfc2697 (port_id) (profile_id) (cir) (cbs) (ebs) (color_aware)\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"
+
+                       "set port meter (port_id) (mtr_id) (profile_id) (g_action) (y_action) (r_action) (stats_mask) (shared)\n"
+                       "    meter create\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 policer action (port_id) (mtr_id) (color) (action)\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"
+
                        , list_pkt_forwarding_modes()
                );
        }
@@ -1123,7 +1171,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,
@@ -1146,7 +1194,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,
@@ -1525,7 +1573,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;
 };
 
@@ -1553,7 +1601,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);
 
@@ -1807,7 +1855,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;
@@ -1889,7 +1937,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");
@@ -1924,7 +1972,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;
@@ -1992,7 +2040,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 =
@@ -2019,7 +2067,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;
@@ -2128,7 +2176,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 =
@@ -2155,7 +2203,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;
@@ -2236,7 +2284,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 =
@@ -2267,7 +2315,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 */
@@ -2288,7 +2336,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");
@@ -2340,7 +2388,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;
@@ -2406,7 +2454,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 =
@@ -3043,7 +3091,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
@@ -3070,7 +3118,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,
@@ -3196,7 +3244,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
@@ -3258,7 +3306,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
@@ -3285,7 +3333,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,
@@ -3306,7 +3354,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;
 };
 
@@ -3328,7 +3376,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);
@@ -3352,7 +3400,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;
 };
@@ -3375,7 +3423,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);
@@ -3404,7 +3452,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;
 };
@@ -3433,7 +3481,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);
@@ -3460,7 +3508,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
@@ -3481,7 +3529,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,
@@ -3503,7 +3551,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
@@ -3608,7 +3656,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,
@@ -3647,7 +3695,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
@@ -3681,7 +3729,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,
@@ -3702,7 +3750,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
@@ -3745,7 +3793,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,
@@ -3785,11 +3833,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;
 
@@ -3862,7 +3910,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,
@@ -4292,7 +4340,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
@@ -4335,7 +4383,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,
@@ -4360,7 +4408,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
@@ -4441,7 +4489,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,
@@ -4529,7 +4577,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
@@ -4608,7 +4656,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,
@@ -4631,7 +4679,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,
@@ -4660,7 +4708,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,
@@ -4683,7 +4731,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;
 };
 
@@ -4734,7 +4782,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");
@@ -4761,7 +4809,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;
 };
 
@@ -4802,7 +4850,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");
@@ -4950,7 +4998,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,
@@ -4971,8 +5019,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,
@@ -5003,10 +5051,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,
@@ -5028,8 +5076,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,
@@ -5061,10 +5109,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,
@@ -5086,8 +5134,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,
@@ -5119,10 +5167,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,
@@ -5219,7 +5267,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;
 };
 
@@ -5249,7 +5297,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);
 
@@ -5273,7 +5322,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;
 };
 
@@ -5307,7 +5356,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);
@@ -5332,7 +5381,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;
 };
 
@@ -5375,7 +5424,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(
@@ -5589,7 +5638,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;
 };
 
@@ -5669,7 +5718,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;
 };
 
@@ -5713,7 +5762,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");
@@ -5765,7 +5814,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 =
@@ -5824,7 +5873,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
@@ -6063,7 +6112,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
@@ -6131,7 +6180,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,
@@ -6289,7 +6338,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 =
@@ -6300,7 +6349,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,
@@ -6328,7 +6377,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 =
@@ -6339,7 +6388,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,
@@ -6479,7 +6528,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,
@@ -6517,7 +6566,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,
@@ -6539,7 +6588,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;
 };
 
@@ -6563,7 +6612,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);
 
@@ -6585,7 +6634,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;
 };
 
@@ -6603,7 +6652,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);
 
@@ -6624,7 +6673,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;
@@ -6648,7 +6697,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);
@@ -6679,7 +6728,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;
 };
@@ -6699,7 +6748,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 =
@@ -6723,7 +6772,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;
 };
@@ -6742,7 +6791,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 =
@@ -6766,7 +6815,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;
@@ -6791,7 +6840,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);
@@ -6827,7 +6876,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;
@@ -6849,7 +6898,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 =
@@ -6877,7 +6926,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;
 };
@@ -6901,7 +6950,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 =
@@ -6951,7 +7000,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;
 };
 
@@ -6983,7 +7032,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);
 
@@ -7007,7 +7057,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;
 };
@@ -7034,7 +7084,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);
@@ -7062,7 +7112,7 @@ cmdline_parse_inst_t cmd_set_qmap = {
 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;
@@ -7094,7 +7144,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");
@@ -7123,7 +7173,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;
@@ -7155,7 +7205,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");
@@ -7185,7 +7235,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;
@@ -7247,7 +7297,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");
@@ -7289,7 +7339,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;
@@ -7316,7 +7366,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");
@@ -7350,7 +7400,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;
@@ -7402,7 +7452,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");
@@ -7442,7 +7492,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;
@@ -7485,7 +7535,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");
@@ -7519,7 +7569,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;
 };
@@ -7582,7 +7632,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");
@@ -7611,7 +7661,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;
@@ -7643,7 +7693,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");
@@ -7678,7 +7728,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;
@@ -7713,7 +7763,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");
@@ -7757,7 +7807,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;
@@ -7851,7 +7901,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);
@@ -7907,7 +7957,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
@@ -7946,7 +7996,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,
@@ -7965,7 +8015,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;
 };
@@ -7992,7 +8042,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");
@@ -8017,7 +8068,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;
@@ -8035,7 +8086,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");
@@ -8133,7 +8184,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;
@@ -8150,7 +8201,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");
@@ -8223,7 +8274,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;
 };
@@ -8236,7 +8287,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");
@@ -8381,7 +8432,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;
@@ -8435,7 +8486,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");
@@ -8469,10 +8520,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;
@@ -8551,7 +9044,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");
@@ -8621,7 +9114,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;
@@ -8730,7 +9223,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");
@@ -8826,7 +9319,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;
@@ -8953,7 +9446,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");
@@ -9016,7 +9509,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;
@@ -9032,7 +9525,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");
@@ -9125,7 +9618,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;
@@ -9476,7 +9969,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");
@@ -9801,7 +10294,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 =
@@ -9809,7 +10302,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,
@@ -9848,7 +10341,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;
@@ -9932,7 +10425,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");
@@ -10060,7 +10553,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;
@@ -10152,7 +10645,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");
@@ -10182,7 +10675,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;
 };
@@ -10275,7 +10768,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");
@@ -10304,7 +10797,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
@@ -10343,7 +10836,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,
@@ -10360,7 +10853,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
@@ -10399,7 +10892,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");
@@ -10419,7 +10912,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 *
@@ -10520,7 +11013,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,
@@ -10536,7 +11029,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;
@@ -10592,7 +11085,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");
@@ -10626,7 +11119,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;
@@ -10708,7 +11201,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);
@@ -10749,7 +11242,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;
@@ -10781,7 +11274,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,
@@ -10824,7 +11317,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;
 };
 
@@ -10854,7 +11347,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);
 
@@ -11158,7 +11651,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;
 };
@@ -11239,7 +11732,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,
@@ -11541,7 +12034,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;
 };
@@ -11566,7 +12059,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,
@@ -11647,7 +12140,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;
 };
@@ -11672,7 +12165,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,
@@ -11778,7 +12271,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,
@@ -11859,7 +12352,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;
 };
@@ -11884,7 +12377,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,
@@ -11962,7 +12455,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;
 };
 
@@ -11982,7 +12475,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,
@@ -12054,7 +12547,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;
 };
 
@@ -12078,7 +12571,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,
@@ -12145,7 +12638,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;
 };
@@ -12170,7 +12663,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,
@@ -12238,7 +12731,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;
 
@@ -12264,7 +12757,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,
@@ -12341,7 +12834,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;
@@ -12365,7 +12858,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,
@@ -12447,7 +12940,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;
 };
 
@@ -12467,7 +12960,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,
@@ -12525,7 +13018,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;
 };
@@ -12550,7 +13043,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,
@@ -12615,7 +13108,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;
@@ -12642,7 +13135,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,
@@ -12741,7 +13234,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;
 };
@@ -12762,7 +13255,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,
@@ -12831,7 +13324,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;
 };
@@ -12852,7 +13345,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,
@@ -12921,7 +13414,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;
 };
@@ -12942,7 +13435,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,
@@ -13011,7 +13504,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;
 };
@@ -13036,7 +13529,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,
@@ -13107,7 +13600,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;
@@ -13146,7 +13639,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,
@@ -13448,7 +13941,7 @@ struct cmd_set_port_tm_hierarchy_default_result {
        cmdline_fixed_string_t tm;
        cmdline_fixed_string_t hierarchy;
        cmdline_fixed_string_t def;
-       uint16_t port_id;
+       portid_t port_id;
 };
 
 cmdline_parse_token_string_t cmd_set_port_tm_hierarchy_default_set =
@@ -13471,7 +13964,7 @@ cmdline_parse_token_string_t cmd_set_port_tm_hierarchy_default_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, UINT8);
+                       port_id, UINT16);
 
 static void cmd_set_port_tm_hierarchy_default_parsed(void *parsed_result,
        __attribute__((unused)) struct cmdline *cl,
@@ -13479,7 +13972,7 @@ static void cmd_set_port_tm_hierarchy_default_parsed(void *parsed_result,
 {
        struct cmd_set_port_tm_hierarchy_default_result *res = parsed_result;
        struct rte_port *p;
-       uint16_t port_id = res->port_id;
+       portid_t port_id = res->port_id;
 
        if (port_id_is_invalid(port_id, ENABLED_WARN))
                return;
@@ -13570,7 +14063,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[];
 };
 
@@ -13579,7 +14072,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);
 
@@ -13655,7 +14148,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[];
 };
 
@@ -13664,7 +14157,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);
 
@@ -13965,7 +14458,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 =
@@ -13975,7 +14468,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(
@@ -14052,7 +14545,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;
 };
 
@@ -14072,7 +14565,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,
@@ -14161,7 +14654,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;
 };
 
@@ -14181,7 +14674,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,
@@ -14247,7 +14740,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;
@@ -14265,7 +14758,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,
@@ -14330,7 +14823,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;
 };
@@ -14347,7 +14840,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,
@@ -14431,7 +14924,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;
@@ -14451,7 +14944,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,
@@ -14545,7 +15038,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;
 };
 
@@ -14565,7 +15058,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,
@@ -14640,7 +15133,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;
@@ -14662,7 +15155,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,
@@ -14737,7 +15230,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*/
@@ -14756,7 +15249,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(
@@ -14808,7 +15301,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;
 };
@@ -14829,7 +15322,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,
@@ -15077,6 +15570,15 @@ 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_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_set_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_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,
@@ -15130,6 +15632,11 @@ 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,
        NULL,
 };