get:
Show a patch.

patch:
Update a patch.

put:
Update a patch.

GET /api/patches/28313/?format=api
HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 28313,
    "url": "https://patches.dpdk.org/api/patches/28313/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/20170904055734.21354-2-zhiyong.yang@intel.com/",
    "project": {
        "id": 1,
        "url": "https://patches.dpdk.org/api/projects/1/?format=api",
        "name": "DPDK",
        "link_name": "dpdk",
        "list_id": "dev.dpdk.org",
        "list_email": "dev@dpdk.org",
        "web_url": "http://core.dpdk.org",
        "scm_url": "git://dpdk.org/dpdk",
        "webscm_url": "http://git.dpdk.org/dpdk",
        "list_archive_url": "https://inbox.dpdk.org/dev",
        "list_archive_url_format": "https://inbox.dpdk.org/dev/{}",
        "commit_url_format": ""
    },
    "msgid": "<20170904055734.21354-2-zhiyong.yang@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20170904055734.21354-2-zhiyong.yang@intel.com",
    "date": "2017-09-04T05:57:31",
    "name": "[dpdk-dev,v2,1/4] ethdev: increase port_id range",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "e4c67e6a6fab6ecc855d45ba9bdfd4256a6b5373",
    "submitter": {
        "id": 540,
        "url": "https://patches.dpdk.org/api/people/540/?format=api",
        "name": "Yang, Zhiyong",
        "email": "zhiyong.yang@intel.com"
    },
    "delegate": null,
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/20170904055734.21354-2-zhiyong.yang@intel.com/mbox/",
    "series": [],
    "comments": "https://patches.dpdk.org/api/patches/28313/comments/",
    "check": "warning",
    "checks": "https://patches.dpdk.org/api/patches/28313/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@dpdk.org",
        "Delivered-To": "patchwork@dpdk.org",
        "Received": [
            "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id AF05E5A3E;\n\tMon,  4 Sep 2017 07:57:49 +0200 (CEST)",
            "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby dpdk.org (Postfix) with ESMTP id D491D58F6\n\tfor <dev@dpdk.org>; Mon,  4 Sep 2017 07:57:46 +0200 (CEST)",
            "from fmsmga006.fm.intel.com ([10.253.24.20])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t03 Sep 2017 22:57:45 -0700",
            "from unknown (HELO dpdk5.bj.intel.com) ([172.16.182.182])\n\tby fmsmga006.fm.intel.com with ESMTP; 03 Sep 2017 22:57:39 -0700"
        ],
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.41,473,1498546800\"; d=\"scan'208\";a=\"147809930\"",
        "From": "Zhiyong Yang <zhiyong.yang@intel.com>",
        "To": "dev@dpdk.org",
        "Cc": "thomas@monjalon.net, ferruh.yigit@intel.com, keith.wiles@intel.com,\n\tstephen@networkplumber.org, Zhiyong Yang <zhiyong.yang@intel.com>",
        "Date": "Mon,  4 Sep 2017 13:57:31 +0800",
        "Message-Id": "<20170904055734.21354-2-zhiyong.yang@intel.com>",
        "X-Mailer": "git-send-email 2.13.3",
        "In-Reply-To": "<20170904055734.21354-1-zhiyong.yang@intel.com>",
        "References": "<20170809084203.17562-1-zhiyong.yang@intel.com>\n\t<20170904055734.21354-1-zhiyong.yang@intel.com>",
        "Subject": "[dpdk-dev] [PATCH v2 1/4] ethdev: increase port_id range",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://dpdk.org/ml/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "Extend port_id definition from uint8_t to uint16_t in lib and drivers\ndata structures, specifically rte_eth_dev_data.\nModify the APIs, drivers and app using port_id at the same time except\nsome drivers such as MLX4 and MLX5 due to fail to compile them in my\nserver.\n\nFix some checkpatch issues from the original code and remove some\nunnecessary cast operations.\n\nSigned-off-by: Zhiyong Yang <zhiyong.yang@intel.com>\n---\n app/pdump/main.c                                  |   2 +-\n app/test-eventdev/test_perf_common.h              |   6 +-\n app/test-pmd/cmdline.c                            |   4 +-\n app/test-pmd/config.c                             |   4 +-\n app/test-pmd/testpmd.c                            |  18 +-\n app/test-pmd/testpmd.h                            |   2 +-\n drivers/event/octeontx/ssovf_evdev.c              |   6 +-\n drivers/event/octeontx/ssovf_evdev.h              |   4 +-\n drivers/event/skeleton/skeleton_eventdev.c        |   4 +-\n drivers/event/skeleton/skeleton_eventdev.h        |   2 +-\n drivers/event/sw/sw_evdev.c                       |   4 +-\n drivers/event/sw/sw_evdev.h                       |   6 +-\n drivers/event/sw/sw_evdev_xstats.c                |   8 +-\n drivers/net/af_packet/rte_eth_af_packet.c         |   2 +-\n drivers/net/ark/ark_ethdev.c                      |   2 +-\n drivers/net/ark/ark_udm.h                         |   2 +-\n drivers/net/avp/avp_ethdev.c                      |   2 +-\n drivers/net/bnx2x/bnx2x.c                         |  11 +-\n drivers/net/bnx2x/bnx2x_rxtx.h                    |   4 +-\n drivers/net/bnx2x/elink.c                         |  12 +-\n drivers/net/bnx2x/elink.h                         |  17 +-\n drivers/net/bnxt/bnxt.h                           |   2 +-\n drivers/net/bnxt/bnxt_ethdev.c                    |   8 +-\n drivers/net/bnxt/bnxt_rxq.h                       |   2 +-\n drivers/net/bnxt/bnxt_txq.h                       |   2 +-\n drivers/net/bnxt/rte_pmd_bnxt.c                   |  32 +--\n drivers/net/bnxt/rte_pmd_bnxt.h                   |  36 ++--\n drivers/net/bonding/rte_eth_bond.h                |  42 ++--\n drivers/net/bonding/rte_eth_bond_8023ad.c         |   6 +-\n drivers/net/bonding/rte_eth_bond_8023ad_private.h |   6 +-\n drivers/net/bonding/rte_eth_bond_api.c            |  56 ++---\n drivers/net/bonding/rte_eth_bond_pmd.c            |  30 +--\n drivers/net/bonding/rte_eth_bond_private.h        |  43 ++--\n drivers/net/e1000/em_rxtx.c                       |   4 +-\n drivers/net/e1000/igb_rxtx.c                      |   4 +-\n drivers/net/failsafe/failsafe_ether.c             |   4 +-\n drivers/net/failsafe/failsafe_private.h           |   4 +-\n drivers/net/fm10k/fm10k.h                         |   6 +-\n drivers/net/i40e/i40e_ethdev.c                    |   5 +-\n drivers/net/i40e/i40e_rxtx.h                      |   4 +-\n drivers/net/i40e/rte_pmd_i40e.c                   |  50 ++---\n drivers/net/i40e/rte_pmd_i40e.h                   |  48 ++---\n drivers/net/ixgbe/ixgbe_ethdev.c                  |   5 +-\n drivers/net/ixgbe/ixgbe_rxtx.h                    |   4 +-\n drivers/net/ixgbe/rte_pmd_ixgbe.c                 |  60 +++---\n drivers/net/ixgbe/rte_pmd_ixgbe.h                 |  70 ++++---\n drivers/net/nfp/nfp_net.c                         |  26 +--\n drivers/net/nfp/nfp_net_pmd.h                     |   2 +-\n drivers/net/null/rte_eth_null.c                   |   2 +-\n drivers/net/pcap/rte_eth_pcap.c                   |   2 +-\n drivers/net/qede/qede_if.h                        |   2 +-\n drivers/net/ring/rte_eth_ring.c                   |   2 +-\n drivers/net/vhost/rte_eth_vhost.c                 |   8 +-\n drivers/net/vhost/rte_eth_vhost.h                 |   6 +-\n drivers/net/virtio/virtio_pci.h                   |   2 +-\n drivers/net/virtio/virtio_rxtx.h                  |   6 +-\n drivers/net/xenvirt/virtqueue.h                   |   2 +-\n lib/librte_bitratestats/rte_bitrate.c             |   2 +-\n lib/librte_bitratestats/rte_bitrate.h             |   2 +-\n lib/librte_ether/rte_ethdev.c                     | 239 +++++++++++-----------\n lib/librte_ether/rte_ethdev.h                     | 238 ++++++++++-----------\n lib/librte_ether/rte_tm.c                         |  62 +++---\n lib/librte_ether/rte_tm.h                         |  60 +++---\n lib/librte_ether/rte_tm_driver.h                  |   2 +-\n lib/librte_eventdev/rte_eventdev.c                |  36 ++--\n lib/librte_eventdev/rte_eventdev.h                |  34 +--\n lib/librte_eventdev/rte_eventdev_pmd.h            |   8 +-\n lib/librte_kni/rte_kni.h                          |   6 +-\n lib/librte_latencystats/rte_latencystats.c        |  12 +-\n lib/librte_pdump/rte_pdump.c                      |  16 +-\n lib/librte_pdump/rte_pdump.h                      |   4 +-\n lib/librte_port/rte_port_ethdev.c                 |   6 +-\n lib/librte_port/rte_port_ethdev.h                 |   6 +-\n 73 files changed, 733 insertions(+), 715 deletions(-)",
    "diff": "diff --git a/app/pdump/main.c b/app/pdump/main.c\nindex 3b13753d9..090a50cfc 100644\n--- a/app/pdump/main.c\n+++ b/app/pdump/main.c\n@@ -623,7 +623,7 @@ static void\n create_mp_ring_vdev(void)\n {\n \tint i;\n-\tuint8_t portid;\n+\tuint16_t portid;\n \tstruct pdump_tuples *pt = NULL;\n \tstruct rte_mempool *mbuf_pool = NULL;\n \tchar vdev_args[SIZE];\ndiff --git a/app/test-eventdev/test_perf_common.h b/app/test-eventdev/test_perf_common.h\nindex 4956586cc..be7a9f4ef 100644\n--- a/app/test-eventdev/test_perf_common.h\n+++ b/app/test-eventdev/test_perf_common.h\n@@ -54,13 +54,13 @@ struct worker_data {\n \tuint64_t processed_pkts;\n \tuint64_t latency;\n \tuint8_t dev_id;\n-\tuint8_t port_id;\n+\tuint16_t port_id;\n \tstruct test_perf *t;\n } __rte_cache_aligned;\n \n struct prod_data {\n \tuint8_t dev_id;\n-\tuint8_t port_id;\n+\tuint16_t port_id;\n \tuint8_t queue_id;\n \tstruct test_perf *t;\n } __rte_cache_aligned;\n@@ -93,7 +93,7 @@ struct perf_elt {\n \tstruct test_perf *t = w->t;\\\n \tstruct evt_options *opt = t->opt;\\\n \tconst uint8_t dev = w->dev_id;\\\n-\tconst uint8_t port = w->port_id;\\\n+\tconst uint16_t port = w->port_id;\\\n \tuint8_t *const sched_type_list = &t->sched_type_list[0];\\\n \tstruct rte_mempool *const pool = t->pool;\\\n \tconst uint8_t nb_stages = t->opt->nb_stages;\\\ndiff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c\nindex cd8c35850..575c9bd85 100644\n--- a/app/test-pmd/cmdline.c\n+++ b/app/test-pmd/cmdline.c\n@@ -4584,7 +4584,7 @@ struct cmd_show_bonding_config_result {\n \tcmdline_fixed_string_t show;\n \tcmdline_fixed_string_t bonding;\n \tcmdline_fixed_string_t config;\n-\tuint8_t port_id;\n+\tuint16_t port_id;\n };\n \n static void cmd_show_bonding_config_parsed(void *parsed_result,\n@@ -4593,7 +4593,7 @@ static void cmd_show_bonding_config_parsed(void *parsed_result,\n {\n \tstruct cmd_show_bonding_config_result *res = parsed_result;\n \tint bonding_mode, agg_mode;\n-\tuint8_t slaves[RTE_MAX_ETHPORTS];\n+\tuint16_t slaves[RTE_MAX_ETHPORTS];\n \tint num_slaves, num_active_slaves;\n \tint primary_id;\n \tint i;\ndiff --git a/app/test-pmd/config.c b/app/test-pmd/config.c\nindex 3ae3e1cd8..155136dd5 100644\n--- a/app/test-pmd/config.c\n+++ b/app/test-pmd/config.c\n@@ -358,7 +358,7 @@ rx_queue_infos_display(portid_t port_id, uint16_t queue_id)\n \n \trc = rte_eth_rx_queue_info_get(port_id, queue_id, &qinfo);\n \tif (rc != 0) {\n-\t\tprintf(\"Failed to retrieve information for port: %hhu, \"\n+\t\tprintf(\"Failed to retrieve information for port: %u, \"\n \t\t\t\"RX queue: %hu\\nerror desc: %s(%d)\\n\",\n \t\t\tport_id, queue_id, strerror(-rc), rc);\n \t\treturn;\n@@ -391,7 +391,7 @@ tx_queue_infos_display(portid_t port_id, uint16_t queue_id)\n \n \trc = rte_eth_tx_queue_info_get(port_id, queue_id, &qinfo);\n \tif (rc != 0) {\n-\t\tprintf(\"Failed to retrieve information for port: %hhu, \"\n+\t\tprintf(\"Failed to retrieve information for port: %u, \"\n \t\t\t\"TX queue: %hu\\nerror desc: %s(%d)\\n\",\n \t\t\tport_id, queue_id, strerror(-rc), rc);\n \t\treturn;\ndiff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c\nindex 7d4013941..ed42a4c08 100644\n--- a/app/test-pmd/testpmd.c\n+++ b/app/test-pmd/testpmd.c\n@@ -390,7 +390,7 @@ struct gro_status gro_ports[RTE_MAX_ETHPORTS];\n /* Forward function declarations */\n static void map_port_queue_stats_mapping_registers(uint8_t pi, struct rte_port *port);\n static void check_all_ports_link_status(uint32_t port_mask);\n-static int eth_event_callback(uint8_t port_id,\n+static int eth_event_callback(uint16_t port_id,\n \t\t\t      enum rte_eth_event_type type,\n \t\t\t      void *param, void *ret_param);\n \n@@ -1775,7 +1775,8 @@ check_all_ports_link_status(uint32_t port_mask)\n {\n #define CHECK_INTERVAL 100 /* 100ms */\n #define MAX_CHECK_TIME 90 /* 9s (90 * 100ms) in total */\n-\tuint8_t portid, count, all_ports_up, print_flag = 0;\n+\tuint16_t portid;\n+\tuint8_t count, all_ports_up, print_flag = 0;\n \tstruct rte_eth_link link;\n \n \tprintf(\"Checking link statuses...\\n\");\n@@ -1790,14 +1791,13 @@ check_all_ports_link_status(uint32_t port_mask)\n \t\t\t/* print link status if flag set */\n \t\t\tif (print_flag == 1) {\n \t\t\t\tif (link.link_status)\n-\t\t\t\t\tprintf(\"Port %d Link Up - speed %u \"\n-\t\t\t\t\t\t\"Mbps - %s\\n\", (uint8_t)portid,\n-\t\t\t\t\t\t(unsigned)link.link_speed,\n+\t\t\t\t\tprintf(\n+\t\t\t\t\t\"Port%d Link Up. speed %u Mbps- %s\\n\",\n+\t\t\t\t\tportid, link.link_speed,\n \t\t\t\t(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?\n \t\t\t\t\t(\"full-duplex\") : (\"half-duplex\\n\"));\n \t\t\t\telse\n-\t\t\t\t\tprintf(\"Port %d Link Down\\n\",\n-\t\t\t\t\t\t(uint8_t)portid);\n+\t\t\t\t\tprintf(\"Port %d Link Down\\n\", portid);\n \t\t\t\tcontinue;\n \t\t\t}\n \t\t\t/* clear all_ports_up flag if any link down */\n@@ -1844,7 +1844,7 @@ rmv_event_callback(void *arg)\n \n /* This function is used by the interrupt thread */\n static int\n-eth_event_callback(uint8_t port_id, enum rte_eth_event_type type, void *param,\n+eth_event_callback(uint16_t port_id, enum rte_eth_event_type type, void *param,\n \t\t  void *ret_param)\n {\n \tstatic const char * const event_desc[] = {\n@@ -2287,7 +2287,7 @@ int\n main(int argc, char** argv)\n {\n \tint  diag;\n-\tuint8_t port_id;\n+\tuint16_t port_id;\n \n \tsignal(SIGINT, signal_handler);\n \tsignal(SIGTERM, signal_handler);\ndiff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h\nindex c9d7739b8..e00d9eb2d 100644\n--- a/app/test-pmd/testpmd.h\n+++ b/app/test-pmd/testpmd.h\n@@ -78,7 +78,7 @@\n #define UMA_NO_CONFIG  0xFF\n \n typedef uint8_t  lcoreid_t;\n-typedef uint8_t  portid_t;\n+typedef uint16_t portid_t;\n typedef uint16_t queueid_t;\n typedef uint16_t streamid_t;\n \ndiff --git a/drivers/event/octeontx/ssovf_evdev.c b/drivers/event/octeontx/ssovf_evdev.c\nindex d829b491e..600bd85f6 100644\n--- a/drivers/event/octeontx/ssovf_evdev.c\n+++ b/drivers/event/octeontx/ssovf_evdev.c\n@@ -243,7 +243,7 @@ ssovf_queue_setup(struct rte_eventdev *dev, uint8_t queue_id,\n }\n \n static void\n-ssovf_port_def_conf(struct rte_eventdev *dev, uint8_t port_id,\n+ssovf_port_def_conf(struct rte_eventdev *dev, uint16_t port_id,\n \t\t\t\t struct rte_event_port_conf *port_conf)\n {\n \tstruct ssovf_evdev *edev = ssovf_pmd_priv(dev);\n@@ -261,7 +261,7 @@ ssovf_port_release(void *port)\n }\n \n static int\n-ssovf_port_setup(struct rte_eventdev *dev, uint8_t port_id,\n+ssovf_port_setup(struct rte_eventdev *dev, uint16_t port_id,\n \t\t\t\tconst struct rte_event_port_conf *port_conf)\n {\n \tstruct ssows *ws;\n@@ -399,7 +399,7 @@ static void\n ssovf_dump(struct rte_eventdev *dev, FILE *f)\n {\n \tstruct ssovf_evdev *edev = ssovf_pmd_priv(dev);\n-\tuint8_t port;\n+\tuint16_t port;\n \n \t/* Dump SSOWVF debug registers */\n \tfor (port = 0; port < edev->nb_event_ports; port++)\ndiff --git a/drivers/event/octeontx/ssovf_evdev.h b/drivers/event/octeontx/ssovf_evdev.h\nindex 1cdc81047..0a7239c69 100644\n--- a/drivers/event/octeontx/ssovf_evdev.h\n+++ b/drivers/event/octeontx/ssovf_evdev.h\n@@ -164,7 +164,7 @@ struct ssovf_evdev {\n \tuint8_t max_event_ports;\n \tuint8_t is_timeout_deq;\n \tuint8_t nb_event_queues;\n-\tuint8_t nb_event_ports;\n+\tuint16_t nb_event_ports;\n \tuint32_t min_deq_timeout_ns;\n \tuint32_t max_deq_timeout_ns;\n \tint32_t max_num_events;\n@@ -178,7 +178,7 @@ struct ssows {\n \tuint8_t *base;\n \tuint8_t *getwork;\n \tuint8_t *grps[SSO_MAX_VHGRP];\n-\tuint8_t port;\n+\tuint16_t port;\n } __rte_cache_aligned;\n \n static inline struct ssovf_evdev *\ndiff --git a/drivers/event/skeleton/skeleton_eventdev.c b/drivers/event/skeleton/skeleton_eventdev.c\nindex bcd205568..69d59213c 100644\n--- a/drivers/event/skeleton/skeleton_eventdev.c\n+++ b/drivers/event/skeleton/skeleton_eventdev.c\n@@ -225,7 +225,7 @@ skeleton_eventdev_queue_setup(struct rte_eventdev *dev, uint8_t queue_id,\n }\n \n static void\n-skeleton_eventdev_port_def_conf(struct rte_eventdev *dev, uint8_t port_id,\n+skeleton_eventdev_port_def_conf(struct rte_eventdev *dev, uint16_t port_id,\n \t\t\t\t struct rte_event_port_conf *port_conf)\n {\n \tstruct skeleton_eventdev *skel = skeleton_pmd_priv(dev);\n@@ -250,7 +250,7 @@ skeleton_eventdev_port_release(void *port)\n }\n \n static int\n-skeleton_eventdev_port_setup(struct rte_eventdev *dev, uint8_t port_id,\n+skeleton_eventdev_port_setup(struct rte_eventdev *dev, uint16_t port_id,\n \t\t\t\tconst struct rte_event_port_conf *port_conf)\n {\n \tstruct skeleton_port *sp;\ndiff --git a/drivers/event/skeleton/skeleton_eventdev.h b/drivers/event/skeleton/skeleton_eventdev.h\nindex 32064721e..5c375b218 100644\n--- a/drivers/event/skeleton/skeleton_eventdev.h\n+++ b/drivers/event/skeleton/skeleton_eventdev.h\n@@ -57,7 +57,7 @@ struct skeleton_eventdev {\n } __rte_cache_aligned;\n \n struct skeleton_port {\n-\tuint8_t port_id;\n+\tuint16_t port_id;\n } __rte_cache_aligned;\n \n static inline struct skeleton_eventdev *\ndiff --git a/drivers/event/sw/sw_evdev.c b/drivers/event/sw/sw_evdev.c\nindex 9c534b7f9..af2a13151 100644\n--- a/drivers/event/sw/sw_evdev.c\n+++ b/drivers/event/sw/sw_evdev.c\n@@ -136,7 +136,7 @@ sw_port_unlink(struct rte_eventdev *dev, void *port, uint8_t queues[],\n }\n \n static int\n-sw_port_setup(struct rte_eventdev *dev, uint8_t port_id,\n+sw_port_setup(struct rte_eventdev *dev, uint16_t port_id,\n \t\tconst struct rte_event_port_conf *conf)\n {\n \tstruct sw_evdev *sw = sw_pmd_priv(dev);\n@@ -408,7 +408,7 @@ sw_queue_def_conf(struct rte_eventdev *dev, uint8_t queue_id,\n }\n \n static void\n-sw_port_def_conf(struct rte_eventdev *dev, uint8_t port_id,\n+sw_port_def_conf(struct rte_eventdev *dev, uint16_t port_id,\n \t\t struct rte_event_port_conf *port_conf)\n {\n \tRTE_SET_USED(dev);\ndiff --git a/drivers/event/sw/sw_evdev.h b/drivers/event/sw/sw_evdev.h\nindex 71de3c14a..9b356a0af 100644\n--- a/drivers/event/sw/sw_evdev.h\n+++ b/drivers/event/sw/sw_evdev.h\n@@ -181,7 +181,7 @@ struct sw_port {\n \t/* set when the port is initialized */\n \tuint8_t initialized;\n \t/* A numeric ID for the port */\n-\tuint8_t id;\n+\tuint16_t id;\n \n \tint16_t is_directed; /** Takes from a single directed QID */\n \t/**\n@@ -304,11 +304,11 @@ void sw_event_schedule(struct rte_eventdev *dev);\n int sw_xstats_init(struct sw_evdev *dev);\n int sw_xstats_uninit(struct sw_evdev *dev);\n int sw_xstats_get_names(const struct rte_eventdev *dev,\n-\tenum rte_event_dev_xstats_mode mode, uint8_t queue_port_id,\n+\tenum rte_event_dev_xstats_mode mode, uint16_t queue_port_id,\n \tstruct rte_event_dev_xstats_name *xstats_names,\n \tunsigned int *ids, unsigned int size);\n int sw_xstats_get(const struct rte_eventdev *dev,\n-\t\tenum rte_event_dev_xstats_mode mode, uint8_t queue_port_id,\n+\t\tenum rte_event_dev_xstats_mode mode, uint16_t queue_port_id,\n \t\tconst unsigned int ids[], uint64_t values[], unsigned int n);\n uint64_t sw_xstats_get_by_name(const struct rte_eventdev *dev,\n \t\tconst char *name, unsigned int *id);\ndiff --git a/drivers/event/sw/sw_evdev_xstats.c b/drivers/event/sw/sw_evdev_xstats.c\nindex 8cb6d88d1..99718922b 100644\n--- a/drivers/event/sw/sw_evdev_xstats.c\n+++ b/drivers/event/sw/sw_evdev_xstats.c\n@@ -414,7 +414,7 @@ sw_xstats_uninit(struct sw_evdev *sw)\n \n int\n sw_xstats_get_names(const struct rte_eventdev *dev,\n-\t\tenum rte_event_dev_xstats_mode mode, uint8_t queue_port_id,\n+\t\tenum rte_event_dev_xstats_mode mode, uint16_t queue_port_id,\n \t\tstruct rte_event_dev_xstats_name *xstats_names,\n \t\tunsigned int *ids, unsigned int size)\n {\n@@ -469,7 +469,7 @@ sw_xstats_get_names(const struct rte_eventdev *dev,\n \n static int\n sw_xstats_update(struct sw_evdev *sw, enum rte_event_dev_xstats_mode mode,\n-\t\tuint8_t queue_port_id, const unsigned int ids[],\n+\t\tuint16_t queue_port_id, const unsigned int ids[],\n \t\tuint64_t values[], unsigned int n, const uint32_t reset,\n \t\tconst uint32_t ret_if_n_lt_nstats)\n {\n@@ -533,7 +533,7 @@ sw_xstats_update(struct sw_evdev *sw, enum rte_event_dev_xstats_mode mode,\n \n int\n sw_xstats_get(const struct rte_eventdev *dev,\n-\t\tenum rte_event_dev_xstats_mode mode, uint8_t queue_port_id,\n+\t\tenum rte_event_dev_xstats_mode mode, uint16_t queue_port_id,\n \t\tconst unsigned int ids[], uint64_t values[], unsigned int n)\n {\n \tstruct sw_evdev *sw = sw_pmd_priv(dev);\n@@ -602,7 +602,7 @@ sw_xstats_reset_queue(struct sw_evdev *sw, uint8_t queue_id,\n }\n \n static int\n-sw_xstats_reset_port(struct sw_evdev *sw, uint8_t port_id,\n+sw_xstats_reset_port(struct sw_evdev *sw, uint16_t port_id,\n \t\tconst uint32_t ids[], uint32_t nb_ids)\n {\n \tconst uint32_t reset = 1;\ndiff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c\nindex 9a47852ca..483b0c107 100644\n--- a/drivers/net/af_packet/rte_eth_af_packet.c\n+++ b/drivers/net/af_packet/rte_eth_af_packet.c\n@@ -75,7 +75,7 @@ struct pkt_rx_queue {\n \tunsigned int framenum;\n \n \tstruct rte_mempool *mb_pool;\n-\tuint8_t in_port;\n+\tuint16_t in_port;\n \n \tvolatile unsigned long rx_pkts;\n \tvolatile unsigned long err_pkts;\ndiff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c\nindex 6db362b04..893284733 100644\n--- a/drivers/net/ark/ark_ethdev.c\n+++ b/drivers/net/ark/ark_ethdev.c\n@@ -641,7 +641,7 @@ eth_ark_dev_stop(struct rte_eth_dev *dev)\n \tfor (i = 0; i < dev->data->nb_tx_queues; i++) {\n \t\tstatus = eth_ark_tx_queue_stop(dev, i);\n \t\tif (status != 0) {\n-\t\t\tuint8_t port = dev->data->port_id;\n+\t\t\tuint16_t port = dev->data->port_id;\n \t\t\tPMD_DRV_LOG(ERR,\n \t\t\t\t    \"tx_queue stop anomaly\"\n \t\t\t\t    \" port %u, queue %u\\n\",\ndiff --git a/drivers/net/ark/ark_udm.h b/drivers/net/ark/ark_udm.h\nindex 29bf1e8f7..b71951d61 100644\n--- a/drivers/net/ark/ark_udm.h\n+++ b/drivers/net/ark/ark_udm.h\n@@ -48,7 +48,7 @@\n struct ark_rx_meta {\n \tuint64_t timestamp;\n \tuint64_t user_data;\n-\tuint8_t port;\n+\tuint16_t port;\n \tuint8_t dst_queue;\n \tuint16_t pkt_len;\n };\ndiff --git a/drivers/net/avp/avp_ethdev.c b/drivers/net/avp/avp_ethdev.c\nindex c746a0e2c..b5cc955f2 100644\n--- a/drivers/net/avp/avp_ethdev.c\n+++ b/drivers/net/avp/avp_ethdev.c\n@@ -190,7 +190,7 @@ struct avp_dev {\n \tstruct rte_eth_dev_data *dev_data;\n \t/**< Back pointer to ethernet device data */\n \tvolatile uint32_t flags; /**< Device operational flags */\n-\tuint8_t port_id; /**< Ethernet port identifier */\n+\tuint16_t port_id; /**< Ethernet port identifier */\n \tstruct rte_mempool *pool; /**< pkt mbuf mempool */\n \tunsigned int guest_mbuf_size; /**< local pool mbuf size */\n \tunsigned int host_mbuf_size; /**< host mbuf size */\ndiff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c\nindex 06733d153..fbbda590f 100644\n--- a/drivers/net/bnx2x/bnx2x.c\n+++ b/drivers/net/bnx2x/bnx2x.c\n@@ -608,7 +608,8 @@ static int bnx2x_gpio_read(struct bnx2x_softc *sc, int gpio_num, uint8_t port)\n }\n \n static int\n-bnx2x_gpio_write(struct bnx2x_softc *sc, int gpio_num, uint32_t mode, uint8_t port)\n+bnx2x_gpio_write(struct bnx2x_softc *sc, int gpio_num, uint32_t mode,\n+\t\t uint16_t port)\n {\n \t/* The GPIO should be swapped if swap register is set and active */\n \tint gpio_port = ((REG_RD(sc, NIG_REG_PORT_SWAP) &&\n@@ -703,7 +704,7 @@ bnx2x_gpio_mult_write(struct bnx2x_softc *sc, uint8_t pins, uint32_t mode)\n \n static int\n bnx2x_gpio_int_write(struct bnx2x_softc *sc, int gpio_num, uint32_t mode,\n-\t\t   uint8_t port)\n+\t\t      uint8_t port)\n {\n \t/* The GPIO should be swapped if swap register is set and active */\n \tint gpio_port = ((REG_RD(sc, NIG_REG_PORT_SWAP) &&\n@@ -749,13 +750,13 @@ bnx2x_gpio_int_write(struct bnx2x_softc *sc, int gpio_num, uint32_t mode,\n }\n \n uint32_t\n-elink_cb_gpio_read(struct bnx2x_softc * sc, uint16_t gpio_num, uint8_t port)\n+elink_cb_gpio_read(struct bnx2x_softc *sc, uint16_t gpio_num, uint16_t port)\n {\n \treturn bnx2x_gpio_read(sc, gpio_num, port);\n }\n \n uint8_t elink_cb_gpio_write(struct bnx2x_softc * sc, uint16_t gpio_num, uint8_t mode,\t/* 0=low 1=high */\n-\t\t\t    uint8_t port)\n+\t\t\t    uint16_t port)\n {\n \treturn bnx2x_gpio_write(sc, gpio_num, mode, port);\n }\n@@ -768,7 +769,7 @@ elink_cb_gpio_mult_write(struct bnx2x_softc * sc, uint8_t pins,\n }\n \n uint8_t elink_cb_gpio_int_write(struct bnx2x_softc * sc, uint16_t gpio_num, uint8_t mode,\t/* 0=low 1=high */\n-\t\t\t\tuint8_t port)\n+\t\t\t\tuint16_t port)\n {\n \treturn bnx2x_gpio_int_write(sc, gpio_num, mode, port);\n }\ndiff --git a/drivers/net/bnx2x/bnx2x_rxtx.h b/drivers/net/bnx2x/bnx2x_rxtx.h\nindex 2e38ec26a..48d540476 100644\n--- a/drivers/net/bnx2x/bnx2x_rxtx.h\n+++ b/drivers/net/bnx2x/bnx2x_rxtx.h\n@@ -41,7 +41,7 @@ struct bnx2x_rx_queue {\n \tuint16_t                   rx_cq_head;           /**< Index of current rcq bd. */\n \tuint16_t                   rx_cq_tail;           /**< Index of last rcq bd. */\n \tuint16_t                   queue_id;             /**< RX queue index. */\n-\tuint8_t                    port_id;              /**< Device port identifier. */\n+\tuint16_t                   port_id;\t/**< Device port identifier. */\n \tstruct bnx2x_softc           *sc;                  /**< Ptr to dev_private data. */\n };\n \n@@ -62,7 +62,7 @@ struct bnx2x_tx_queue {\n \tuint16_t                   nb_tx_avail;          /**< Number of TX descriptors available. */\n \tuint16_t                   nb_tx_pages;          /**< number of TX pages */\n \tuint16_t                   queue_id;             /**< TX queue index. */\n-\tuint8_t                    port_id;              /**< Device port identifier. */\n+\tuint16_t                   port_id;\t/**< Device port identifier. */\n \tstruct bnx2x_softc           *sc;                  /**< Ptr to dev_private data */\n };\n \ndiff --git a/drivers/net/bnx2x/elink.c b/drivers/net/bnx2x/elink.c\nindex 9d0f31364..63f3b9686 100644\n--- a/drivers/net/bnx2x/elink.c\n+++ b/drivers/net/bnx2x/elink.c\n@@ -1105,7 +1105,7 @@ static void elink_set_cfg_pin(struct bnx2x_softc *sc, uint32_t pin_cfg,\n \t\telink_set_epio(sc, pin_cfg - PIN_CFG_EPIO0, val);\n \t} else {\n \t\tuint8_t gpio_num = (pin_cfg - PIN_CFG_GPIO0_P0) & 0x3;\n-\t\tuint8_t gpio_port = (pin_cfg - PIN_CFG_GPIO0_P0) >> 2;\n+\t\tuint16_t gpio_port = (pin_cfg - PIN_CFG_GPIO0_P0) >> 2;\n \t\telink_cb_gpio_write(sc, gpio_num, (uint8_t) val, gpio_port);\n \t}\n }\n@@ -1119,7 +1119,7 @@ static uint32_t elink_get_cfg_pin(struct bnx2x_softc *sc, uint32_t pin_cfg,\n \t\telink_get_epio(sc, pin_cfg - PIN_CFG_EPIO0, val);\n \t} else {\n \t\tuint8_t gpio_num = (pin_cfg - PIN_CFG_GPIO0_P0) & 0x3;\n-\t\tuint8_t gpio_port = (pin_cfg - PIN_CFG_GPIO0_P0) >> 2;\n+\t\tuint16_t gpio_port = (pin_cfg - PIN_CFG_GPIO0_P0) >> 2;\n \t\t*val = elink_cb_gpio_read(sc, gpio_num, gpio_port);\n \t}\n \treturn ELINK_STATUS_OK;\n@@ -1244,7 +1244,7 @@ static void elink_emac_init(struct elink_params *params)\n {\n \t/* reset and unreset the emac core */\n \tstruct bnx2x_softc *sc = params->sc;\n-\tuint8_t port = params->port;\n+\tuint16_t port = params->port;\n \tuint32_t emac_base = port ? GRCBASE_EMAC1 : GRCBASE_EMAC0;\n \tuint32_t val;\n \tuint16_t timeout;\n@@ -1474,7 +1474,7 @@ static void elink_xmac_init(struct elink_params *params, uint32_t max_speed)\n \n static void elink_set_xmac_rxtx(struct elink_params *params, uint8_t en)\n {\n-\tuint8_t port = params->port;\n+\tuint16_t port = params->port;\n \tstruct bnx2x_softc *sc = params->sc;\n \tuint32_t pfc_ctrl, xmac_base = (port) ? GRCBASE_XMAC1 : GRCBASE_XMAC0;\n \tuint32_t val;\n@@ -12987,7 +12987,7 @@ void elink_period_func(struct elink_params *params, struct elink_vars *vars)\n \n uint8_t elink_fan_failure_det_req(struct bnx2x_softc *sc,\n \t\t\t\t  uint32_t shmem_base,\n-\t\t\t\t  uint32_t shmem2_base, uint8_t port)\n+\t\t\t\t  uint32_t shmem2_base, uint16_t port)\n {\n \tuint8_t phy_index, fan_failure_det_req = 0;\n \tstruct elink_phy phy;\n@@ -13027,7 +13027,7 @@ void elink_hw_reset_phy(struct elink_params *params)\n \n void elink_init_mod_abs_int(struct bnx2x_softc *sc, struct elink_vars *vars,\n \t\t\t    __rte_unused uint32_t chip_id, uint32_t shmem_base,\n-\t\t\t    uint32_t shmem2_base, uint8_t port)\n+\t\t\t    uint32_t shmem2_base, uint16_t port)\n {\n \tuint8_t gpio_num = 0xff, gpio_port = 0xff, phy_index;\n \tuint32_t val;\ndiff --git a/drivers/net/bnx2x/elink.h b/drivers/net/bnx2x/elink.h\nindex 9401b7cd5..22661d06b 100644\n--- a/drivers/net/bnx2x/elink.h\n+++ b/drivers/net/bnx2x/elink.h\n@@ -34,16 +34,17 @@ extern void elink_cb_reg_write(struct bnx2x_softc *sc, uint32_t reg_addr, uint32\n \n /* mode - 0( LOW ) /1(HIGH)*/\n extern uint8_t elink_cb_gpio_write(struct bnx2x_softc *sc,\n-\t\t\t    uint16_t gpio_num,\n-\t\t\t    uint8_t mode, uint8_t port);\n+\t\t\t\t    uint16_t gpio_num,\n+\t\t\t\t    uint8_t mode, uint16_t port);\n extern uint8_t elink_cb_gpio_mult_write(struct bnx2x_softc *sc,\n \t\t\t    uint8_t pins,\n \t\t\t    uint8_t mode);\n \n-extern uint32_t elink_cb_gpio_read(struct bnx2x_softc *sc, uint16_t gpio_num, uint8_t port);\n+extern uint32_t elink_cb_gpio_read(struct bnx2x_softc *sc, uint16_t gpio_num,\n+\t\t\t\t   uint16_t port);\n extern uint8_t elink_cb_gpio_int_write(struct bnx2x_softc *sc,\n-\t\t\t\tuint16_t gpio_num,\n-\t\t\t\tuint8_t mode, uint8_t port);\n+\t\t\t\t\tuint16_t gpio_num,\n+\t\t\t\t\tuint8_t mode, uint16_t port);\n \n extern uint32_t elink_cb_fw_command(struct bnx2x_softc *sc, uint32_t command, uint32_t param);\n \n@@ -318,7 +319,7 @@ struct elink_phy {\n /* Inputs parameters to the CLC */\n struct elink_params {\n \n-\tuint8_t port;\n+\tuint16_t port;\n \n \t/* Default / User Configuration */\n \tuint8_t loopback_mode;\n@@ -500,7 +501,7 @@ elink_status_t elink_phy_probe(struct elink_params *params);\n \n /* Checks if fan failure detection is required on one of the phys on board */\n uint8_t elink_fan_failure_det_req(struct bnx2x_softc *sc, uint32_t shmem_base,\n-\t\t\t     uint32_t shmem2_base, uint8_t port);\n+\t\t\t\t  uint32_t shmem2_base, uint16_t port);\n \n /* Open / close the gate between the NIG and the BRB */\n void elink_set_rx_filter(struct elink_params *params, uint8_t en);\n@@ -573,7 +574,7 @@ elink_status_t elink_update_pfc(struct elink_params *params,\n \n void elink_init_mod_abs_int(struct bnx2x_softc *sc, struct elink_vars *vars,\n \t\t\t    uint32_t chip_id, uint32_t shmem_base, uint32_t shmem2_base,\n-\t\t\t    uint8_t port);\n+\t\t\t    uint16_t port);\n \n void elink_period_func(struct elink_params *params, struct elink_vars *vars);\n \ndiff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h\nindex 405d94deb..26a9018b5 100644\n--- a/drivers/net/bnxt/bnxt.h\n+++ b/drivers/net/bnxt/bnxt.h\n@@ -126,7 +126,7 @@ struct bnxt_pf_info {\n #define BNXT_FIRST_VF_FID\t128\n #define BNXT_PF_RINGS_USED(bp)\tbnxt_get_num_queues(bp)\n #define BNXT_PF_RINGS_AVAIL(bp)\t(bp->pf.max_cp_rings - BNXT_PF_RINGS_USED(bp))\n-\tuint8_t\t\t\tport_id;\n+\tuint16_t\t\tport_id;\n \tuint16_t\t\tfirst_vf_id;\n \tuint16_t\t\tactive_vfs;\n \tuint16_t\t\tmax_vfs;\ndiff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c\nindex c9d11228b..d8face1bc 100644\n--- a/drivers/net/bnxt/bnxt_ethdev.c\n+++ b/drivers/net/bnxt/bnxt_ethdev.c\n@@ -488,14 +488,14 @@ static void bnxt_print_link_info(struct rte_eth_dev *eth_dev)\n \tstruct rte_eth_link *link = &eth_dev->data->dev_link;\n \n \tif (link->link_status)\n-\t\tRTE_LOG(INFO, PMD, \"Port %d Link Up - speed %u Mbps - %s\\n\",\n-\t\t\t(uint8_t)(eth_dev->data->port_id),\n+\t\tRTE_LOG(INFO, PMD, \"Port %u Link Up - speed %u Mbps - %s\\n\",\n+\t\t\teth_dev->data->port_id,\n \t\t\t(uint32_t)link->link_speed,\n \t\t\t(link->link_duplex == ETH_LINK_FULL_DUPLEX) ?\n \t\t\t(\"full-duplex\") : (\"half-duplex\\n\"));\n \telse\n-\t\tRTE_LOG(INFO, PMD, \"Port %d Link Down\\n\",\n-\t\t\t(uint8_t)(eth_dev->data->port_id));\n+\t\tRTE_LOG(INFO, PMD, \"Port %u Link Down\\n\",\n+\t\t\teth_dev->data->port_id);\n }\n \n static int bnxt_dev_lsc_intr_setup(struct rte_eth_dev *eth_dev)\ndiff --git a/drivers/net/bnxt/bnxt_rxq.h b/drivers/net/bnxt/bnxt_rxq.h\nindex 01aaa007f..cea0785d1 100644\n--- a/drivers/net/bnxt/bnxt_rxq.h\n+++ b/drivers/net/bnxt/bnxt_rxq.h\n@@ -48,7 +48,7 @@ struct bnxt_rx_queue {\n \tuint16_t\t\trx_free_thresh; /* max free RX desc to hold */\n \tuint16_t\t\tqueue_id; /* RX queue index */\n \tuint16_t\t\treg_idx; /* RX queue register index */\n-\tuint8_t\t\t\tport_id; /* Device port identifier */\n+\tuint16_t\t\tport_id; /* Device port identifier */\n \tuint8_t\t\t\tcrc_len; /* 0 if CRC stripped, 4 otherwise */\n \n \tstruct bnxt\t\t*bp;\ndiff --git a/drivers/net/bnxt/bnxt_txq.h b/drivers/net/bnxt/bnxt_txq.h\nindex 16f3a0bdd..f753c10f2 100644\n--- a/drivers/net/bnxt/bnxt_txq.h\n+++ b/drivers/net/bnxt/bnxt_txq.h\n@@ -46,7 +46,7 @@ struct bnxt_tx_queue {\n \tuint16_t\t\ttx_next_rs; /* next desc to set RS bit */\n \tuint16_t\t\tqueue_id; /* TX queue index */\n \tuint16_t\t\treg_idx; /* TX queue register index */\n-\tuint8_t\t\t\tport_id; /* Device port identifier */\n+\tuint16_t\t\tport_id; /* Device port identifier */\n \tuint8_t\t\t\tpthresh; /* Prefetch threshold register */\n \tuint8_t\t\t\ththresh; /* Host threshold register */\n \tuint8_t\t\t\twthresh; /* Write-back threshold reg */\ndiff --git a/drivers/net/bnxt/rte_pmd_bnxt.c b/drivers/net/bnxt/rte_pmd_bnxt.c\nindex c343d9033..63fc27911 100644\n--- a/drivers/net/bnxt/rte_pmd_bnxt.c\n+++ b/drivers/net/bnxt/rte_pmd_bnxt.c\n@@ -67,7 +67,7 @@ int bnxt_rcv_msg_from_vf(struct bnxt *bp, uint16_t vf_id, void *msg)\n \t\ttrue : false;\n }\n \n-int rte_pmd_bnxt_set_tx_loopback(uint8_t port, uint8_t on)\n+int rte_pmd_bnxt_set_tx_loopback(uint16_t port, uint8_t on)\n {\n \tstruct rte_eth_dev *eth_dev;\n \tstruct bnxt *bp;\n@@ -108,7 +108,7 @@ rte_pmd_bnxt_set_all_queues_drop_en_cb(struct bnxt_vnic_info *vnic, void *onptr)\n \tvnic->bd_stall = !(*on);\n }\n \n-int rte_pmd_bnxt_set_all_queues_drop_en(uint8_t port, uint8_t on)\n+int rte_pmd_bnxt_set_all_queues_drop_en(uint16_t port, uint8_t on)\n {\n \tstruct rte_eth_dev *eth_dev;\n \tstruct bnxt *bp;\n@@ -159,7 +159,7 @@ int rte_pmd_bnxt_set_all_queues_drop_en(uint8_t port, uint8_t on)\n \treturn rc;\n }\n \n-int rte_pmd_bnxt_set_vf_mac_addr(uint8_t port, uint16_t vf,\n+int rte_pmd_bnxt_set_vf_mac_addr(uint16_t port, uint16_t vf,\n \t\t\t\tstruct ether_addr *mac_addr)\n {\n \tstruct rte_eth_dev *dev;\n@@ -191,7 +191,7 @@ int rte_pmd_bnxt_set_vf_mac_addr(uint8_t port, uint16_t vf,\n \treturn rc;\n }\n \n-int rte_pmd_bnxt_set_vf_rate_limit(uint8_t port, uint16_t vf,\n+int rte_pmd_bnxt_set_vf_rate_limit(uint16_t port, uint16_t vf,\n \t\t\t\tuint16_t tx_rate, uint64_t q_msk)\n {\n \tstruct rte_eth_dev *eth_dev;\n@@ -241,7 +241,7 @@ int rte_pmd_bnxt_set_vf_rate_limit(uint8_t port, uint16_t vf,\n \treturn rc;\n }\n \n-int rte_pmd_bnxt_set_vf_mac_anti_spoof(uint8_t port, uint16_t vf, uint8_t on)\n+int rte_pmd_bnxt_set_vf_mac_anti_spoof(uint16_t port, uint16_t vf, uint8_t on)\n {\n \tstruct rte_eth_dev_info dev_info;\n \tstruct rte_eth_dev *dev;\n@@ -294,7 +294,7 @@ int rte_pmd_bnxt_set_vf_mac_anti_spoof(uint8_t port, uint16_t vf, uint8_t on)\n \treturn rc;\n }\n \n-int rte_pmd_bnxt_set_vf_vlan_anti_spoof(uint8_t port, uint16_t vf, uint8_t on)\n+int rte_pmd_bnxt_set_vf_vlan_anti_spoof(uint16_t port, uint16_t vf, uint8_t on)\n {\n \tstruct rte_eth_dev_info dev_info;\n \tstruct rte_eth_dev *dev;\n@@ -350,7 +350,7 @@ rte_pmd_bnxt_set_vf_vlan_stripq_cb(struct bnxt_vnic_info *vnic, void *onptr)\n }\n \n int\n-rte_pmd_bnxt_set_vf_vlan_stripq(uint8_t port, uint16_t vf, uint8_t on)\n+rte_pmd_bnxt_set_vf_vlan_stripq(uint16_t port, uint16_t vf, uint8_t on)\n {\n \tstruct rte_eth_dev *dev;\n \tstruct rte_eth_dev_info dev_info;\n@@ -385,7 +385,7 @@ rte_pmd_bnxt_set_vf_vlan_stripq(uint8_t port, uint16_t vf, uint8_t on)\n \treturn rc;\n }\n \n-int rte_pmd_bnxt_set_vf_rxmode(uint8_t port, uint16_t vf,\n+int rte_pmd_bnxt_set_vf_rxmode(uint16_t port, uint16_t vf,\n \t\t\t\tuint16_t rx_mask, uint8_t on)\n {\n \tstruct rte_eth_dev *dev;\n@@ -477,7 +477,7 @@ static int bnxt_set_vf_table(struct bnxt *bp, uint16_t vf)\n \treturn rc;\n }\n \n-int rte_pmd_bnxt_set_vf_vlan_filter(uint8_t port, uint16_t vlan,\n+int rte_pmd_bnxt_set_vf_vlan_filter(uint16_t port, uint16_t vlan,\n \t\t\t\t    uint64_t vf_mask, uint8_t vlan_on)\n {\n \tstruct bnxt_vlan_table_entry *ve;\n@@ -570,7 +570,7 @@ int rte_pmd_bnxt_set_vf_vlan_filter(uint8_t port, uint16_t vlan,\n \treturn rc;\n }\n \n-int rte_pmd_bnxt_get_vf_stats(uint8_t port,\n+int rte_pmd_bnxt_get_vf_stats(uint16_t port,\n \t\t\t      uint16_t vf_id,\n \t\t\t      struct rte_eth_stats *stats)\n {\n@@ -598,7 +598,7 @@ int rte_pmd_bnxt_get_vf_stats(uint8_t port,\n \treturn bnxt_hwrm_func_qstats(bp, bp->pf.first_vf_id + vf_id, stats);\n }\n \n-int rte_pmd_bnxt_reset_vf_stats(uint8_t port,\n+int rte_pmd_bnxt_reset_vf_stats(uint16_t port,\n \t\t\t\tuint16_t vf_id)\n {\n \tstruct rte_eth_dev *dev;\n@@ -625,7 +625,7 @@ int rte_pmd_bnxt_reset_vf_stats(uint8_t port,\n \treturn bnxt_hwrm_func_clr_stats(bp, bp->pf.first_vf_id + vf_id);\n }\n \n-int rte_pmd_bnxt_get_vf_rx_status(uint8_t port, uint16_t vf_id)\n+int rte_pmd_bnxt_get_vf_rx_status(uint16_t port, uint16_t vf_id)\n {\n \tstruct rte_eth_dev *dev;\n \tstruct rte_eth_dev_info dev_info;\n@@ -651,7 +651,7 @@ int rte_pmd_bnxt_get_vf_rx_status(uint8_t port, uint16_t vf_id)\n \treturn bnxt_vf_vnic_count(bp, vf_id);\n }\n \n-int rte_pmd_bnxt_get_vf_tx_drop_count(uint8_t port, uint16_t vf_id,\n+int rte_pmd_bnxt_get_vf_tx_drop_count(uint16_t port, uint16_t vf_id,\n \t\t\t\t      uint64_t *count)\n {\n \tstruct rte_eth_dev *dev;\n@@ -679,7 +679,7 @@ int rte_pmd_bnxt_get_vf_tx_drop_count(uint8_t port, uint16_t vf_id,\n \t\t\t\t\t     count);\n }\n \n-int rte_pmd_bnxt_mac_addr_add(uint8_t port, struct ether_addr *addr,\n+int rte_pmd_bnxt_mac_addr_add(uint16_t port, struct ether_addr *addr,\n \t\t\t\tuint32_t vf_id)\n {\n \tstruct rte_eth_dev *dev;\n@@ -756,7 +756,7 @@ int rte_pmd_bnxt_mac_addr_add(uint8_t port, struct ether_addr *addr,\n }\n \n int\n-rte_pmd_bnxt_set_vf_vlan_insert(uint8_t port, uint16_t vf,\n+rte_pmd_bnxt_set_vf_vlan_insert(uint16_t port, uint16_t vf,\n \t\tuint16_t vlan_id)\n {\n \tstruct rte_eth_dev *dev;\n@@ -793,7 +793,7 @@ rte_pmd_bnxt_set_vf_vlan_insert(uint8_t port, uint16_t vf,\n \treturn rc;\n }\n \n-int rte_pmd_bnxt_set_vf_persist_stats(uint8_t port, uint16_t vf, uint8_t on)\n+int rte_pmd_bnxt_set_vf_persist_stats(uint16_t port, uint16_t vf, uint8_t on)\n {\n \tstruct rte_eth_dev_info dev_info;\n \tstruct rte_eth_dev *dev;\ndiff --git a/drivers/net/bnxt/rte_pmd_bnxt.h b/drivers/net/bnxt/rte_pmd_bnxt.h\nindex c4c4770e3..548e5b3e5 100644\n--- a/drivers/net/bnxt/rte_pmd_bnxt.h\n+++ b/drivers/net/bnxt/rte_pmd_bnxt.h\n@@ -78,7 +78,7 @@ struct rte_pmd_bnxt_mb_event_param {\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_bnxt_set_vf_mac_anti_spoof(uint8_t port, uint16_t vf, uint8_t on);\n+int rte_pmd_bnxt_set_vf_mac_anti_spoof(uint16_t port, uint16_t vf, uint8_t on);\n \n /**\n  * Set the VF MAC address.\n@@ -94,7 +94,7 @@ int rte_pmd_bnxt_set_vf_mac_anti_spoof(uint8_t port, uint16_t vf, uint8_t on);\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if *vf* or *mac_addr* is invalid.\n  */\n-int rte_pmd_bnxt_set_vf_mac_addr(uint8_t port, uint16_t vf,\n+int rte_pmd_bnxt_set_vf_mac_addr(uint16_t port, uint16_t vf,\n \t\tstruct ether_addr *mac_addr);\n \n /**\n@@ -115,7 +115,7 @@ int rte_pmd_bnxt_set_vf_mac_addr(uint8_t port, uint16_t vf,\n  *   - (-EINVAL) if bad parameter.\n  */\n int\n-rte_pmd_bnxt_set_vf_vlan_stripq(uint8_t port, uint16_t vf, uint8_t on);\n+rte_pmd_bnxt_set_vf_vlan_stripq(uint16_t port, uint16_t vf, uint8_t on);\n \n /**\n  * Enable/Disable vf vlan insert\n@@ -134,8 +134,8 @@ rte_pmd_bnxt_set_vf_vlan_stripq(uint8_t port, uint16_t vf, uint8_t on);\n  *   - (-EINVAL) if bad parameter.\n  */\n int\n-rte_pmd_bnxt_set_vf_vlan_insert(uint8_t port, uint16_t vf,\n-\t\tuint16_t vlan_id);\n+rte_pmd_bnxt_set_vf_vlan_insert(uint16_t port, uint16_t vf,\n+\t\t\t\tuint16_t vlan_id);\n \n /**\n  * Enable/Disable hardware VF VLAN filtering by an Ethernet device of\n@@ -156,7 +156,7 @@ rte_pmd_bnxt_set_vf_vlan_insert(uint8_t port, uint16_t vf,\n  *   - (-ENODEV) if *port_id* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_bnxt_set_vf_vlan_filter(uint8_t port, uint16_t vlan,\n+int rte_pmd_bnxt_set_vf_vlan_filter(uint16_t port, uint16_t vlan,\n \t\t\t\t    uint64_t vf_mask, uint8_t vlan_on);\n \n /**\n@@ -173,7 +173,7 @@ int rte_pmd_bnxt_set_vf_vlan_filter(uint8_t port, uint16_t vlan,\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_bnxt_set_tx_loopback(uint8_t port, uint8_t on);\n+int rte_pmd_bnxt_set_tx_loopback(uint16_t port, uint8_t on);\n \n /**\n  * set all queues drop enable bit\n@@ -189,7 +189,7 @@ int rte_pmd_bnxt_set_tx_loopback(uint8_t port, uint8_t on);\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_bnxt_set_all_queues_drop_en(uint8_t port, uint8_t on);\n+int rte_pmd_bnxt_set_all_queues_drop_en(uint16_t port, uint8_t on);\n \n /**\n  * Set the VF rate limit.\n@@ -207,7 +207,7 @@ int rte_pmd_bnxt_set_all_queues_drop_en(uint8_t port, uint8_t on);\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if *vf* or *mac_addr* is invalid.\n  */\n-int rte_pmd_bnxt_set_vf_rate_limit(uint8_t port, uint16_t vf,\n+int rte_pmd_bnxt_set_vf_rate_limit(uint16_t port, uint16_t vf,\n \t\t\t\tuint16_t tx_rate, uint64_t q_msk);\n \n /**\n@@ -226,7 +226,7 @@ int rte_pmd_bnxt_set_vf_rate_limit(uint8_t port, uint16_t vf,\n  *   - (-EINVAL) if bad parameter.\n  */\n \n-int rte_pmd_bnxt_get_vf_stats(uint8_t port,\n+int rte_pmd_bnxt_get_vf_stats(uint16_t port,\n \t\t\t      uint16_t vf_id,\n \t\t\t      struct rte_eth_stats *stats);\n \n@@ -242,7 +242,7 @@ int rte_pmd_bnxt_get_vf_stats(uint8_t port,\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_bnxt_reset_vf_stats(uint8_t port,\n+int rte_pmd_bnxt_reset_vf_stats(uint16_t port,\n \t\t\t\tuint16_t vf_id);\n \n /**\n@@ -261,7 +261,7 @@ int rte_pmd_bnxt_reset_vf_stats(uint8_t port,\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_bnxt_set_vf_vlan_anti_spoof(uint8_t port, uint16_t vf, uint8_t on);\n+int rte_pmd_bnxt_set_vf_vlan_anti_spoof(uint16_t port, uint16_t vf, uint8_t on);\n \n /**\n  * Set RX L2 Filtering mode of a VF of an Ethernet device.\n@@ -280,7 +280,7 @@ int rte_pmd_bnxt_set_vf_vlan_anti_spoof(uint8_t port, uint16_t vf, uint8_t on);\n  *   - (-ENODEV) if *port_id* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_bnxt_set_vf_rxmode(uint8_t port, uint16_t vf,\n+int rte_pmd_bnxt_set_vf_rxmode(uint16_t port, uint16_t vf,\n \t\t\t\tuint16_t rx_mask, uint8_t on);\n \n /**\n@@ -297,7 +297,7 @@ int rte_pmd_bnxt_set_vf_rxmode(uint8_t port, uint16_t vf,\n  *   - (-ENOMEM) on an allocation failure\n  *   - (-1) firmware interface error\n  */\n-int rte_pmd_bnxt_get_vf_rx_status(uint8_t port, uint16_t vf_id);\n+int rte_pmd_bnxt_get_vf_rx_status(uint16_t port, uint16_t vf_id);\n \n /**\n  * Queries the TX drop counter for the function\n@@ -313,7 +313,7 @@ int rte_pmd_bnxt_get_vf_rx_status(uint8_t port, uint16_t vf_id);\n  *   - (-EINVAL) invalid vf_id specified.\n  *   - (-ENOTSUP) Ethernet device is not a PF\n  */\n-int rte_pmd_bnxt_get_vf_tx_drop_count(uint8_t port, uint16_t vf_id,\n+int rte_pmd_bnxt_get_vf_tx_drop_count(uint16_t port, uint16_t vf_id,\n \t\t\t\t      uint64_t *count);\n \n /**\n@@ -331,8 +331,8 @@ int rte_pmd_bnxt_get_vf_tx_drop_count(uint8_t port, uint16_t vf_id,\n  *   - (-ENOTSUP) Ethernet device is not a PF\n  *   - (-ENOMEM) on an allocation failure\n  */\n-int rte_pmd_bnxt_mac_addr_add(uint8_t port, struct ether_addr *mac_addr,\n-\t\t\t\tuint32_t vf_id);\n+int rte_pmd_bnxt_mac_addr_add(uint16_t port, struct ether_addr *mac_addr,\n+\t\t\t       uint32_t vf_id);\n \n /**\n  * Enable/Disable VF statistics retention\n@@ -350,5 +350,5 @@ int rte_pmd_bnxt_mac_addr_add(uint8_t port, struct ether_addr *mac_addr,\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_bnxt_set_vf_persist_stats(uint8_t port, uint16_t vf, uint8_t on);\n+int rte_pmd_bnxt_set_vf_persist_stats(uint16_t port, uint16_t vf, uint8_t on);\n #endif /* _PMD_BNXT_H_ */\ndiff --git a/drivers/net/bonding/rte_eth_bond.h b/drivers/net/bonding/rte_eth_bond.h\nindex 8efbf0713..36b4e0643 100644\n--- a/drivers/net/bonding/rte_eth_bond.h\n+++ b/drivers/net/bonding/rte_eth_bond.h\n@@ -151,7 +151,7 @@ rte_eth_bond_free(const char *name);\n  *\t0 on success, negative value otherwise\n  */\n int\n-rte_eth_bond_slave_add(uint8_t bonded_port_id, uint8_t slave_port_id);\n+rte_eth_bond_slave_add(uint16_t bonded_port_id, uint16_t slave_port_id);\n \n /**\n  * Remove a slave rte_eth_dev device from the bonded device\n@@ -163,7 +163,7 @@ rte_eth_bond_slave_add(uint8_t bonded_port_id, uint8_t slave_port_id);\n  *\t0 on success, negative value otherwise\n  */\n int\n-rte_eth_bond_slave_remove(uint8_t bonded_port_id, uint8_t slave_port_id);\n+rte_eth_bond_slave_remove(uint16_t bonded_port_id, uint16_t slave_port_id);\n \n /**\n  * Set link bonding mode of bonded device\n@@ -175,7 +175,7 @@ rte_eth_bond_slave_remove(uint8_t bonded_port_id, uint8_t slave_port_id);\n  *\t0 on success, negative value otherwise\n  */\n int\n-rte_eth_bond_mode_set(uint8_t bonded_port_id, uint8_t mode);\n+rte_eth_bond_mode_set(uint16_t bonded_port_id, uint8_t mode);\n \n /**\n  * Get link bonding mode of bonded device\n@@ -186,7 +186,7 @@ rte_eth_bond_mode_set(uint8_t bonded_port_id, uint8_t mode);\n  *\tlink bonding mode on success, negative value otherwise\n  */\n int\n-rte_eth_bond_mode_get(uint8_t bonded_port_id);\n+rte_eth_bond_mode_get(uint16_t bonded_port_id);\n \n /**\n  * Set slave rte_eth_dev as primary slave of bonded device\n@@ -198,7 +198,7 @@ rte_eth_bond_mode_get(uint8_t bonded_port_id);\n  *\t0 on success, negative value otherwise\n  */\n int\n-rte_eth_bond_primary_set(uint8_t bonded_port_id, uint8_t slave_port_id);\n+rte_eth_bond_primary_set(uint16_t bonded_port_id, uint16_t slave_port_id);\n \n /**\n  * Get primary slave of bonded device\n@@ -209,7 +209,7 @@ rte_eth_bond_primary_set(uint8_t bonded_port_id, uint8_t slave_port_id);\n  *\tPort Id of primary slave on success, -1 on failure\n  */\n int\n-rte_eth_bond_primary_get(uint8_t bonded_port_id);\n+rte_eth_bond_primary_get(uint16_t bonded_port_id);\n \n /**\n  * Populate an array with list of the slaves port id's of the bonded device\n@@ -223,7 +223,8 @@ rte_eth_bond_primary_get(uint8_t bonded_port_id);\n  *\tnegative value otherwise\n  */\n int\n-rte_eth_bond_slaves_get(uint8_t bonded_port_id, uint8_t slaves[], uint8_t len);\n+rte_eth_bond_slaves_get(uint16_t bonded_port_id, uint16_t slaves[],\n+\t\t\tuint16_t len);\n \n /**\n  * Populate an array with list of the active slaves port id's of the bonded\n@@ -238,8 +239,8 @@ rte_eth_bond_slaves_get(uint8_t bonded_port_id, uint8_t slaves[], uint8_t len);\n  *\tnegative value otherwise\n  */\n int\n-rte_eth_bond_active_slaves_get(uint8_t bonded_port_id, uint8_t slaves[],\n-\t\tuint8_t len);\n+rte_eth_bond_active_slaves_get(uint16_t bonded_port_id, uint16_t slaves[],\n+\t\t\t\tuint16_t len);\n \n /**\n  * Set explicit MAC address to use on bonded device and it's slaves.\n@@ -252,7 +253,7 @@ rte_eth_bond_active_slaves_get(uint8_t bonded_port_id, uint8_t slaves[],\n  *\t0 on success, negative value otherwise\n  */\n int\n-rte_eth_bond_mac_address_set(uint8_t bonded_port_id,\n+rte_eth_bond_mac_address_set(uint16_t bonded_port_id,\n \t\tstruct ether_addr *mac_addr);\n \n /**\n@@ -265,7 +266,7 @@ rte_eth_bond_mac_address_set(uint8_t bonded_port_id,\n  *\t0 on success, negative value otherwise\n  */\n int\n-rte_eth_bond_mac_address_reset(uint8_t bonded_port_id);\n+rte_eth_bond_mac_address_reset(uint16_t bonded_port_id);\n \n /**\n  * Set the transmit policy for bonded device to use when it is operating in\n@@ -279,7 +280,7 @@ rte_eth_bond_mac_address_reset(uint8_t bonded_port_id);\n  *\t0 on success, negative value otherwise.\n  */\n int\n-rte_eth_bond_xmit_policy_set(uint8_t bonded_port_id, uint8_t policy);\n+rte_eth_bond_xmit_policy_set(uint16_t bonded_port_id, uint8_t policy);\n \n /**\n  * Get the transmit policy set on bonded device for balance mode operation\n@@ -290,7 +291,7 @@ rte_eth_bond_xmit_policy_set(uint8_t bonded_port_id, uint8_t policy);\n  *\tBalance transmit policy on success, negative value otherwise.\n  */\n int\n-rte_eth_bond_xmit_policy_get(uint8_t bonded_port_id);\n+rte_eth_bond_xmit_policy_get(uint16_t bonded_port_id);\n \n /**\n  * Set the link monitoring frequency (in ms) for monitoring the link status of\n@@ -304,7 +305,7 @@ rte_eth_bond_xmit_policy_get(uint8_t bonded_port_id);\n  */\n \n int\n-rte_eth_bond_link_monitoring_set(uint8_t bonded_port_id, uint32_t internal_ms);\n+rte_eth_bond_link_monitoring_set(uint16_t bonded_port_id, uint32_t internal_ms);\n \n /**\n  * Get the current link monitoring frequency (in ms) for monitoring of the link\n@@ -316,8 +317,7 @@ rte_eth_bond_link_monitoring_set(uint8_t bonded_port_id, uint32_t internal_ms);\n  *\tMonitoring interval on success, negative value otherwise.\n  */\n int\n-rte_eth_bond_link_monitoring_get(uint8_t bonded_port_id);\n-\n+rte_eth_bond_link_monitoring_get(uint16_t bonded_port_id);\n \n /**\n  * Set the period in milliseconds for delaying the disabling of a bonded link\n@@ -330,7 +330,8 @@ rte_eth_bond_link_monitoring_get(uint8_t bonded_port_id);\n  *  0 on success, negative value otherwise.\n  */\n int\n-rte_eth_bond_link_down_prop_delay_set(uint8_t bonded_port_id, uint32_t delay_ms);\n+rte_eth_bond_link_down_prop_delay_set(uint16_t bonded_port_id,\n+\t\t\t\t       uint32_t delay_ms);\n \n /**\n  * Get the period in milliseconds set for delaying the disabling of a bonded\n@@ -342,7 +343,7 @@ rte_eth_bond_link_down_prop_delay_set(uint8_t bonded_port_id, uint32_t delay_ms)\n  *  Delay period on success, negative value otherwise.\n  */\n int\n-rte_eth_bond_link_down_prop_delay_get(uint8_t bonded_port_id);\n+rte_eth_bond_link_down_prop_delay_get(uint16_t bonded_port_id);\n \n /**\n  * Set the period in milliseconds for delaying the enabling of a bonded link\n@@ -355,7 +356,8 @@ rte_eth_bond_link_down_prop_delay_get(uint8_t bonded_port_id);\n  *  0 on success, negative value otherwise.\n  */\n int\n-rte_eth_bond_link_up_prop_delay_set(uint8_t bonded_port_id, uint32_t delay_ms);\n+rte_eth_bond_link_up_prop_delay_set(uint16_t bonded_port_id,\n+\t\t\t\t    uint32_t delay_ms);\n \n /**\n  * Get the period in milliseconds set for delaying the enabling of a bonded\n@@ -367,7 +369,7 @@ rte_eth_bond_link_up_prop_delay_set(uint8_t bonded_port_id, uint32_t delay_ms);\n  *  Delay period on success, negative value otherwise.\n  */\n int\n-rte_eth_bond_link_up_prop_delay_get(uint8_t bonded_port_id);\n+rte_eth_bond_link_up_prop_delay_get(uint16_t bonded_port_id);\n \n \n #ifdef __cplusplus\ndiff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c\nindex 20b5a8961..7423acf0e 100644\n--- a/drivers/net/bonding/rte_eth_bond_8023ad.c\n+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c\n@@ -685,11 +685,11 @@ max_index(uint64_t *a, int n)\n  * @param port_pos\t\t\tPort to assign.\n  */\n static void\n-selection_logic(struct bond_dev_private *internals, uint8_t slave_id)\n+selection_logic(struct bond_dev_private *internals, uint16_t slave_id)\n {\n \tstruct port *agg, *port;\n-\tuint8_t slaves_count, new_agg_id, i, j = 0;\n-\tuint8_t *slaves;\n+\tuint8_t slaves_count, i, j = 0;\n+\tuint16_t *slaves, new_agg_id;\n \tuint64_t agg_bandwidth[8] = {0};\n \tuint64_t agg_count[8] = {0};\n \tuint8_t default_slave = 0;\ndiff --git a/drivers/net/bonding/rte_eth_bond_8023ad_private.h b/drivers/net/bonding/rte_eth_bond_8023ad_private.h\nindex d46e44a84..0d8288ac3 100644\n--- a/drivers/net/bonding/rte_eth_bond_8023ad_private.h\n+++ b/drivers/net/bonding/rte_eth_bond_8023ad_private.h\n@@ -318,12 +318,12 @@ bond_mode_8023ad_mac_address_update(struct rte_eth_dev *bond_dev);\n \n int\n bond_ethdev_8023ad_flow_verify(struct rte_eth_dev *bond_dev,\n-\t\tuint8_t slave_port);\n+\t\t\t\tuint16_t slave_port);\n \n int\n-bond_ethdev_8023ad_flow_set(struct rte_eth_dev *bond_dev, uint8_t slave_port);\n+bond_ethdev_8023ad_flow_set(struct rte_eth_dev *bond_dev, uint16_t slave_port);\n \n int\n-bond_8023ad_slow_pkt_hw_filter_supported(uint8_t port_id);\n+bond_8023ad_slow_pkt_hw_filter_supported(uint16_t port_id);\n \n #endif /* RTE_ETH_BOND_8023AD_H_ */\ndiff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c\nindex de1d9e0db..55f5bb145 100644\n--- a/drivers/net/bonding/rte_eth_bond_api.c\n+++ b/drivers/net/bonding/rte_eth_bond_api.c\n@@ -56,14 +56,14 @@ check_for_bonded_ethdev(const struct rte_eth_dev *eth_dev)\n }\n \n int\n-valid_bonded_port_id(uint8_t port_id)\n+valid_bonded_port_id(uint16_t port_id)\n {\n \tRTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -1);\n \treturn check_for_bonded_ethdev(&rte_eth_devices[port_id]);\n }\n \n int\n-valid_slave_port_id(uint8_t port_id, uint8_t mode)\n+valid_slave_port_id(uint16_t port_id, uint8_t mode)\n {\n \tRTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -1);\n \n@@ -80,7 +80,7 @@ valid_slave_port_id(uint8_t port_id, uint8_t mode)\n }\n \n void\n-activate_slave(struct rte_eth_dev *eth_dev, uint8_t port_id)\n+activate_slave(struct rte_eth_dev *eth_dev, uint16_t port_id)\n {\n \tstruct bond_dev_private *internals = eth_dev->data->dev_private;\n \tuint8_t active_count = internals->active_slave_count;\n@@ -107,9 +107,9 @@ activate_slave(struct rte_eth_dev *eth_dev, uint8_t port_id)\n }\n \n void\n-deactivate_slave(struct rte_eth_dev *eth_dev, uint8_t port_id)\n+deactivate_slave(struct rte_eth_dev *eth_dev, uint16_t port_id)\n {\n-\tuint8_t slave_pos;\n+\tuint16_t slave_pos;\n \tstruct bond_dev_private *internals = eth_dev->data->dev_private;\n \tuint8_t active_count = internals->active_slave_count;\n \n@@ -153,7 +153,7 @@ rte_eth_bond_create(const char *name, uint8_t mode, uint8_t socket_id)\n {\n \tstruct bond_dev_private *internals;\n \tchar devargs[52];\n-\tuint8_t port_id;\n+\tuint16_t port_id;\n \tint ret;\n \n \tif (name == NULL) {\n@@ -193,7 +193,7 @@ rte_eth_bond_free(const char *name)\n }\n \n static int\n-slave_vlan_filter_set(uint8_t bonded_port_id, uint8_t slave_port_id)\n+slave_vlan_filter_set(uint16_t bonded_port_id, uint16_t slave_port_id)\n {\n \tstruct rte_eth_dev *bonded_eth_dev;\n \tstruct bond_dev_private *internals;\n@@ -233,7 +233,7 @@ slave_vlan_filter_set(uint8_t bonded_port_id, uint8_t slave_port_id)\n }\n \n static int\n-__eth_bond_slave_add_lock_free(uint8_t bonded_port_id, uint8_t slave_port_id)\n+__eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id)\n {\n \tstruct rte_eth_dev *bonded_eth_dev, *slave_eth_dev;\n \tstruct bond_dev_private *internals;\n@@ -363,7 +363,7 @@ __eth_bond_slave_add_lock_free(uint8_t bonded_port_id, uint8_t slave_port_id)\n }\n \n int\n-rte_eth_bond_slave_add(uint8_t bonded_port_id, uint8_t slave_port_id)\n+rte_eth_bond_slave_add(uint16_t bonded_port_id, uint16_t slave_port_id)\n {\n \tstruct rte_eth_dev *bonded_eth_dev;\n \tstruct bond_dev_private *internals;\n@@ -466,7 +466,7 @@ __eth_bond_slave_remove_lock_free(uint8_t bonded_port_id, uint8_t slave_port_id)\n }\n \n int\n-rte_eth_bond_slave_remove(uint8_t bonded_port_id, uint8_t slave_port_id)\n+rte_eth_bond_slave_remove(uint16_t bonded_port_id, uint16_t slave_port_id)\n {\n \tstruct rte_eth_dev *bonded_eth_dev;\n \tstruct bond_dev_private *internals;\n@@ -488,7 +488,7 @@ rte_eth_bond_slave_remove(uint8_t bonded_port_id, uint8_t slave_port_id)\n }\n \n int\n-rte_eth_bond_mode_set(uint8_t bonded_port_id, uint8_t mode)\n+rte_eth_bond_mode_set(uint16_t bonded_port_id, uint8_t mode)\n {\n \tif (valid_bonded_port_id(bonded_port_id) != 0)\n \t\treturn -1;\n@@ -497,7 +497,7 @@ rte_eth_bond_mode_set(uint8_t bonded_port_id, uint8_t mode)\n }\n \n int\n-rte_eth_bond_mode_get(uint8_t bonded_port_id)\n+rte_eth_bond_mode_get(uint16_t bonded_port_id)\n {\n \tstruct bond_dev_private *internals;\n \n@@ -510,7 +510,7 @@ rte_eth_bond_mode_get(uint8_t bonded_port_id)\n }\n \n int\n-rte_eth_bond_primary_set(uint8_t bonded_port_id, uint8_t slave_port_id)\n+rte_eth_bond_primary_set(uint16_t bonded_port_id, uint16_t slave_port_id)\n {\n \tstruct bond_dev_private *internals;\n \n@@ -531,7 +531,7 @@ rte_eth_bond_primary_set(uint8_t bonded_port_id, uint8_t slave_port_id)\n }\n \n int\n-rte_eth_bond_primary_get(uint8_t bonded_port_id)\n+rte_eth_bond_primary_get(uint16_t bonded_port_id)\n {\n \tstruct bond_dev_private *internals;\n \n@@ -547,7 +547,8 @@ rte_eth_bond_primary_get(uint8_t bonded_port_id)\n }\n \n int\n-rte_eth_bond_slaves_get(uint8_t bonded_port_id, uint8_t slaves[], uint8_t len)\n+rte_eth_bond_slaves_get(uint16_t bonded_port_id, uint16_t slaves[],\n+\t\t\tuint16_t len)\n {\n \tstruct bond_dev_private *internals;\n \tuint8_t i;\n@@ -570,8 +571,8 @@ rte_eth_bond_slaves_get(uint8_t bonded_port_id, uint8_t slaves[], uint8_t len)\n }\n \n int\n-rte_eth_bond_active_slaves_get(uint8_t bonded_port_id, uint8_t slaves[],\n-\t\tuint8_t len)\n+rte_eth_bond_active_slaves_get(uint16_t bonded_port_id, uint16_t slaves[],\n+\t\t\t\tuint16_t len)\n {\n \tstruct bond_dev_private *internals;\n \n@@ -592,7 +593,7 @@ rte_eth_bond_active_slaves_get(uint8_t bonded_port_id, uint8_t slaves[],\n }\n \n int\n-rte_eth_bond_mac_address_set(uint8_t bonded_port_id,\n+rte_eth_bond_mac_address_set(uint16_t bonded_port_id,\n \t\tstruct ether_addr *mac_addr)\n {\n \tstruct rte_eth_dev *bonded_eth_dev;\n@@ -618,7 +619,7 @@ rte_eth_bond_mac_address_set(uint8_t bonded_port_id,\n }\n \n int\n-rte_eth_bond_mac_address_reset(uint8_t bonded_port_id)\n+rte_eth_bond_mac_address_reset(uint16_t bonded_port_id)\n {\n \tstruct rte_eth_dev *bonded_eth_dev;\n \tstruct bond_dev_private *internals;\n@@ -647,7 +648,7 @@ rte_eth_bond_mac_address_reset(uint8_t bonded_port_id)\n }\n \n int\n-rte_eth_bond_xmit_policy_set(uint8_t bonded_port_id, uint8_t policy)\n+rte_eth_bond_xmit_policy_set(uint16_t bonded_port_id, uint8_t policy)\n {\n \tstruct bond_dev_private *internals;\n \n@@ -677,7 +678,7 @@ rte_eth_bond_xmit_policy_set(uint8_t bonded_port_id, uint8_t policy)\n }\n \n int\n-rte_eth_bond_xmit_policy_get(uint8_t bonded_port_id)\n+rte_eth_bond_xmit_policy_get(uint16_t bonded_port_id)\n {\n \tstruct bond_dev_private *internals;\n \n@@ -690,7 +691,7 @@ rte_eth_bond_xmit_policy_get(uint8_t bonded_port_id)\n }\n \n int\n-rte_eth_bond_link_monitoring_set(uint8_t bonded_port_id, uint32_t internal_ms)\n+rte_eth_bond_link_monitoring_set(uint16_t bonded_port_id, uint32_t internal_ms)\n {\n \tstruct bond_dev_private *internals;\n \n@@ -704,7 +705,7 @@ rte_eth_bond_link_monitoring_set(uint8_t bonded_port_id, uint32_t internal_ms)\n }\n \n int\n-rte_eth_bond_link_monitoring_get(uint8_t bonded_port_id)\n+rte_eth_bond_link_monitoring_get(uint16_t bonded_port_id)\n {\n \tstruct bond_dev_private *internals;\n \n@@ -717,7 +718,8 @@ rte_eth_bond_link_monitoring_get(uint8_t bonded_port_id)\n }\n \n int\n-rte_eth_bond_link_down_prop_delay_set(uint8_t bonded_port_id, uint32_t delay_ms)\n+rte_eth_bond_link_down_prop_delay_set(uint16_t bonded_port_id,\n+\t\t\t\t       uint32_t delay_ms)\n \n {\n \tstruct bond_dev_private *internals;\n@@ -732,7 +734,7 @@ rte_eth_bond_link_down_prop_delay_set(uint8_t bonded_port_id, uint32_t delay_ms)\n }\n \n int\n-rte_eth_bond_link_down_prop_delay_get(uint8_t bonded_port_id)\n+rte_eth_bond_link_down_prop_delay_get(uint16_t bonded_port_id)\n {\n \tstruct bond_dev_private *internals;\n \n@@ -745,7 +747,7 @@ rte_eth_bond_link_down_prop_delay_get(uint8_t bonded_port_id)\n }\n \n int\n-rte_eth_bond_link_up_prop_delay_set(uint8_t bonded_port_id, uint32_t delay_ms)\n+rte_eth_bond_link_up_prop_delay_set(uint16_t bonded_port_id, uint32_t delay_ms)\n \n {\n \tstruct bond_dev_private *internals;\n@@ -760,7 +762,7 @@ rte_eth_bond_link_up_prop_delay_set(uint8_t bonded_port_id, uint32_t delay_ms)\n }\n \n int\n-rte_eth_bond_link_up_prop_delay_get(uint8_t bonded_port_id)\n+rte_eth_bond_link_up_prop_delay_get(uint16_t bonded_port_id)\n {\n \tstruct bond_dev_private *internals;\n \ndiff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c\nindex 3ee70baa0..5a288e631 100644\n--- a/drivers/net/bonding/rte_eth_bond_pmd.c\n+++ b/drivers/net/bonding/rte_eth_bond_pmd.c\n@@ -174,7 +174,7 @@ const struct rte_flow_attr flow_attr_8023ad = {\n \n int\n bond_ethdev_8023ad_flow_verify(struct rte_eth_dev *bond_dev,\n-\t\tuint8_t slave_port) {\n+\t\t\t\tuint16_t slave_port) {\n \tstruct rte_flow_error error;\n \tstruct bond_dev_private *internals = (struct bond_dev_private *)\n \t\t\t(bond_dev->data->dev_private);\n@@ -202,12 +202,12 @@ bond_ethdev_8023ad_flow_verify(struct rte_eth_dev *bond_dev,\n }\n \n int\n-bond_8023ad_slow_pkt_hw_filter_supported(uint8_t port_id) {\n+bond_8023ad_slow_pkt_hw_filter_supported(uint16_t port_id) {\n \tstruct rte_eth_dev *bond_dev = &rte_eth_devices[port_id];\n \tstruct bond_dev_private *internals = (struct bond_dev_private *)\n \t\t\t(bond_dev->data->dev_private);\n \tstruct rte_eth_dev_info bond_info, slave_info;\n-\tuint8_t idx;\n+\tuint16_t idx;\n \n \t/* Verify if all slaves in bonding supports flow director and */\n \tif (internals->slave_count > 0) {\n@@ -230,7 +230,7 @@ bond_8023ad_slow_pkt_hw_filter_supported(uint8_t port_id) {\n }\n \n int\n-bond_ethdev_8023ad_flow_set(struct rte_eth_dev *bond_dev, uint8_t slave_port) {\n+bond_ethdev_8023ad_flow_set(struct rte_eth_dev *bond_dev, uint16_t slave_port) {\n \n \tstruct rte_flow_error error;\n \tstruct bond_dev_private *internals = (struct bond_dev_private *)\n@@ -270,10 +270,10 @@ bond_ethdev_rx_burst_8023ad_fast_queue(void *queue, struct rte_mbuf **bufs,\n \tstruct bond_rx_queue *bd_rx_q = (struct bond_rx_queue *)queue;\n \tstruct bond_dev_private *internals = bd_rx_q->dev_private;\n \tuint16_t num_rx_total = 0;\t/* Total number of received packets */\n-\tuint8_t slaves[RTE_MAX_ETHPORTS];\n-\tuint8_t slave_count;\n+\tuint16_t slaves[RTE_MAX_ETHPORTS];\n+\tuint16_t slave_count;\n \n-\tuint8_t i, idx;\n+\tuint16_t i, idx;\n \n \t/* Copy slave list to protect against slave up/down changes during tx\n \t * bursting */\n@@ -302,8 +302,8 @@ bond_ethdev_tx_burst_8023ad_fast_queue(void *queue, struct rte_mbuf **bufs,\n \tstruct bond_dev_private *internals;\n \tstruct bond_tx_queue *bd_tx_q;\n \n-\tuint8_t num_of_slaves;\n-\tuint8_t slaves[RTE_MAX_ETHPORTS];\n+\tuint16_t num_of_slaves;\n+\tuint16_t slaves[RTE_MAX_ETHPORTS];\n \t /* positions in slaves, not ID */\n \tuint8_t distributing_offsets[RTE_MAX_ETHPORTS];\n \tuint8_t distributing_count;\n@@ -1861,7 +1861,7 @@ slave_add(struct bond_dev_private *internals,\n \n void\n bond_ethdev_primary_set(struct bond_dev_private *internals,\n-\t\tuint8_t slave_port_id)\n+\t\t\tuint16_t slave_port_id)\n {\n \tint i;\n \n@@ -2277,7 +2277,7 @@ bond_ethdev_slave_link_status_change_monitor(void *cb_arg)\n static int\n bond_ethdev_link_update(struct rte_eth_dev *ethdev, int wait_to_complete)\n {\n-\tvoid (*link_update)(uint8_t port_id, struct rte_eth_link *eth_link);\n+\tvoid (*link_update)(uint16_t port_id, struct rte_eth_link *eth_link);\n \n \tstruct bond_dev_private *bond_ctx;\n \tstruct rte_eth_link slave_link;\n@@ -2466,8 +2466,8 @@ bond_ethdev_delayed_lsc_propagation(void *arg)\n }\n \n int\n-bond_ethdev_lsc_event_callback(uint8_t port_id, enum rte_eth_event_type type,\n-\t\tvoid *param, void *ret_param __rte_unused)\n+bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type,\n+\t\t\t\tvoid *param, void *ret_param __rte_unused)\n {\n \tstruct rte_eth_dev *bonded_eth_dev;\n \tstruct bond_dev_private *internals;\n@@ -3086,7 +3086,7 @@ bond_ethdev_configure(struct rte_eth_dev *dev)\n \t/* Parse/set primary slave port id*/\n \targ_count = rte_kvargs_count(kvlist, PMD_BOND_PRIMARY_SLAVE_KVARG);\n \tif (arg_count == 1) {\n-\t\tuint8_t primary_slave_port_id;\n+\t\tuint16_t primary_slave_port_id;\n \n \t\tif (rte_kvargs_process(kvlist,\n \t\t\t\tPMD_BOND_PRIMARY_SLAVE_KVARG,\n@@ -3099,7 +3099,7 @@ bond_ethdev_configure(struct rte_eth_dev *dev)\n \t\t}\n \n \t\t/* Set balance mode transmit policy*/\n-\t\tif (rte_eth_bond_primary_set(port_id, (uint8_t)primary_slave_port_id)\n+\t\tif (rte_eth_bond_primary_set(port_id, primary_slave_port_id)\n \t\t\t\t!= 0) {\n \t\t\tRTE_LOG(ERR, EAL,\n \t\t\t\t\t\"Failed to set primary slave port %d on bonded device %s\\n\",\ndiff --git a/drivers/net/bonding/rte_eth_bond_private.h b/drivers/net/bonding/rte_eth_bond_private.h\nindex 1fe6ff880..758ef78a0 100644\n--- a/drivers/net/bonding/rte_eth_bond_private.h\n+++ b/drivers/net/bonding/rte_eth_bond_private.h\n@@ -93,12 +93,12 @@ struct bond_tx_queue {\n \n /** Bonded slave devices structure */\n struct bond_ethdev_slave_ports {\n-\tuint8_t slaves[RTE_MAX_ETHPORTS];\t/**< Slave port id array */\n-\tuint8_t slave_count;\t\t\t\t/**< Number of slaves */\n+\tuint16_t slaves[RTE_MAX_ETHPORTS];\t/**< Slave port id array */\n+\tuint16_t slave_count;\t\t\t/**< Number of slaves */\n };\n \n struct bond_slave_details {\n-\tuint8_t port_id;\n+\tuint16_t port_id;\n \n \tuint8_t link_status_poll_enabled;\n \tuint8_t link_status_wait_to_complete;\n@@ -114,14 +114,14 @@ typedef uint16_t (*xmit_hash_t)(const struct rte_mbuf *buf, uint8_t slave_count)\n \n /** Link Bonding PMD device private configuration Structure */\n struct bond_dev_private {\n-\tuint8_t port_id;\t\t\t\t\t/**< Port Id of Bonded Port */\n-\tuint8_t mode;\t\t\t\t\t\t/**< Link Bonding Mode */\n+\tuint16_t port_id;\t\t/**< Port Id of Bonded Port */\n+\tuint8_t mode;\t\t\t/**< Link Bonding Mode */\n \n \trte_spinlock_t lock;\n \n-\tuint8_t primary_port;\t\t\t\t/**< Primary Slave Port */\n-\tuint8_t current_primary_port;\t\t/**< Primary Slave Port */\n-\tuint8_t user_defined_primary_port;\n+\tuint16_t primary_port;\t\t/**< Primary Slave Port */\n+\tuint16_t current_primary_port;\t\t/**< Primary Slave Port */\n+\tuint16_t user_defined_primary_port;\n \t/**< Flag for whether primary port is user defined or not */\n \n \tuint8_t balance_xmit_policy;\n@@ -146,14 +146,15 @@ struct bond_dev_private {\n \n \tuint8_t active_slave;\t\t/**< Next active_slave to poll */\n \tuint8_t active_slave_count;\t\t/**< Number of active slaves */\n-\tuint8_t active_slaves[RTE_MAX_ETHPORTS];\t/**< Active slave list */\n+\tuint16_t active_slaves[RTE_MAX_ETHPORTS];    /**< Active slave list */\n \n \tuint8_t slave_count;\t\t\t/**< Number of bonded slaves */\n \tstruct bond_slave_details slaves[RTE_MAX_ETHPORTS];\n \t/**< Arary of bonded slaves details */\n \n \tstruct mode8023ad_private mode4;\n-\tuint8_t tlb_slaves_order[RTE_MAX_ETHPORTS]; /* TLB active slaves send order */\n+\t/**< TLB active slaves send order */\n+\tuint16_t tlb_slaves_order[RTE_MAX_ETHPORTS];\n \tstruct mode_alb_private mode6;\n \n \tuint32_t rx_offload_capa;            /** Rx offload capability */\n@@ -186,10 +187,10 @@ check_for_bonded_ethdev(const struct rte_eth_dev *eth_dev);\n \n /* Search given slave array to find position of given id.\n  * Return slave pos or slaves_count if not found. */\n-static inline uint8_t\n-find_slave_by_id(uint8_t *slaves, uint8_t slaves_count, uint8_t slave_id) {\n+static inline uint16_t\n+find_slave_by_id(uint16_t *slaves, uint8_t slaves_count, uint16_t slave_id) {\n \n-\tuint8_t pos;\n+\tuint16_t pos;\n \tfor (pos = 0; pos < slaves_count; pos++) {\n \t\tif (slave_id == slaves[pos])\n \t\t\tbreak;\n@@ -199,19 +200,19 @@ find_slave_by_id(uint8_t *slaves, uint8_t slaves_count, uint8_t slave_id) {\n }\n \n int\n-valid_port_id(uint8_t port_id);\n+valid_port_id(uint16_t port_id);\n \n int\n-valid_bonded_port_id(uint8_t port_id);\n+valid_bonded_port_id(uint16_t port_id);\n \n int\n-valid_slave_port_id(uint8_t port_id, uint8_t mode);\n+valid_slave_port_id(uint16_t port_id, uint8_t mode);\n \n void\n-deactivate_slave(struct rte_eth_dev *eth_dev, uint8_t port_id);\n+deactivate_slave(struct rte_eth_dev *eth_dev, uint16_t port_id);\n \n void\n-activate_slave(struct rte_eth_dev *eth_dev, uint8_t port_id);\n+activate_slave(struct rte_eth_dev *eth_dev, uint16_t port_id);\n \n void\n link_properties_set(struct rte_eth_dev *bonded_eth_dev,\n@@ -255,11 +256,11 @@ xmit_l34_hash(const struct rte_mbuf *buf, uint8_t slave_count);\n \n void\n bond_ethdev_primary_set(struct bond_dev_private *internals,\n-\t\tuint8_t slave_port_id);\n+\t\tuint16_t slave_port_id);\n \n int\n-bond_ethdev_lsc_event_callback(uint8_t port_id, enum rte_eth_event_type type,\n-\t\tvoid *param, void *ret_param);\n+bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type,\n+\t\t\t\tvoid *param, void *ret_param);\n \n int\n bond_ethdev_parse_slave_port_kvarg(const char *key,\ndiff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c\nindex 31819c5bd..06ba68e39 100644\n--- a/drivers/net/e1000/em_rxtx.c\n+++ b/drivers/net/e1000/em_rxtx.c\n@@ -119,7 +119,7 @@ struct em_rx_queue {\n \tuint16_t            nb_rx_hold; /**< number of held free RX desc. */\n \tuint16_t            rx_free_thresh; /**< max free RX desc to hold. */\n \tuint16_t            queue_id;   /**< RX queue index. */\n-\tuint8_t             port_id;    /**< Device port identifier. */\n+\tuint16_t            port_id;    /**< Device port identifier. */\n \tuint8_t             pthresh;    /**< Prefetch threshold register. */\n \tuint8_t             hthresh;    /**< Host threshold register. */\n \tuint8_t             wthresh;    /**< Write-back threshold register. */\n@@ -186,7 +186,7 @@ struct em_tx_queue {\n \t/** Total number of TX descriptors ready to be allocated. */\n \tuint16_t               nb_tx_free;\n \tuint16_t               queue_id; /**< TX queue index. */\n-\tuint8_t                port_id;  /**< Device port identifier. */\n+\tuint16_t               port_id;  /**< Device port identifier. */\n \tuint8_t                pthresh;  /**< Prefetch threshold register. */\n \tuint8_t                hthresh;  /**< Host threshold register. */\n \tuint8_t                wthresh;  /**< Write-back threshold register. */\ndiff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c\nindex 1c80a2a1b..a800d9c2b 100644\n--- a/drivers/net/e1000/igb_rxtx.c\n+++ b/drivers/net/e1000/igb_rxtx.c\n@@ -122,7 +122,7 @@ struct igb_rx_queue {\n \tuint16_t            rx_free_thresh; /**< max free RX desc to hold. */\n \tuint16_t            queue_id;   /**< RX queue index. */\n \tuint16_t            reg_idx;    /**< RX queue register index. */\n-\tuint8_t             port_id;    /**< Device port identifier. */\n+\tuint16_t            port_id;    /**< Device port identifier. */\n \tuint8_t             pthresh;    /**< Prefetch threshold register. */\n \tuint8_t             hthresh;    /**< Host threshold register. */\n \tuint8_t             wthresh;    /**< Write-back threshold register. */\n@@ -191,7 +191,7 @@ struct igb_tx_queue {\n \t/**< Index of first used TX descriptor. */\n \tuint16_t               queue_id; /**< TX queue index. */\n \tuint16_t               reg_idx;  /**< TX queue register index. */\n-\tuint8_t                port_id;  /**< Device port identifier. */\n+\tuint16_t               port_id;  /**< Device port identifier. */\n \tuint8_t                pthresh;  /**< Prefetch threshold register. */\n \tuint8_t                hthresh;  /**< Host threshold register. */\n \tuint8_t                wthresh;  /**< Write-back threshold register. */\ndiff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/failsafe_ether.c\nindex a3a8cce95..1c8a9337e 100644\n--- a/drivers/net/failsafe/failsafe_ether.c\n+++ b/drivers/net/failsafe/failsafe_ether.c\n@@ -400,7 +400,7 @@ failsafe_eth_dev_state_sync(struct rte_eth_dev *dev)\n }\n \n int\n-failsafe_eth_rmv_event_callback(uint8_t port_id __rte_unused,\n+failsafe_eth_rmv_event_callback(uint16_t port_id __rte_unused,\n \t\t\t\tenum rte_eth_event_type event __rte_unused,\n \t\t\t\tvoid *cb_arg, void *out __rte_unused)\n {\n@@ -419,7 +419,7 @@ failsafe_eth_rmv_event_callback(uint8_t port_id __rte_unused,\n }\n \n int\n-failsafe_eth_lsc_event_callback(uint8_t port_id __rte_unused,\n+failsafe_eth_lsc_event_callback(uint16_t port_id __rte_unused,\n \t\t\t\tenum rte_eth_event_type event __rte_unused,\n \t\t\t\tvoid *cb_arg, void *out __rte_unused)\n {\ndiff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h\nindex 0361cf434..4ae6e6c5f 100644\n--- a/drivers/net/failsafe/failsafe_private.h\n+++ b/drivers/net/failsafe/failsafe_private.h\n@@ -180,10 +180,10 @@ int failsafe_eal_uninit(struct rte_eth_dev *dev);\n \n int failsafe_eth_dev_state_sync(struct rte_eth_dev *dev);\n void failsafe_dev_remove(struct rte_eth_dev *dev);\n-int failsafe_eth_rmv_event_callback(uint8_t port_id,\n+int failsafe_eth_rmv_event_callback(uint16_t port_id,\n \t\t\t\t    enum rte_eth_event_type type,\n \t\t\t\t    void *arg, void *out);\n-int failsafe_eth_lsc_event_callback(uint8_t port_id,\n+int failsafe_eth_lsc_event_callback(uint16_t port_id,\n \t\t\t\t    enum rte_eth_event_type event,\n \t\t\t\t    void *cb_arg, void *out);\n \ndiff --git a/drivers/net/fm10k/fm10k.h b/drivers/net/fm10k/fm10k.h\nindex 8e1a95062..060982b10 100644\n--- a/drivers/net/fm10k/fm10k.h\n+++ b/drivers/net/fm10k/fm10k.h\n@@ -204,7 +204,7 @@ struct fm10k_rx_queue {\n \tuint16_t rxrearm_nb;     /* number of remaining to be re-armed */\n \tuint16_t rxrearm_start;  /* the idx we start the re-arming from */\n \tuint16_t rx_using_sse; /* indicates that vector RX is in use */\n-\tuint8_t port_id;\n+\tuint16_t port_id;\n \tuint8_t drop_en;\n \tuint8_t rx_deferred_start; /* don't start this queue in dev start. */\n \tuint16_t rx_ftag_en; /* indicates FTAG RX supported */\n@@ -241,7 +241,7 @@ struct fm10k_tx_queue {\n \tvolatile uint32_t *tail_ptr;\n \tuint32_t txq_flags; /* Holds flags for this TXq */\n \tuint16_t nb_desc;\n-\tuint8_t port_id;\n+\tuint16_t port_id;\n \tuint8_t tx_deferred_start; /** don't start this queue in dev start. */\n \tuint16_t queue_id;\n \tuint16_t tx_ftag_en; /* indicates FTAG TX supported */\n@@ -289,7 +289,7 @@ static inline uint16_t fifo_remove(struct fifo *fifo)\n }\n \n static inline void\n-fm10k_pktmbuf_reset(struct rte_mbuf *mb, uint8_t in_port)\n+fm10k_pktmbuf_reset(struct rte_mbuf *mb, uint16_t in_port)\n {\n \trte_mbuf_refcnt_set(mb, 1);\n \tmb->next = NULL;\ndiff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c\nindex 5f26e24a3..d17d7497f 100644\n--- a/drivers/net/i40e/i40e_ethdev.c\n+++ b/drivers/net/i40e/i40e_ethdev.c\n@@ -1918,8 +1918,9 @@ i40e_dev_start(struct rte_eth_dev *dev)\n \thw->adapter_stopped = 0;\n \n \tif (dev->data->dev_conf.link_speeds & ETH_LINK_SPEED_FIXED) {\n-\t\tPMD_INIT_LOG(ERR, \"Invalid link_speeds for port %hhu; autonegotiation disabled\",\n-\t\t\t     dev->data->port_id);\n+\t\tPMD_INIT_LOG(ERR,\n+\t\t\"Invalid link_speeds for port %u, autonegotiation disabled\",\n+\t\t\t      dev->data->port_id);\n \t\treturn -EINVAL;\n \t}\n \ndiff --git a/drivers/net/i40e/i40e_rxtx.h b/drivers/net/i40e/i40e_rxtx.h\nindex 20084d649..ff2ab8575 100644\n--- a/drivers/net/i40e/i40e_rxtx.h\n+++ b/drivers/net/i40e/i40e_rxtx.h\n@@ -121,7 +121,7 @@ struct i40e_rx_queue {\n \tuint16_t rxrearm_start;\t/**< the idx we start the re-arming from */\n \tuint64_t mbuf_initializer; /**< value to init mbufs */\n \n-\tuint8_t port_id; /**< device port ID */\n+\tuint16_t port_id; /**< device port ID */\n \tuint8_t crc_len; /**< 0 if CRC stripped, 4 otherwise */\n \tuint16_t queue_id; /**< RX queue index */\n \tuint16_t reg_idx; /**< RX queue register index */\n@@ -167,7 +167,7 @@ struct i40e_tx_queue {\n \tuint8_t pthresh; /**< Prefetch threshold register. */\n \tuint8_t hthresh; /**< Host threshold register. */\n \tuint8_t wthresh; /**< Write-back threshold reg. */\n-\tuint8_t port_id; /**< Device port identifier. */\n+\tuint16_t port_id; /**< Device port identifier. */\n \tuint16_t queue_id; /**< TX queue index. */\n \tuint16_t reg_idx;\n \tuint32_t txq_flags;\ndiff --git a/drivers/net/i40e/rte_pmd_i40e.c b/drivers/net/i40e/rte_pmd_i40e.c\nindex f12b7f4a1..3728d39b9 100644\n--- a/drivers/net/i40e/rte_pmd_i40e.c\n+++ b/drivers/net/i40e/rte_pmd_i40e.c\n@@ -41,7 +41,7 @@\n #include \"rte_pmd_i40e.h\"\n \n int\n-rte_pmd_i40e_ping_vfs(uint8_t port, uint16_t vf)\n+rte_pmd_i40e_ping_vfs(uint16_t port, uint16_t vf)\n {\n \tstruct rte_eth_dev *dev;\n \tstruct i40e_pf *pf;\n@@ -66,7 +66,7 @@ rte_pmd_i40e_ping_vfs(uint8_t port, uint16_t vf)\n }\n \n int\n-rte_pmd_i40e_set_vf_mac_anti_spoof(uint8_t port, uint16_t vf_id, uint8_t on)\n+rte_pmd_i40e_set_vf_mac_anti_spoof(uint16_t port, uint16_t vf_id, uint8_t on)\n {\n \tstruct rte_eth_dev *dev;\n \tstruct i40e_pf *pf;\n@@ -170,7 +170,7 @@ i40e_add_rm_all_vlan_filter(struct i40e_vsi *vsi, uint8_t add)\n }\n \n int\n-rte_pmd_i40e_set_vf_vlan_anti_spoof(uint8_t port, uint16_t vf_id, uint8_t on)\n+rte_pmd_i40e_set_vf_vlan_anti_spoof(uint16_t port, uint16_t vf_id, uint8_t on)\n {\n \tstruct rte_eth_dev *dev;\n \tstruct i40e_pf *pf;\n@@ -430,7 +430,7 @@ i40e_vsi_set_tx_loopback(struct i40e_vsi *vsi, uint8_t on)\n }\n \n int\n-rte_pmd_i40e_set_tx_loopback(uint8_t port, uint8_t on)\n+rte_pmd_i40e_set_tx_loopback(uint16_t port, uint8_t on)\n {\n \tstruct rte_eth_dev *dev;\n \tstruct i40e_pf *pf;\n@@ -473,7 +473,7 @@ rte_pmd_i40e_set_tx_loopback(uint8_t port, uint8_t on)\n }\n \n int\n-rte_pmd_i40e_set_vf_unicast_promisc(uint8_t port, uint16_t vf_id, uint8_t on)\n+rte_pmd_i40e_set_vf_unicast_promisc(uint16_t port, uint16_t vf_id, uint8_t on)\n {\n \tstruct rte_eth_dev *dev;\n \tstruct i40e_pf *pf;\n@@ -514,7 +514,7 @@ rte_pmd_i40e_set_vf_unicast_promisc(uint8_t port, uint16_t vf_id, uint8_t on)\n }\n \n int\n-rte_pmd_i40e_set_vf_multicast_promisc(uint8_t port, uint16_t vf_id, uint8_t on)\n+rte_pmd_i40e_set_vf_multicast_promisc(uint16_t port, uint16_t vf_id, uint8_t on)\n {\n \tstruct rte_eth_dev *dev;\n \tstruct i40e_pf *pf;\n@@ -555,7 +555,7 @@ rte_pmd_i40e_set_vf_multicast_promisc(uint8_t port, uint16_t vf_id, uint8_t on)\n }\n \n int\n-rte_pmd_i40e_set_vf_mac_addr(uint8_t port, uint16_t vf_id,\n+rte_pmd_i40e_set_vf_mac_addr(uint16_t port, uint16_t vf_id,\n \t\t\t     struct ether_addr *mac_addr)\n {\n \tstruct i40e_mac_filter *f;\n@@ -598,7 +598,7 @@ rte_pmd_i40e_set_vf_mac_addr(uint8_t port, uint16_t vf_id,\n \n /* Set vlan strip on/off for specific VF from host */\n int\n-rte_pmd_i40e_set_vf_vlan_stripq(uint8_t port, uint16_t vf_id, uint8_t on)\n+rte_pmd_i40e_set_vf_vlan_stripq(uint16_t port, uint16_t vf_id, uint8_t on)\n {\n \tstruct rte_eth_dev *dev;\n \tstruct i40e_pf *pf;\n@@ -633,7 +633,7 @@ rte_pmd_i40e_set_vf_vlan_stripq(uint8_t port, uint16_t vf_id, uint8_t on)\n \treturn ret;\n }\n \n-int rte_pmd_i40e_set_vf_vlan_insert(uint8_t port, uint16_t vf_id,\n+int rte_pmd_i40e_set_vf_vlan_insert(uint16_t port, uint16_t vf_id,\n \t\t\t\t    uint16_t vlan_id)\n {\n \tstruct rte_eth_dev *dev;\n@@ -698,7 +698,7 @@ int rte_pmd_i40e_set_vf_vlan_insert(uint8_t port, uint16_t vf_id,\n \treturn ret;\n }\n \n-int rte_pmd_i40e_set_vf_broadcast(uint8_t port, uint16_t vf_id,\n+int rte_pmd_i40e_set_vf_broadcast(uint16_t port, uint16_t vf_id,\n \t\t\t\t  uint8_t on)\n {\n \tstruct rte_eth_dev *dev;\n@@ -764,7 +764,7 @@ int rte_pmd_i40e_set_vf_broadcast(uint8_t port, uint16_t vf_id,\n \treturn ret;\n }\n \n-int rte_pmd_i40e_set_vf_vlan_tag(uint8_t port, uint16_t vf_id, uint8_t on)\n+int rte_pmd_i40e_set_vf_vlan_tag(uint16_t port, uint16_t vf_id, uint8_t on)\n {\n \tstruct rte_eth_dev *dev;\n \tstruct i40e_pf *pf;\n@@ -858,7 +858,7 @@ i40e_vlan_filter_count(struct i40e_vsi *vsi)\n \treturn count;\n }\n \n-int rte_pmd_i40e_set_vf_vlan_filter(uint8_t port, uint16_t vlan_id,\n+int rte_pmd_i40e_set_vf_vlan_filter(uint16_t port, uint16_t vlan_id,\n \t\t\t\t    uint64_t vf_mask, uint8_t on)\n {\n \tstruct rte_eth_dev *dev;\n@@ -941,7 +941,7 @@ int rte_pmd_i40e_set_vf_vlan_filter(uint8_t port, uint16_t vlan_id,\n }\n \n int\n-rte_pmd_i40e_get_vf_stats(uint8_t port,\n+rte_pmd_i40e_get_vf_stats(uint16_t port,\n \t\t\t  uint16_t vf_id,\n \t\t\t  struct rte_eth_stats *stats)\n {\n@@ -986,7 +986,7 @@ rte_pmd_i40e_get_vf_stats(uint8_t port,\n }\n \n int\n-rte_pmd_i40e_reset_vf_stats(uint8_t port,\n+rte_pmd_i40e_reset_vf_stats(uint16_t port,\n \t\t\t    uint16_t vf_id)\n {\n \tstruct rte_eth_dev *dev;\n@@ -1020,7 +1020,7 @@ rte_pmd_i40e_reset_vf_stats(uint8_t port,\n }\n \n int\n-rte_pmd_i40e_set_vf_max_bw(uint8_t port, uint16_t vf_id, uint32_t bw)\n+rte_pmd_i40e_set_vf_max_bw(uint16_t port, uint16_t vf_id, uint32_t bw)\n {\n \tstruct rte_eth_dev *dev;\n \tstruct i40e_pf *pf;\n@@ -1109,7 +1109,7 @@ rte_pmd_i40e_set_vf_max_bw(uint8_t port, uint16_t vf_id, uint32_t bw)\n }\n \n int\n-rte_pmd_i40e_set_vf_tc_bw_alloc(uint8_t port, uint16_t vf_id,\n+rte_pmd_i40e_set_vf_tc_bw_alloc(uint16_t port, uint16_t vf_id,\n \t\t\t\tuint8_t tc_num, uint8_t *bw_weight)\n {\n \tstruct rte_eth_dev *dev;\n@@ -1223,7 +1223,7 @@ rte_pmd_i40e_set_vf_tc_bw_alloc(uint8_t port, uint16_t vf_id,\n }\n \n int\n-rte_pmd_i40e_set_vf_tc_max_bw(uint8_t port, uint16_t vf_id,\n+rte_pmd_i40e_set_vf_tc_max_bw(uint16_t port, uint16_t vf_id,\n \t\t\t      uint8_t tc_no, uint32_t bw)\n {\n \tstruct rte_eth_dev *dev;\n@@ -1341,7 +1341,7 @@ rte_pmd_i40e_set_vf_tc_max_bw(uint8_t port, uint16_t vf_id,\n }\n \n int\n-rte_pmd_i40e_set_tc_strict_prio(uint8_t port, uint8_t tc_map)\n+rte_pmd_i40e_set_tc_strict_prio(uint16_t port, uint8_t tc_map)\n {\n \tstruct rte_eth_dev *dev;\n \tstruct i40e_pf *pf;\n@@ -1513,7 +1513,7 @@ i40e_add_rm_profile_info(struct i40e_hw *hw, uint8_t *profile_info_sec)\n \n /* Check if the profile info exists */\n static int\n-i40e_check_profile_info(uint8_t port, uint8_t *profile_info_sec)\n+i40e_check_profile_info(uint16_t port, uint8_t *profile_info_sec)\n {\n \tstruct rte_eth_dev *dev = &rte_eth_devices[port];\n \tstruct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n@@ -1557,7 +1557,7 @@ i40e_check_profile_info(uint8_t port, uint8_t *profile_info_sec)\n }\n \n int\n-rte_pmd_i40e_process_ddp_package(uint8_t port, uint8_t *buff,\n+rte_pmd_i40e_process_ddp_package(uint16_t port, uint8_t *buff,\n \t\t\t\t uint32_t size,\n \t\t\t\t enum rte_pmd_i40e_package_op op)\n {\n@@ -1863,7 +1863,7 @@ int rte_pmd_i40e_get_ddp_info(uint8_t *pkg_buff, uint32_t pkg_size,\n }\n \n int\n-rte_pmd_i40e_get_ddp_list(uint8_t port, uint8_t *buff, uint32_t size)\n+rte_pmd_i40e_get_ddp_list(uint16_t port, uint8_t *buff, uint32_t size)\n {\n \tstruct rte_eth_dev *dev;\n \tstruct i40e_hw *hw;\n@@ -1991,7 +1991,7 @@ static int check_invalid_ptype_mapping(\n \n int\n rte_pmd_i40e_ptype_mapping_update(\n-\t\t\tuint8_t port,\n+\t\t\tuint16_t port,\n \t\t\tstruct rte_pmd_i40e_ptype_mapping *mapping_items,\n \t\t\tuint16_t count,\n \t\t\tuint8_t exclusive)\n@@ -2027,7 +2027,7 @@ rte_pmd_i40e_ptype_mapping_update(\n \treturn 0;\n }\n \n-int rte_pmd_i40e_ptype_mapping_reset(uint8_t port)\n+int rte_pmd_i40e_ptype_mapping_reset(uint16_t port)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -2044,7 +2044,7 @@ int rte_pmd_i40e_ptype_mapping_reset(uint8_t port)\n }\n \n int rte_pmd_i40e_ptype_mapping_get(\n-\t\t\tuint8_t port,\n+\t\t\tuint16_t port,\n \t\t\tstruct rte_pmd_i40e_ptype_mapping *mapping_items,\n \t\t\tuint16_t size,\n \t\t\tuint16_t *count,\n@@ -2078,7 +2078,7 @@ int rte_pmd_i40e_ptype_mapping_get(\n \treturn 0;\n }\n \n-int rte_pmd_i40e_ptype_mapping_replace(uint8_t port,\n+int rte_pmd_i40e_ptype_mapping_replace(uint16_t port,\n \t\t\t\t       uint32_t target,\n \t\t\t\t       uint8_t mask,\n \t\t\t\t       uint32_t pkt_type)\ndiff --git a/drivers/net/i40e/rte_pmd_i40e.h b/drivers/net/i40e/rte_pmd_i40e.h\nindex 356fa89d7..7f32a59b1 100644\n--- a/drivers/net/i40e/rte_pmd_i40e.h\n+++ b/drivers/net/i40e/rte_pmd_i40e.h\n@@ -157,7 +157,7 @@ struct rte_pmd_i40e_ptype_mapping {\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if *vf* invalid.\n  */\n-int rte_pmd_i40e_ping_vfs(uint8_t port, uint16_t vf);\n+int rte_pmd_i40e_ping_vfs(uint16_t port, uint16_t vf);\n \n /**\n  * Enable/Disable VF MAC anti spoofing.\n@@ -174,7 +174,7 @@ int rte_pmd_i40e_ping_vfs(uint8_t port, uint16_t vf);\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_i40e_set_vf_mac_anti_spoof(uint8_t port,\n+int rte_pmd_i40e_set_vf_mac_anti_spoof(uint16_t port,\n \t\t\t\t       uint16_t vf_id,\n \t\t\t\t       uint8_t on);\n \n@@ -193,7 +193,7 @@ int rte_pmd_i40e_set_vf_mac_anti_spoof(uint8_t port,\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_i40e_set_vf_vlan_anti_spoof(uint8_t port,\n+int rte_pmd_i40e_set_vf_vlan_anti_spoof(uint16_t port,\n \t\t\t\t\tuint16_t vf_id,\n \t\t\t\t\tuint8_t on);\n \n@@ -210,7 +210,7 @@ int rte_pmd_i40e_set_vf_vlan_anti_spoof(uint8_t port,\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_i40e_set_tx_loopback(uint8_t port,\n+int rte_pmd_i40e_set_tx_loopback(uint16_t port,\n \t\t\t\t uint8_t on);\n \n /**\n@@ -228,7 +228,7 @@ int rte_pmd_i40e_set_tx_loopback(uint8_t port,\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_i40e_set_vf_unicast_promisc(uint8_t port,\n+int rte_pmd_i40e_set_vf_unicast_promisc(uint16_t port,\n \t\t\t\t\tuint16_t vf_id,\n \t\t\t\t\tuint8_t on);\n \n@@ -247,7 +247,7 @@ int rte_pmd_i40e_set_vf_unicast_promisc(uint8_t port,\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_i40e_set_vf_multicast_promisc(uint8_t port,\n+int rte_pmd_i40e_set_vf_multicast_promisc(uint16_t port,\n \t\t\t\t\t  uint16_t vf_id,\n \t\t\t\t\t  uint8_t on);\n \n@@ -271,7 +271,7 @@ int rte_pmd_i40e_set_vf_multicast_promisc(uint8_t port,\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if *vf* or *mac_addr* is invalid.\n  */\n-int rte_pmd_i40e_set_vf_mac_addr(uint8_t port, uint16_t vf_id,\n+int rte_pmd_i40e_set_vf_mac_addr(uint16_t port, uint16_t vf_id,\n \t\t\t\t struct ether_addr *mac_addr);\n \n /**\n@@ -291,7 +291,7 @@ int rte_pmd_i40e_set_vf_mac_addr(uint8_t port, uint16_t vf_id,\n  *   - (-EINVAL) if bad parameter.\n  */\n int\n-rte_pmd_i40e_set_vf_vlan_stripq(uint8_t port, uint16_t vf, uint8_t on);\n+rte_pmd_i40e_set_vf_vlan_stripq(uint16_t port, uint16_t vf, uint8_t on);\n \n /**\n  * Enable/Disable vf vlan insert\n@@ -309,7 +309,7 @@ rte_pmd_i40e_set_vf_vlan_stripq(uint8_t port, uint16_t vf, uint8_t on);\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_i40e_set_vf_vlan_insert(uint8_t port, uint16_t vf_id,\n+int rte_pmd_i40e_set_vf_vlan_insert(uint16_t port, uint16_t vf_id,\n \t\t\t\t    uint16_t vlan_id);\n \n /**\n@@ -328,7 +328,7 @@ int rte_pmd_i40e_set_vf_vlan_insert(uint8_t port, uint16_t vf_id,\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_i40e_set_vf_broadcast(uint8_t port, uint16_t vf_id,\n+int rte_pmd_i40e_set_vf_broadcast(uint16_t port, uint16_t vf_id,\n \t\t\t\t  uint8_t on);\n \n /**\n@@ -347,7 +347,7 @@ int rte_pmd_i40e_set_vf_broadcast(uint8_t port, uint16_t vf_id,\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_i40e_set_vf_vlan_tag(uint8_t port, uint16_t vf_id, uint8_t on);\n+int rte_pmd_i40e_set_vf_vlan_tag(uint16_t port, uint16_t vf_id, uint8_t on);\n \n /**\n  * Enable/Disable VF VLAN filter\n@@ -368,7 +368,7 @@ int rte_pmd_i40e_set_vf_vlan_tag(uint8_t port, uint16_t vf_id, uint8_t on);\n  *   - (-EINVAL) if bad parameter.\n  *   - (-ENOTSUP) not supported by firmware.\n  */\n-int rte_pmd_i40e_set_vf_vlan_filter(uint8_t port, uint16_t vlan_id,\n+int rte_pmd_i40e_set_vf_vlan_filter(uint16_t port, uint16_t vlan_id,\n \t\t\t\t    uint64_t vf_mask, uint8_t on);\n \n /**\n@@ -393,7 +393,7 @@ int rte_pmd_i40e_set_vf_vlan_filter(uint8_t port, uint16_t vlan_id,\n  *   - (-EINVAL) if bad parameter.\n  */\n \n-int rte_pmd_i40e_get_vf_stats(uint8_t port,\n+int rte_pmd_i40e_get_vf_stats(uint16_t port,\n \t\t\t      uint16_t vf_id,\n \t\t\t      struct rte_eth_stats *stats);\n \n@@ -409,7 +409,7 @@ int rte_pmd_i40e_get_vf_stats(uint8_t port,\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_i40e_reset_vf_stats(uint8_t port,\n+int rte_pmd_i40e_reset_vf_stats(uint16_t port,\n \t\t\t\tuint16_t vf_id);\n \n /**\n@@ -434,7 +434,7 @@ int rte_pmd_i40e_reset_vf_stats(uint8_t port,\n  *   - (-EINVAL) if bad parameter.\n  *   - (-ENOTSUP) not supported by firmware.\n  */\n-int rte_pmd_i40e_set_vf_max_bw(uint8_t port,\n+int rte_pmd_i40e_set_vf_max_bw(uint16_t port,\n \t\t\t       uint16_t vf_id,\n \t\t\t       uint32_t bw);\n \n@@ -459,7 +459,7 @@ int rte_pmd_i40e_set_vf_max_bw(uint8_t port,\n  *   - (-EINVAL) if bad parameter.\n  *   - (-ENOTSUP) not supported by firmware.\n  */\n-int rte_pmd_i40e_set_vf_tc_bw_alloc(uint8_t port,\n+int rte_pmd_i40e_set_vf_tc_bw_alloc(uint16_t port,\n \t\t\t\t    uint16_t vf_id,\n \t\t\t\t    uint8_t tc_num,\n \t\t\t\t    uint8_t *bw_weight);\n@@ -484,7 +484,7 @@ int rte_pmd_i40e_set_vf_tc_bw_alloc(uint8_t port,\n  *   - (-EINVAL) if bad parameter.\n  *   - (-ENOTSUP) not supported by firmware.\n  */\n-int rte_pmd_i40e_set_vf_tc_max_bw(uint8_t port,\n+int rte_pmd_i40e_set_vf_tc_max_bw(uint16_t port,\n \t\t\t\t  uint16_t vf_id,\n \t\t\t\t  uint8_t tc_no,\n \t\t\t\t  uint32_t bw);\n@@ -502,7 +502,7 @@ int rte_pmd_i40e_set_vf_tc_max_bw(uint8_t port,\n  *   - (-EINVAL) if bad parameter.\n  *   - (-ENOTSUP) not supported by firmware.\n  */\n-int rte_pmd_i40e_set_tc_strict_prio(uint8_t port, uint8_t tc_map);\n+int rte_pmd_i40e_set_tc_strict_prio(uint16_t port, uint8_t tc_map);\n \n /**\n  * Load/Unload a ddp package\n@@ -523,7 +523,7 @@ int rte_pmd_i40e_set_tc_strict_prio(uint8_t port, uint8_t tc_map);\n  *   - (-EACCES) if profile does not exist.\n  *   - (-ENOTSUP) if operation not supported.\n  */\n-int rte_pmd_i40e_process_ddp_package(uint8_t port, uint8_t *buff,\n+int rte_pmd_i40e_process_ddp_package(uint16_t port, uint8_t *buff,\n \t\t\t\t     uint32_t size,\n \t\t\t\t     enum rte_pmd_i40e_package_op op);\n \n@@ -561,7 +561,7 @@ int rte_pmd_i40e_get_ddp_info(uint8_t *pkg, uint32_t pkg_size,\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_i40e_get_ddp_list(uint8_t port, uint8_t *buff, uint32_t size);\n+int rte_pmd_i40e_get_ddp_list(uint16_t port, uint8_t *buff, uint32_t size);\n \n /**\n  * Update hardware defined ptype to software defined packet type\n@@ -581,7 +581,7 @@ int rte_pmd_i40e_get_ddp_list(uint8_t port, uint8_t *buff, uint32_t size);\n  *\tset other PTYPEs maps to PTYPE_UNKNOWN.\n  */\n int rte_pmd_i40e_ptype_mapping_update(\n-\t\t\tuint8_t port,\n+\t\t\tuint16_t port,\n \t\t\tstruct rte_pmd_i40e_ptype_mapping *mapping_items,\n \t\t\tuint16_t count,\n \t\t\tuint8_t exclusive);\n@@ -593,7 +593,7 @@ int rte_pmd_i40e_ptype_mapping_update(\n  * @param port\n  *    pointer to port identifier of the device\n  */\n-int rte_pmd_i40e_ptype_mapping_reset(uint8_t port);\n+int rte_pmd_i40e_ptype_mapping_reset(uint16_t port);\n \n /**\n  * Get hardware defined ptype to software defined ptype\n@@ -612,7 +612,7 @@ int rte_pmd_i40e_ptype_mapping_reset(uint8_t port);\n  *    -(!0) only return mapping items which packet_type != RTE_PTYPE_UNKNOWN.\n  */\n int rte_pmd_i40e_ptype_mapping_get(\n-\t\t\tuint8_t port,\n+\t\t\tuint16_t port,\n \t\t\tstruct rte_pmd_i40e_ptype_mapping *mapping_items,\n \t\t\tuint16_t size,\n \t\t\tuint16_t *count,\n@@ -632,7 +632,7 @@ int rte_pmd_i40e_ptype_mapping_get(\n  * @param pkt_type\n  *    the new packet type to overwrite\n  */\n-int rte_pmd_i40e_ptype_mapping_replace(uint8_t port,\n+int rte_pmd_i40e_ptype_mapping_replace(uint16_t port,\n \t\t\t\t       uint32_t target,\n \t\t\t\t       uint8_t mask,\n \t\t\t\t       uint32_t pkt_type);\ndiff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c\nindex 22171d866..c5e039886 100644\n--- a/drivers/net/ixgbe/ixgbe_ethdev.c\n+++ b/drivers/net/ixgbe/ixgbe_ethdev.c\n@@ -2504,8 +2504,9 @@ ixgbe_dev_start(struct rte_eth_dev *dev)\n \t*    - fixed speed: TODO implement\n \t*/\n \tif (dev->data->dev_conf.link_speeds & ETH_LINK_SPEED_FIXED) {\n-\t\tPMD_INIT_LOG(ERR, \"Invalid link_speeds for port %hhu; fix speed not supported\",\n-\t\t\t     dev->data->port_id);\n+\t\tPMD_INIT_LOG(ERR,\n+\t\t\"Invalid link_speeds for port %u, fix speed not supported\",\n+\t\t\t\tdev->data->port_id);\n \t\treturn -EINVAL;\n \t}\n \ndiff --git a/drivers/net/ixgbe/ixgbe_rxtx.h b/drivers/net/ixgbe/ixgbe_rxtx.h\nindex 85feb0bdc..176c9d4a2 100644\n--- a/drivers/net/ixgbe/ixgbe_rxtx.h\n+++ b/drivers/net/ixgbe/ixgbe_rxtx.h\n@@ -148,7 +148,7 @@ struct ixgbe_rx_queue {\n \tuint16_t            queue_id; /**< RX queue index. */\n \tuint16_t            reg_idx;  /**< RX queue register index. */\n \tuint16_t            pkt_type_mask;  /**< Packet type mask for different NICs. */\n-\tuint8_t             port_id;  /**< Device port identifier. */\n+\tuint16_t             port_id;  /**< Device port identifier. */\n \tuint8_t             crc_len;  /**< 0 if CRC stripped, 4 otherwise. */\n \tuint8_t             drop_en;  /**< If not 0, set SRRCTL.Drop_En. */\n \tuint8_t             rx_deferred_start; /**< not in global dev start. */\n@@ -237,7 +237,7 @@ struct ixgbe_tx_queue {\n \tuint16_t tx_next_rs; /**< next desc to set RS bit */\n \tuint16_t            queue_id;      /**< TX queue index. */\n \tuint16_t            reg_idx;       /**< TX queue register index. */\n-\tuint8_t             port_id;       /**< Device port identifier. */\n+\tuint16_t             port_id;       /**< Device port identifier. */\n \tuint8_t             pthresh;       /**< Prefetch threshold register. */\n \tuint8_t             hthresh;       /**< Host threshold register. */\n \tuint8_t             wthresh;       /**< Write-back threshold reg. */\ndiff --git a/drivers/net/ixgbe/rte_pmd_ixgbe.c b/drivers/net/ixgbe/rte_pmd_ixgbe.c\nindex 79897ff64..f12737857 100644\n--- a/drivers/net/ixgbe/rte_pmd_ixgbe.c\n+++ b/drivers/net/ixgbe/rte_pmd_ixgbe.c\n@@ -38,7 +38,7 @@\n #include \"rte_pmd_ixgbe.h\"\n \n int\n-rte_pmd_ixgbe_set_vf_mac_addr(uint8_t port, uint16_t vf,\n+rte_pmd_ixgbe_set_vf_mac_addr(uint16_t port, uint16_t vf,\n \t\t\t      struct ether_addr *mac_addr)\n {\n \tstruct ixgbe_hw *hw;\n@@ -73,7 +73,7 @@ rte_pmd_ixgbe_set_vf_mac_addr(uint8_t port, uint16_t vf,\n }\n \n int\n-rte_pmd_ixgbe_ping_vf(uint8_t port, uint16_t vf)\n+rte_pmd_ixgbe_ping_vf(uint16_t port, uint16_t vf)\n {\n \tstruct ixgbe_hw *hw;\n \tstruct ixgbe_vf_info *vfinfo;\n@@ -105,7 +105,7 @@ rte_pmd_ixgbe_ping_vf(uint8_t port, uint16_t vf)\n }\n \n int\n-rte_pmd_ixgbe_set_vf_vlan_anti_spoof(uint8_t port, uint16_t vf, uint8_t on)\n+rte_pmd_ixgbe_set_vf_vlan_anti_spoof(uint16_t port, uint16_t vf, uint8_t on)\n {\n \tstruct ixgbe_hw *hw;\n \tstruct ixgbe_mac_info *mac;\n@@ -135,7 +135,7 @@ rte_pmd_ixgbe_set_vf_vlan_anti_spoof(uint8_t port, uint16_t vf, uint8_t on)\n }\n \n int\n-rte_pmd_ixgbe_set_vf_mac_anti_spoof(uint8_t port, uint16_t vf, uint8_t on)\n+rte_pmd_ixgbe_set_vf_mac_anti_spoof(uint16_t port, uint16_t vf, uint8_t on)\n {\n \tstruct ixgbe_hw *hw;\n \tstruct ixgbe_mac_info *mac;\n@@ -164,7 +164,7 @@ rte_pmd_ixgbe_set_vf_mac_anti_spoof(uint8_t port, uint16_t vf, uint8_t on)\n }\n \n int\n-rte_pmd_ixgbe_set_vf_vlan_insert(uint8_t port, uint16_t vf, uint16_t vlan_id)\n+rte_pmd_ixgbe_set_vf_vlan_insert(uint16_t port, uint16_t vf, uint16_t vlan_id)\n {\n \tstruct ixgbe_hw *hw;\n \tuint32_t ctrl;\n@@ -200,7 +200,7 @@ rte_pmd_ixgbe_set_vf_vlan_insert(uint8_t port, uint16_t vf, uint16_t vlan_id)\n }\n \n int\n-rte_pmd_ixgbe_set_tx_loopback(uint8_t port, uint8_t on)\n+rte_pmd_ixgbe_set_tx_loopback(uint16_t port, uint8_t on)\n {\n \tstruct ixgbe_hw *hw;\n \tuint32_t ctrl;\n@@ -230,7 +230,7 @@ rte_pmd_ixgbe_set_tx_loopback(uint8_t port, uint8_t on)\n }\n \n int\n-rte_pmd_ixgbe_set_all_queues_drop_en(uint8_t port, uint8_t on)\n+rte_pmd_ixgbe_set_all_queues_drop_en(uint16_t port, uint8_t on)\n {\n \tstruct ixgbe_hw *hw;\n \tuint32_t reg_value;\n@@ -260,7 +260,7 @@ rte_pmd_ixgbe_set_all_queues_drop_en(uint8_t port, uint8_t on)\n }\n \n int\n-rte_pmd_ixgbe_set_vf_split_drop_en(uint8_t port, uint16_t vf, uint8_t on)\n+rte_pmd_ixgbe_set_vf_split_drop_en(uint16_t port, uint16_t vf, uint8_t on)\n {\n \tstruct ixgbe_hw *hw;\n \tuint32_t reg_value;\n@@ -295,7 +295,7 @@ rte_pmd_ixgbe_set_vf_split_drop_en(uint8_t port, uint16_t vf, uint8_t on)\n }\n \n int\n-rte_pmd_ixgbe_set_vf_vlan_stripq(uint8_t port, uint16_t vf, uint8_t on)\n+rte_pmd_ixgbe_set_vf_vlan_stripq(uint16_t port, uint16_t vf, uint8_t on)\n {\n \tstruct rte_eth_dev *dev;\n \tstruct rte_pci_device *pci_dev;\n@@ -342,7 +342,7 @@ rte_pmd_ixgbe_set_vf_vlan_stripq(uint8_t port, uint16_t vf, uint8_t on)\n }\n \n int\n-rte_pmd_ixgbe_set_vf_rxmode(uint8_t port, uint16_t vf,\n+rte_pmd_ixgbe_set_vf_rxmode(uint16_t port, uint16_t vf,\n \t\t\t    uint16_t rx_mask, uint8_t on)\n {\n \tint val = 0;\n@@ -389,7 +389,7 @@ rte_pmd_ixgbe_set_vf_rxmode(uint8_t port, uint16_t vf,\n }\n \n int\n-rte_pmd_ixgbe_set_vf_rx(uint8_t port, uint16_t vf, uint8_t on)\n+rte_pmd_ixgbe_set_vf_rx(uint16_t port, uint16_t vf, uint8_t on)\n {\n \tstruct rte_eth_dev *dev;\n \tstruct rte_pci_device *pci_dev;\n@@ -439,7 +439,7 @@ rte_pmd_ixgbe_set_vf_rx(uint8_t port, uint16_t vf, uint8_t on)\n }\n \n int\n-rte_pmd_ixgbe_set_vf_tx(uint8_t port, uint16_t vf, uint8_t on)\n+rte_pmd_ixgbe_set_vf_tx(uint16_t port, uint16_t vf, uint8_t on)\n {\n \tstruct rte_eth_dev *dev;\n \tstruct rte_pci_device *pci_dev;\n@@ -489,7 +489,7 @@ rte_pmd_ixgbe_set_vf_tx(uint8_t port, uint16_t vf, uint8_t on)\n }\n \n int\n-rte_pmd_ixgbe_set_vf_vlan_filter(uint8_t port, uint16_t vlan,\n+rte_pmd_ixgbe_set_vf_vlan_filter(uint16_t port, uint16_t vlan,\n \t\t\t\t uint64_t vf_mask, uint8_t vlan_on)\n {\n \tstruct rte_eth_dev *dev;\n@@ -524,7 +524,7 @@ rte_pmd_ixgbe_set_vf_vlan_filter(uint8_t port, uint16_t vlan,\n }\n \n int\n-rte_pmd_ixgbe_set_vf_rate_limit(uint8_t port, uint16_t vf,\n+rte_pmd_ixgbe_set_vf_rate_limit(uint16_t port, uint16_t vf,\n \t\t\t\tuint16_t tx_rate, uint64_t q_msk)\n {\n \tstruct rte_eth_dev *dev;\n@@ -540,7 +540,7 @@ rte_pmd_ixgbe_set_vf_rate_limit(uint8_t port, uint16_t vf,\n }\n \n int\n-rte_pmd_ixgbe_macsec_enable(uint8_t port, uint8_t en, uint8_t rp)\n+rte_pmd_ixgbe_macsec_enable(uint16_t port, uint8_t en, uint8_t rp)\n {\n \tstruct ixgbe_hw *hw;\n \tstruct rte_eth_dev *dev;\n@@ -623,7 +623,7 @@ rte_pmd_ixgbe_macsec_enable(uint8_t port, uint8_t en, uint8_t rp)\n }\n \n int\n-rte_pmd_ixgbe_macsec_disable(uint8_t port)\n+rte_pmd_ixgbe_macsec_disable(uint16_t port)\n {\n \tstruct ixgbe_hw *hw;\n \tstruct rte_eth_dev *dev;\n@@ -687,7 +687,7 @@ rte_pmd_ixgbe_macsec_disable(uint8_t port)\n }\n \n int\n-rte_pmd_ixgbe_macsec_config_txsc(uint8_t port, uint8_t *mac)\n+rte_pmd_ixgbe_macsec_config_txsc(uint16_t port, uint8_t *mac)\n {\n \tstruct ixgbe_hw *hw;\n \tstruct rte_eth_dev *dev;\n@@ -712,7 +712,7 @@ rte_pmd_ixgbe_macsec_config_txsc(uint8_t port, uint8_t *mac)\n }\n \n int\n-rte_pmd_ixgbe_macsec_config_rxsc(uint8_t port, uint8_t *mac, uint16_t pi)\n+rte_pmd_ixgbe_macsec_config_rxsc(uint16_t port, uint8_t *mac, uint16_t pi)\n {\n \tstruct ixgbe_hw *hw;\n \tstruct rte_eth_dev *dev;\n@@ -738,7 +738,7 @@ rte_pmd_ixgbe_macsec_config_rxsc(uint8_t port, uint8_t *mac, uint16_t pi)\n }\n \n int\n-rte_pmd_ixgbe_macsec_select_txsa(uint8_t port, uint8_t idx, uint8_t an,\n+rte_pmd_ixgbe_macsec_select_txsa(uint16_t port, uint8_t idx, uint8_t an,\n \t\t\t\t uint32_t pn, uint8_t *key)\n {\n \tstruct ixgbe_hw *hw;\n@@ -794,7 +794,7 @@ rte_pmd_ixgbe_macsec_select_txsa(uint8_t port, uint8_t idx, uint8_t an,\n }\n \n int\n-rte_pmd_ixgbe_macsec_select_rxsa(uint8_t port, uint8_t idx, uint8_t an,\n+rte_pmd_ixgbe_macsec_select_rxsa(uint16_t port, uint8_t idx, uint8_t an,\n \t\t\t\t uint32_t pn, uint8_t *key)\n {\n \tstruct ixgbe_hw *hw;\n@@ -837,7 +837,7 @@ rte_pmd_ixgbe_macsec_select_rxsa(uint8_t port, uint8_t idx, uint8_t an,\n }\n \n int\n-rte_pmd_ixgbe_set_tc_bw_alloc(uint8_t port,\n+rte_pmd_ixgbe_set_tc_bw_alloc(uint16_t port,\n \t\t\t      uint8_t tc_num,\n \t\t\t      uint8_t *bw_weight)\n {\n@@ -911,7 +911,7 @@ rte_pmd_ixgbe_set_tc_bw_alloc(uint8_t port,\n \n #ifdef RTE_LIBRTE_IXGBE_BYPASS\n int\n-rte_pmd_ixgbe_bypass_init(uint8_t port_id)\n+rte_pmd_ixgbe_bypass_init(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -926,7 +926,7 @@ rte_pmd_ixgbe_bypass_init(uint8_t port_id)\n }\n \n int\n-rte_pmd_ixgbe_bypass_state_show(uint8_t port_id, uint32_t *state)\n+rte_pmd_ixgbe_bypass_state_show(uint16_t port_id, uint32_t *state)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -940,7 +940,7 @@ rte_pmd_ixgbe_bypass_state_show(uint8_t port_id, uint32_t *state)\n }\n \n int\n-rte_pmd_ixgbe_bypass_state_set(uint8_t port_id, uint32_t *new_state)\n+rte_pmd_ixgbe_bypass_state_set(uint16_t port_id, uint32_t *new_state)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -954,7 +954,7 @@ rte_pmd_ixgbe_bypass_state_set(uint8_t port_id, uint32_t *new_state)\n }\n \n int\n-rte_pmd_ixgbe_bypass_event_show(uint8_t port_id,\n+rte_pmd_ixgbe_bypass_event_show(uint16_t port_id,\n \t\t\t\tuint32_t event,\n \t\t\t\tuint32_t *state)\n {\n@@ -970,7 +970,7 @@ rte_pmd_ixgbe_bypass_event_show(uint8_t port_id,\n }\n \n int\n-rte_pmd_ixgbe_bypass_event_store(uint8_t port_id,\n+rte_pmd_ixgbe_bypass_event_store(uint16_t port_id,\n \t\t\t\t uint32_t event,\n \t\t\t\t uint32_t state)\n {\n@@ -986,7 +986,7 @@ rte_pmd_ixgbe_bypass_event_store(uint8_t port_id,\n }\n \n int\n-rte_pmd_ixgbe_bypass_wd_timeout_store(uint8_t port_id, uint32_t timeout)\n+rte_pmd_ixgbe_bypass_wd_timeout_store(uint16_t port_id, uint32_t timeout)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -1000,7 +1000,7 @@ rte_pmd_ixgbe_bypass_wd_timeout_store(uint8_t port_id, uint32_t timeout)\n }\n \n int\n-rte_pmd_ixgbe_bypass_ver_show(uint8_t port_id, uint32_t *ver)\n+rte_pmd_ixgbe_bypass_ver_show(uint16_t port_id, uint32_t *ver)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -1014,7 +1014,7 @@ rte_pmd_ixgbe_bypass_ver_show(uint8_t port_id, uint32_t *ver)\n }\n \n int\n-rte_pmd_ixgbe_bypass_wd_timeout_show(uint8_t port_id, uint32_t *wd_timeout)\n+rte_pmd_ixgbe_bypass_wd_timeout_show(uint16_t port_id, uint32_t *wd_timeout)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -1028,7 +1028,7 @@ rte_pmd_ixgbe_bypass_wd_timeout_show(uint8_t port_id, uint32_t *wd_timeout)\n }\n \n int\n-rte_pmd_ixgbe_bypass_wd_reset(uint8_t port_id)\n+rte_pmd_ixgbe_bypass_wd_reset(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n \ndiff --git a/drivers/net/ixgbe/rte_pmd_ixgbe.h b/drivers/net/ixgbe/rte_pmd_ixgbe.h\nindex d33c285db..3d55ab20e 100644\n--- a/drivers/net/ixgbe/rte_pmd_ixgbe.h\n+++ b/drivers/net/ixgbe/rte_pmd_ixgbe.h\n@@ -53,7 +53,7 @@\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if *vf* invalid.\n  */\n-int rte_pmd_ixgbe_ping_vf(uint8_t port, uint16_t vf);\n+int rte_pmd_ixgbe_ping_vf(uint16_t port, uint16_t vf);\n \n /**\n  * Set the VF MAC address.\n@@ -69,8 +69,8 @@ int rte_pmd_ixgbe_ping_vf(uint8_t port, uint16_t vf);\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if *vf* or *mac_addr* is invalid.\n  */\n-int rte_pmd_ixgbe_set_vf_mac_addr(uint8_t port, uint16_t vf,\n-\t\tstruct ether_addr *mac_addr);\n+int rte_pmd_ixgbe_set_vf_mac_addr(uint16_t port, uint16_t vf,\n+\t\t\t\t  struct ether_addr *mac_addr);\n \n /**\n  * Enable/Disable VF VLAN anti spoofing.\n@@ -87,7 +87,8 @@ int rte_pmd_ixgbe_set_vf_mac_addr(uint8_t port, uint16_t vf,\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_ixgbe_set_vf_vlan_anti_spoof(uint8_t port, uint16_t vf, uint8_t on);\n+int rte_pmd_ixgbe_set_vf_vlan_anti_spoof(uint16_t port, uint16_t vf,\n+\t\t\t\t\t uint8_t on);\n \n /**\n  * Enable/Disable VF MAC anti spoofing.\n@@ -104,7 +105,7 @@ int rte_pmd_ixgbe_set_vf_vlan_anti_spoof(uint8_t port, uint16_t vf, uint8_t on);\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_ixgbe_set_vf_mac_anti_spoof(uint8_t port, uint16_t vf, uint8_t on);\n+int rte_pmd_ixgbe_set_vf_mac_anti_spoof(uint16_t port, uint16_t vf, uint8_t on);\n \n /**\n  * Enable/Disable vf vlan insert\n@@ -122,7 +123,7 @@ int rte_pmd_ixgbe_set_vf_mac_anti_spoof(uint8_t port, uint16_t vf, uint8_t on);\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_ixgbe_set_vf_vlan_insert(uint8_t port, uint16_t vf,\n+int rte_pmd_ixgbe_set_vf_vlan_insert(uint16_t port, uint16_t vf,\n \t\tuint16_t vlan_id);\n \n /**\n@@ -139,7 +140,7 @@ int rte_pmd_ixgbe_set_vf_vlan_insert(uint8_t port, uint16_t vf,\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_ixgbe_set_tx_loopback(uint8_t port, uint8_t on);\n+int rte_pmd_ixgbe_set_tx_loopback(uint16_t port, uint8_t on);\n \n /**\n  * set all queues drop enable bit\n@@ -155,7 +156,7 @@ int rte_pmd_ixgbe_set_tx_loopback(uint8_t port, uint8_t on);\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_ixgbe_set_all_queues_drop_en(uint8_t port, uint8_t on);\n+int rte_pmd_ixgbe_set_all_queues_drop_en(uint16_t port, uint8_t on);\n \n /**\n  * set drop enable bit in the VF split rx control register\n@@ -174,7 +175,7 @@ int rte_pmd_ixgbe_set_all_queues_drop_en(uint8_t port, uint8_t on);\n  *   - (-EINVAL) if bad parameter.\n  */\n \n-int rte_pmd_ixgbe_set_vf_split_drop_en(uint8_t port, uint16_t vf, uint8_t on);\n+int rte_pmd_ixgbe_set_vf_split_drop_en(uint16_t port, uint16_t vf, uint8_t on);\n \n /**\n  * Enable/Disable vf vlan strip for all queues in a pool\n@@ -194,7 +195,7 @@ int rte_pmd_ixgbe_set_vf_split_drop_en(uint8_t port, uint16_t vf, uint8_t on);\n  *   - (-EINVAL) if bad parameter.\n  */\n int\n-rte_pmd_ixgbe_set_vf_vlan_stripq(uint8_t port, uint16_t vf, uint8_t on);\n+rte_pmd_ixgbe_set_vf_vlan_stripq(uint16_t port, uint16_t vf, uint8_t on);\n \n /**\n  * Enable MACsec offload.\n@@ -212,7 +213,7 @@ rte_pmd_ixgbe_set_vf_vlan_stripq(uint8_t port, uint16_t vf, uint8_t on);\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-ENOTSUP) if hardware doesn't support this feature.\n  */\n-int rte_pmd_ixgbe_macsec_enable(uint8_t port, uint8_t en, uint8_t rp);\n+int rte_pmd_ixgbe_macsec_enable(uint16_t port, uint8_t en, uint8_t rp);\n \n /**\n  * Disable MACsec offload.\n@@ -224,7 +225,7 @@ int rte_pmd_ixgbe_macsec_enable(uint8_t port, uint8_t en, uint8_t rp);\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-ENOTSUP) if hardware doesn't support this feature.\n  */\n-int rte_pmd_ixgbe_macsec_disable(uint8_t port);\n+int rte_pmd_ixgbe_macsec_disable(uint16_t port);\n \n /**\n  * Configure Tx SC (Secure Connection).\n@@ -238,7 +239,7 @@ int rte_pmd_ixgbe_macsec_disable(uint8_t port);\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-ENOTSUP) if hardware doesn't support this feature.\n  */\n-int rte_pmd_ixgbe_macsec_config_txsc(uint8_t port, uint8_t *mac);\n+int rte_pmd_ixgbe_macsec_config_txsc(uint16_t port, uint8_t *mac);\n \n /**\n  * Configure Rx SC (Secure Connection).\n@@ -254,7 +255,7 @@ int rte_pmd_ixgbe_macsec_config_txsc(uint8_t port, uint8_t *mac);\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-ENOTSUP) if hardware doesn't support this feature.\n  */\n-int rte_pmd_ixgbe_macsec_config_rxsc(uint8_t port, uint8_t *mac, uint16_t pi);\n+int rte_pmd_ixgbe_macsec_config_rxsc(uint16_t port, uint8_t *mac, uint16_t pi);\n \n /**\n  * Enable Tx SA (Secure Association).\n@@ -275,8 +276,8 @@ int rte_pmd_ixgbe_macsec_config_rxsc(uint8_t port, uint8_t *mac, uint16_t pi);\n  *   - (-ENOTSUP) if hardware doesn't support this feature.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_ixgbe_macsec_select_txsa(uint8_t port, uint8_t idx, uint8_t an,\n-\t\tuint32_t pn, uint8_t *key);\n+int rte_pmd_ixgbe_macsec_select_txsa(uint16_t port, uint8_t idx, uint8_t an,\n+\t\t\t\t      uint32_t pn, uint8_t *key);\n \n /**\n  * Enable Rx SA (Secure Association).\n@@ -297,8 +298,8 @@ int rte_pmd_ixgbe_macsec_select_txsa(uint8_t port, uint8_t idx, uint8_t an,\n  *   - (-ENOTSUP) if hardware doesn't support this feature.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_ixgbe_macsec_select_rxsa(uint8_t port, uint8_t idx, uint8_t an,\n-\t\tuint32_t pn, uint8_t *key);\n+int rte_pmd_ixgbe_macsec_select_rxsa(uint16_t port, uint8_t idx, uint8_t an,\n+\t\t\t\t      uint32_t pn, uint8_t *key);\n \n /**\n * Set RX L2 Filtering mode of a VF of an Ethernet device.\n@@ -323,7 +324,8 @@ int rte_pmd_ixgbe_macsec_select_rxsa(uint8_t port, uint8_t idx, uint8_t an,\n *   - (-EINVAL) if bad parameter.\n */\n int\n-rte_pmd_ixgbe_set_vf_rxmode(uint8_t port, uint16_t vf, uint16_t rx_mask, uint8_t on);\n+rte_pmd_ixgbe_set_vf_rxmode(uint16_t port, uint16_t vf, uint16_t rx_mask,\n+\t\t\t     uint8_t on);\n \n /**\n * Enable or disable a VF traffic receive of an Ethernet device.\n@@ -342,7 +344,7 @@ rte_pmd_ixgbe_set_vf_rxmode(uint8_t port, uint16_t vf, uint16_t rx_mask, uint8_t\n *   - (-EINVAL) if bad parameter.\n */\n int\n-rte_pmd_ixgbe_set_vf_rx(uint8_t port, uint16_t vf, uint8_t on);\n+rte_pmd_ixgbe_set_vf_rx(uint16_t port, uint16_t vf, uint8_t on);\n \n /**\n * Enable or disable a VF traffic transmit of the Ethernet device.\n@@ -361,7 +363,7 @@ rte_pmd_ixgbe_set_vf_rx(uint8_t port, uint16_t vf, uint8_t on);\n *   - (-EINVAL) if bad parameter.\n */\n int\n-rte_pmd_ixgbe_set_vf_tx(uint8_t port, uint16_t vf, uint8_t on);\n+rte_pmd_ixgbe_set_vf_tx(uint16_t port, uint16_t vf, uint8_t on);\n \n /**\n * Enable/Disable hardware VF VLAN filtering by an Ethernet device of\n@@ -383,7 +385,8 @@ rte_pmd_ixgbe_set_vf_tx(uint8_t port, uint16_t vf, uint8_t on);\n *   - (-EINVAL) if bad parameter.\n */\n int\n-rte_pmd_ixgbe_set_vf_vlan_filter(uint8_t port, uint16_t vlan, uint64_t vf_mask, uint8_t vlan_on);\n+rte_pmd_ixgbe_set_vf_vlan_filter(uint16_t port, uint16_t vlan,\n+\t\t\t\t uint64_t vf_mask, uint8_t vlan_on);\n \n /**\n  * Set the rate limitation for a vf on an Ethernet device.\n@@ -402,7 +405,8 @@ rte_pmd_ixgbe_set_vf_vlan_filter(uint8_t port, uint16_t vlan, uint64_t vf_mask,\n  *   - (-ENODEV) if *port_id* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_ixgbe_set_vf_rate_limit(uint8_t port, uint16_t vf, uint16_t tx_rate, uint64_t q_msk);\n+int rte_pmd_ixgbe_set_vf_rate_limit(uint16_t port, uint16_t vf,\n+\t\t\t\t     uint16_t tx_rate, uint64_t q_msk);\n \n /**\n  * Set all the TCs' bandwidth weight.\n@@ -423,7 +427,7 @@ int rte_pmd_ixgbe_set_vf_rate_limit(uint8_t port, uint16_t vf, uint16_t tx_rate,\n  *   - (-EINVAL) if bad parameter.\n  *   - (-ENOTSUP) not supported by firmware.\n  */\n-int rte_pmd_ixgbe_set_tc_bw_alloc(uint8_t port,\n+int rte_pmd_ixgbe_set_tc_bw_alloc(uint16_t port,\n \t\t\t\t  uint8_t tc_num,\n \t\t\t\t  uint8_t *bw_weight);\n \n@@ -439,7 +443,7 @@ int rte_pmd_ixgbe_set_tc_bw_alloc(uint8_t port,\n  *   - (-ENOTSUP) if hardware doesn't support.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_ixgbe_bypass_init(uint8_t port);\n+int rte_pmd_ixgbe_bypass_init(uint16_t port);\n \n /**\n  * Return bypass state.\n@@ -456,7 +460,7 @@ int rte_pmd_ixgbe_bypass_init(uint8_t port);\n  *   - (-ENOTSUP) if hardware doesn't support.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_ixgbe_bypass_state_show(uint8_t port, uint32_t *state);\n+int rte_pmd_ixgbe_bypass_state_show(uint16_t port, uint32_t *state);\n \n /**\n  * Set bypass state\n@@ -473,7 +477,7 @@ int rte_pmd_ixgbe_bypass_state_show(uint8_t port, uint32_t *state);\n  *   - (-ENOTSUP) if hardware doesn't support.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_ixgbe_bypass_state_set(uint8_t port, uint32_t *new_state);\n+int rte_pmd_ixgbe_bypass_state_set(uint16_t port, uint32_t *new_state);\n \n /**\n  * Return bypass state when given event occurs.\n@@ -497,7 +501,7 @@ int rte_pmd_ixgbe_bypass_state_set(uint8_t port, uint32_t *new_state);\n  *   - (-ENOTSUP) if hardware doesn't support.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_ixgbe_bypass_event_show(uint8_t port,\n+int rte_pmd_ixgbe_bypass_event_show(uint16_t port,\n \t\t\t\t    uint32_t event,\n \t\t\t\t    uint32_t *state);\n \n@@ -523,7 +527,7 @@ int rte_pmd_ixgbe_bypass_event_show(uint8_t port,\n  *   - (-ENOTSUP) if hardware doesn't support.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_ixgbe_bypass_event_store(uint8_t port,\n+int rte_pmd_ixgbe_bypass_event_store(uint16_t port,\n \t\t\t\t     uint32_t event,\n \t\t\t\t     uint32_t state);\n \n@@ -547,7 +551,7 @@ int rte_pmd_ixgbe_bypass_event_store(uint8_t port,\n  *   - (-ENOTSUP) if hardware doesn't support.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_ixgbe_bypass_wd_timeout_store(uint8_t port, uint32_t timeout);\n+int rte_pmd_ixgbe_bypass_wd_timeout_store(uint16_t port, uint32_t timeout);\n \n /**\n  * Get bypass firmware version.\n@@ -561,7 +565,7 @@ int rte_pmd_ixgbe_bypass_wd_timeout_store(uint8_t port, uint32_t timeout);\n  *   - (-ENOTSUP) if hardware doesn't support.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_ixgbe_bypass_ver_show(uint8_t port, uint32_t *ver);\n+int rte_pmd_ixgbe_bypass_ver_show(uint16_t port, uint32_t *ver);\n \n /**\n  * Return bypass watchdog timeout in seconds\n@@ -583,7 +587,7 @@ int rte_pmd_ixgbe_bypass_ver_show(uint8_t port, uint32_t *ver);\n  *   - (-ENOTSUP) if hardware doesn't support.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_ixgbe_bypass_wd_timeout_show(uint8_t port, uint32_t *wd_timeout);\n+int rte_pmd_ixgbe_bypass_wd_timeout_show(uint16_t port, uint32_t *wd_timeout);\n \n /**\n  * Reset bypass watchdog timer\n@@ -595,7 +599,7 @@ int rte_pmd_ixgbe_bypass_wd_timeout_show(uint8_t port, uint32_t *wd_timeout);\n  *   - (-ENOTSUP) if hardware doesn't support.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_pmd_ixgbe_bypass_wd_reset(uint8_t port);\n+int rte_pmd_ixgbe_bypass_wd_reset(uint16_t port);\n \n \n /**\ndiff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c\nindex 92b03c4cb..2d794f841 100644\n--- a/drivers/net/nfp/nfp_net.c\n+++ b/drivers/net/nfp/nfp_net.c\n@@ -1239,13 +1239,13 @@ nfp_net_dev_link_status_print(struct rte_eth_dev *dev)\n \tmemset(&link, 0, sizeof(link));\n \tnfp_net_dev_atomic_read_link_status(dev, &link);\n \tif (link.link_status)\n-\t\tRTE_LOG(INFO, PMD, \"Port %d: Link Up - speed %u Mbps - %s\\n\",\n-\t\t\t(int)(dev->data->port_id), (unsigned)link.link_speed,\n+\t\tRTE_LOG(INFO, PMD, \"Port %u: Link Up - speed %u Mbps - %s\\n\",\n+\t\t\tdev->data->port_id, link.link_speed,\n \t\t\tlink.link_duplex == ETH_LINK_FULL_DUPLEX\n \t\t\t? \"full-duplex\" : \"half-duplex\");\n \telse\n-\t\tRTE_LOG(INFO, PMD, \" Port %d: Link Down\\n\",\n-\t\t\t(int)(dev->data->port_id));\n+\t\tRTE_LOG(INFO, PMD, \" Port %u: Link Down\\n\",\n+\t\t\tdev->data->port_id);\n \n \tRTE_LOG(INFO, PMD, \"PCI Address: %04d:%02d:%02d:%d\\n\",\n \t\tpci_dev->addr.domain, pci_dev->addr.bus,\n@@ -1547,9 +1547,9 @@ nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,\n \tif (tx_free_thresh > (nb_desc)) {\n \t\tRTE_LOG(ERR, PMD,\n \t\t\t\"tx_free_thresh must be less than the number of TX \"\n-\t\t\t\"descriptors. (tx_free_thresh=%u port=%d \"\n+\t\t\t\"descriptors. (tx_free_thresh=%u port=%u \"\n \t\t\t\"queue=%d)\\n\", (unsigned int)tx_free_thresh,\n-\t\t\t(int)dev->data->port_id, (int)queue_idx);\n+\t\t\tdev->data->port_id, (int)queue_idx);\n \t\treturn -(EINVAL);\n \t}\n \n@@ -1847,9 +1847,9 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \t\t */\n \t\tnew_mb = rte_pktmbuf_alloc(rxq->mem_pool);\n \t\tif (unlikely(new_mb == NULL)) {\n-\t\t\tRTE_LOG_DP(DEBUG, PMD, \"RX mbuf alloc failed port_id=%u \"\n-\t\t\t\t\"queue_id=%u\\n\", (unsigned)rxq->port_id,\n-\t\t\t\t(unsigned)rxq->qidx);\n+\t\t\tRTE_LOG_DP(DEBUG, PMD,\n+\t\t\t\"RX mbuf alloc failed port_id=%u queue_id=%u\\n\",\n+\t\t\t\trxq->port_id, rxq->qidx);\n \t\t\tnfp_net_mbuf_alloc_failed(rxq);\n \t\t\tbreak;\n \t\t}\n@@ -1932,8 +1932,8 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \tif (nb_hold == 0)\n \t\treturn nb_hold;\n \n-\tPMD_RX_LOG(DEBUG, \"RX  port_id=%u queue_id=%u, %d packets received\\n\",\n-\t\t   (unsigned)rxq->port_id, (unsigned)rxq->qidx, nb_hold);\n+\tPMD_RX_LOG(DEBUG, \"RX port_id=%u queue_id=%u, %d packets received\\n\",\n+\t\t    rxq->port_id, (unsigned int)rxq->qidx, nb_hold);\n \n \tnb_hold += rxq->nb_rx_hold;\n \n@@ -1944,7 +1944,7 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \trte_wmb();\n \tif (nb_hold > rxq->rx_free_thresh) {\n \t\tPMD_RX_LOG(DEBUG, \"port=%u queue=%u nb_hold=%u avail=%u\\n\",\n-\t\t\t   (unsigned)rxq->port_id, (unsigned)rxq->qidx,\n+\t\t\t   rxq->port_id, (unsigned int)rxq->qidx,\n \t\t\t   (unsigned)nb_hold, (unsigned)avail);\n \t\tnfp_qcp_ptr_add(rxq->qcp_fl, NFP_QCP_WRITE_PTR, nb_hold);\n \t\tnb_hold = 0;\n@@ -2547,7 +2547,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)\n \tether_addr_copy((struct ether_addr *)hw->mac_addr,\n \t\t\t&eth_dev->data->mac_addrs[0]);\n \n-\tPMD_INIT_LOG(INFO, \"port %d VendorID=0x%x DeviceID=0x%x \"\n+\tPMD_INIT_LOG(INFO, \"port %u VendorID=0x%x DeviceID=0x%x \"\n \t\t     \"mac=%02x:%02x:%02x:%02x:%02x:%02x\",\n \t\t     eth_dev->data->port_id, pci_dev->id.vendor_id,\n \t\t     pci_dev->id.device_id,\ndiff --git a/drivers/net/nfp/nfp_net_pmd.h b/drivers/net/nfp/nfp_net_pmd.h\nindex eec56bc1c..7fc76aa76 100644\n--- a/drivers/net/nfp/nfp_net_pmd.h\n+++ b/drivers/net/nfp/nfp_net_pmd.h\n@@ -250,7 +250,7 @@ struct nfp_net_txq {\n \tuint32_t tx_hthresh;   /* not used by now. Future? */\n \tuint32_t tx_wthresh;   /* not used by now. Future? */\n \tuint32_t txq_flags;    /* not used by now. Future? */\n-\tuint8_t  port_id;\n+\tuint16_t  port_id;\n \tint qidx;\n \tint tx_qcidx;\n \t__le64 dma;\ndiff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c\nindex 5aef0591e..fa9313dec 100644\n--- a/drivers/net/null/rte_eth_null.c\n+++ b/drivers/net/null/rte_eth_null.c\n@@ -68,7 +68,7 @@ struct null_queue {\n struct pmd_internals {\n \tunsigned packet_size;\n \tunsigned packet_copy;\n-\tuint8_t port_id;\n+\tuint16_t port_id;\n \n \tstruct null_queue rx_null_queues[RTE_MAX_QUEUES_PER_PORT];\n \tstruct null_queue tx_null_queues[RTE_MAX_QUEUES_PER_PORT];\ndiff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c\nindex defb3b419..b51f16cbd 100644\n--- a/drivers/net/pcap/rte_eth_pcap.c\n+++ b/drivers/net/pcap/rte_eth_pcap.c\n@@ -75,7 +75,7 @@ struct queue_stat {\n \n struct pcap_rx_queue {\n \tpcap_t *pcap;\n-\tuint8_t in_port;\n+\tuint16_t in_port;\n \tstruct rte_mempool *mb_pool;\n \tstruct queue_stat rx_stat;\n \tchar name[PATH_MAX];\ndiff --git a/drivers/net/qede/qede_if.h b/drivers/net/qede/qede_if.h\nindex 9864bb448..96f0d351d 100644\n--- a/drivers/net/qede/qede_if.h\n+++ b/drivers/net/qede/qede_if.h\n@@ -97,7 +97,7 @@ struct qed_link_output {\n \tuint32_t speed;\t\t/* In Mb/s */\n \tuint32_t adv_speed;\t/* Speed mask */\n \tuint8_t duplex;\t\t/* In DUPLEX defs */\n-\tuint8_t port;\t\t/* In PORT defs */\n+\tuint16_t port;\t\t/* In PORT defs */\n \tbool autoneg;\n \tuint32_t pause_config;\n };\ndiff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c\nindex 464d3d384..e3fa7b0e2 100644\n--- a/drivers/net/ring/rte_eth_ring.c\n+++ b/drivers/net/ring/rte_eth_ring.c\n@@ -394,7 +394,7 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],\n \t};\n \tchar args_str[32] = { 0 };\n \tchar ring_name[32] = { 0 };\n-\tuint8_t port_id = RTE_MAX_ETHPORTS;\n+\tuint16_t port_id = RTE_MAX_ETHPORTS;\n \tint ret;\n \n \t/* do some parameter checking */\ndiff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c\nindex 0dac5e60e..93310bdfb 100644\n--- a/drivers/net/vhost/rte_eth_vhost.c\n+++ b/drivers/net/vhost/rte_eth_vhost.c\n@@ -105,7 +105,7 @@ struct vhost_queue {\n \trte_atomic32_t while_queuing;\n \tstruct pmd_internal *internal;\n \tstruct rte_mempool *mb_pool;\n-\tuint8_t port;\n+\tuint16_t port;\n \tuint16_t virtqueue_id;\n \tstruct vhost_stats stats;\n };\n@@ -705,8 +705,8 @@ static struct vhost_device_ops vhost_ops = {\n };\n \n int\n-rte_eth_vhost_get_queue_event(uint8_t port_id,\n-\t\tstruct rte_eth_vhost_queue_event *event)\n+rte_eth_vhost_get_queue_event(uint16_t port_id,\n+\t\t\t       struct rte_eth_vhost_queue_event *event)\n {\n \tstruct rte_vhost_vring_state *state;\n \tunsigned int i;\n@@ -742,7 +742,7 @@ rte_eth_vhost_get_queue_event(uint8_t port_id,\n }\n \n int\n-rte_eth_vhost_get_vid_from_port_id(uint8_t port_id)\n+rte_eth_vhost_get_vid_from_port_id(uint16_t port_id)\n {\n \tstruct internal_list *list;\n \tstruct rte_eth_dev *eth_dev;\ndiff --git a/drivers/net/vhost/rte_eth_vhost.h b/drivers/net/vhost/rte_eth_vhost.h\nindex 39ca77197..0528c6aee 100644\n--- a/drivers/net/vhost/rte_eth_vhost.h\n+++ b/drivers/net/vhost/rte_eth_vhost.h\n@@ -69,8 +69,8 @@ struct rte_eth_vhost_queue_event {\n  *  - On success, zero.\n  *  - On failure, a negative value.\n  */\n-int rte_eth_vhost_get_queue_event(uint8_t port_id,\n-\t\tstruct rte_eth_vhost_queue_event *event);\n+int rte_eth_vhost_get_queue_event(uint16_t port_id,\n+\t\t\t\t  struct rte_eth_vhost_queue_event *event);\n \n /**\n  * Get the 'vid' value associated with the specified port.\n@@ -79,7 +79,7 @@ int rte_eth_vhost_get_queue_event(uint8_t port_id,\n  *  - On success, the 'vid' associated with 'port_id'.\n  *  - On failure, a negative value.\n  */\n-int rte_eth_vhost_get_vid_from_port_id(uint8_t port_id);\n+int rte_eth_vhost_get_vid_from_port_id(uint16_t port_id);\n \n #ifdef __cplusplus\n }\ndiff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h\nindex 18caebdd7..330ee94be 100644\n--- a/drivers/net/virtio/virtio_pci.h\n+++ b/drivers/net/virtio/virtio_pci.h\n@@ -260,7 +260,7 @@ struct virtio_hw {\n \tuint8_t\t    use_msix;\n \tuint8_t     modern;\n \tuint8_t     use_simple_rxtx;\n-\tuint8_t     port_id;\n+\tuint16_t    port_id;\n \tuint8_t     mac_addr[ETHER_ADDR_LEN];\n \tuint32_t    notify_off_multiplier;\n \tuint8_t     *isr;\ndiff --git a/drivers/net/virtio/virtio_rxtx.h b/drivers/net/virtio/virtio_rxtx.h\nindex 28f82d6a8..198b2d8fb 100644\n--- a/drivers/net/virtio/virtio_rxtx.h\n+++ b/drivers/net/virtio/virtio_rxtx.h\n@@ -54,7 +54,7 @@ struct virtnet_rx {\n \tstruct rte_mempool *mpool; /**< mempool for mbuf allocation */\n \n \tuint16_t queue_id;   /**< DPDK queue index. */\n-\tuint8_t port_id;     /**< Device port identifier. */\n+\tuint16_t port_id;     /**< Device port identifier. */\n \n \t/* Statistics */\n \tstruct virtnet_stats stats;\n@@ -69,7 +69,7 @@ struct virtnet_tx {\n \tphys_addr_t virtio_net_hdr_mem;  /**< hdr for each xmit packet */\n \n \tuint16_t    queue_id;            /**< DPDK queue index. */\n-\tuint8_t     port_id;             /**< Device port identifier. */\n+\tuint16_t    port_id;             /**< Device port identifier. */\n \n \t/* Statistics */\n \tstruct virtnet_stats stats;\n@@ -82,7 +82,7 @@ struct virtnet_ctl {\n \t/**< memzone to populate hdr. */\n \tconst struct rte_memzone *virtio_net_hdr_mz;\n \tphys_addr_t virtio_net_hdr_mem; /**< hdr for each xmit packet */\n-\tuint8_t port_id;                /**< Device port identifier. */\n+\tuint16_t port_id;               /**< Device port identifier. */\n \tconst struct rte_memzone *mz;   /**< mem zone to populate RX ring. */\n };\n \ndiff --git a/drivers/net/xenvirt/virtqueue.h b/drivers/net/xenvirt/virtqueue.h\nindex 1bb6877cd..1374d9193 100644\n--- a/drivers/net/xenvirt/virtqueue.h\n+++ b/drivers/net/xenvirt/virtqueue.h\n@@ -74,7 +74,7 @@ struct virtqueue {\n \tstruct rte_mempool       *mpool;  /**< mempool for mbuf allocation */\n \tuint16_t    queue_id;             /**< DPDK queue index. */\n \tuint16_t    vq_queue_index;       /**< PCI queue index */\n-\tuint8_t     port_id;              /**< Device port identifier. */\n+\tuint16_t     port_id;              /**< Device port identifier. */\n \n \tvoid        *vq_ring_virt_mem;    /**< virtual address of vring*/\n \tint         vq_alignment;\ndiff --git a/lib/librte_bitratestats/rte_bitrate.c b/lib/librte_bitratestats/rte_bitrate.c\nindex 3ceb35166..f373697a7 100644\n--- a/lib/librte_bitratestats/rte_bitrate.c\n+++ b/lib/librte_bitratestats/rte_bitrate.c\n@@ -84,7 +84,7 @@ rte_stats_bitrate_reg(struct rte_stats_bitrates *bitrate_data)\n \n int\n rte_stats_bitrate_calc(struct rte_stats_bitrates *bitrate_data,\n-\tuint8_t port_id)\n+\t\t\tuint16_t port_id)\n {\n \tstruct rte_stats_bitrate *port_data;\n \tstruct rte_eth_stats eth_stats;\ndiff --git a/lib/librte_bitratestats/rte_bitrate.h b/lib/librte_bitratestats/rte_bitrate.h\nindex 15fc270a3..2b40cda03 100644\n--- a/lib/librte_bitratestats/rte_bitrate.h\n+++ b/lib/librte_bitratestats/rte_bitrate.h\n@@ -85,7 +85,7 @@ int rte_stats_bitrate_reg(struct rte_stats_bitrates *bitrate_data);\n  *  - Negative value on error\n  */\n int rte_stats_bitrate_calc(struct rte_stats_bitrates *bitrate_data,\n-\tuint8_t port_id);\n+\t\t\t    uint16_t port_id);\n \n #ifdef __cplusplus\n }\ndiff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c\nindex 0597641ee..f1731238b 100644\n--- a/lib/librte_ether/rte_ethdev.c\n+++ b/lib/librte_ether/rte_ethdev.c\n@@ -138,8 +138,8 @@ enum {\n \tSTAT_QMAP_RX\n };\n \n-uint8_t\n-rte_eth_find_next(uint8_t port_id)\n+uint16_t\n+rte_eth_find_next(uint16_t port_id)\n {\n \twhile (port_id < RTE_MAX_ETHPORTS &&\n \t       rte_eth_devices[port_id].state != RTE_ETH_DEV_ATTACHED)\n@@ -187,7 +187,7 @@ rte_eth_dev_allocated(const char *name)\n \treturn NULL;\n }\n \n-static uint8_t\n+static uint16_t\n rte_eth_dev_find_free_port(void)\n {\n \tunsigned i;\n@@ -200,7 +200,7 @@ rte_eth_dev_find_free_port(void)\n }\n \n static struct rte_eth_dev *\n-eth_dev_get(uint8_t port_id)\n+eth_dev_get(uint16_t port_id)\n {\n \tstruct rte_eth_dev *eth_dev = &rte_eth_devices[port_id];\n \n@@ -216,7 +216,7 @@ eth_dev_get(uint8_t port_id)\n struct rte_eth_dev *\n rte_eth_dev_allocate(const char *name)\n {\n-\tuint8_t port_id;\n+\tuint16_t port_id;\n \tstruct rte_eth_dev *eth_dev;\n \n \tport_id = rte_eth_dev_find_free_port();\n@@ -251,7 +251,7 @@ rte_eth_dev_allocate(const char *name)\n struct rte_eth_dev *\n rte_eth_dev_attach_secondary(const char *name)\n {\n-\tuint8_t i;\n+\tuint16_t i;\n \tstruct rte_eth_dev *eth_dev;\n \n \tif (rte_eth_dev_data == NULL)\n@@ -285,7 +285,7 @@ rte_eth_dev_release_port(struct rte_eth_dev *eth_dev)\n }\n \n int\n-rte_eth_dev_is_valid_port(uint8_t port_id)\n+rte_eth_dev_is_valid_port(uint16_t port_id)\n {\n \tif (port_id >= RTE_MAX_ETHPORTS ||\n \t    (rte_eth_devices[port_id].state != RTE_ETH_DEV_ATTACHED &&\n@@ -296,17 +296,17 @@ rte_eth_dev_is_valid_port(uint8_t port_id)\n }\n \n int\n-rte_eth_dev_socket_id(uint8_t port_id)\n+rte_eth_dev_socket_id(uint16_t port_id)\n {\n \tRTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -1);\n \treturn rte_eth_devices[port_id].data->numa_node;\n }\n \n-uint8_t\n+uint16_t\n rte_eth_dev_count(void)\n {\n-\tuint8_t p;\n-\tuint8_t count;\n+\tuint16_t p;\n+\tuint16_t count;\n \n \tcount = 0;\n \n@@ -317,7 +317,7 @@ rte_eth_dev_count(void)\n }\n \n int\n-rte_eth_dev_get_name_by_port(uint8_t port_id, char *name)\n+rte_eth_dev_get_name_by_port(uint16_t port_id, char *name)\n {\n \tconst char *tmp;\n \n@@ -336,7 +336,7 @@ rte_eth_dev_get_name_by_port(uint8_t port_id, char *name)\n }\n \n int\n-rte_eth_dev_get_port_by_name(const char *name, uint8_t *port_id)\n+rte_eth_dev_get_port_by_name(const char *name, uint16_t *port_id)\n {\n \tint ret;\n \tint i;\n@@ -361,7 +361,7 @@ rte_eth_dev_get_port_by_name(const char *name, uint8_t *port_id)\n }\n \n static int\n-rte_eth_dev_is_detachable(uint8_t port_id)\n+rte_eth_dev_is_detachable(uint16_t port_id)\n {\n \tuint32_t dev_flags;\n \n@@ -377,7 +377,7 @@ rte_eth_dev_is_detachable(uint8_t port_id)\n \n /* attach the new device, then store port_id of the device */\n int\n-rte_eth_dev_attach(const char *devargs, uint8_t *port_id)\n+rte_eth_dev_attach(const char *devargs, uint16_t *port_id)\n {\n \tint ret = -1;\n \tint current = rte_eth_dev_count();\n@@ -423,7 +423,7 @@ rte_eth_dev_attach(const char *devargs, uint8_t *port_id)\n \n /* detach the device, then store the name of the device */\n int\n-rte_eth_dev_detach(uint8_t port_id, char *name)\n+rte_eth_dev_detach(uint16_t port_id, char *name)\n {\n \tint ret = -1;\n \n@@ -501,7 +501,7 @@ rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)\n }\n \n int\n-rte_eth_dev_rx_queue_start(uint8_t port_id, uint16_t rx_queue_id)\n+rte_eth_dev_rx_queue_start(uint16_t port_id, uint16_t rx_queue_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -527,7 +527,7 @@ rte_eth_dev_rx_queue_start(uint8_t port_id, uint16_t rx_queue_id)\n }\n \n int\n-rte_eth_dev_rx_queue_stop(uint8_t port_id, uint16_t rx_queue_id)\n+rte_eth_dev_rx_queue_stop(uint16_t port_id, uint16_t rx_queue_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -553,7 +553,7 @@ rte_eth_dev_rx_queue_stop(uint8_t port_id, uint16_t rx_queue_id)\n }\n \n int\n-rte_eth_dev_tx_queue_start(uint8_t port_id, uint16_t tx_queue_id)\n+rte_eth_dev_tx_queue_start(uint16_t port_id, uint16_t tx_queue_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -579,7 +579,7 @@ rte_eth_dev_tx_queue_start(uint8_t port_id, uint16_t tx_queue_id)\n }\n \n int\n-rte_eth_dev_tx_queue_stop(uint8_t port_id, uint16_t tx_queue_id)\n+rte_eth_dev_tx_queue_stop(uint16_t port_id, uint16_t tx_queue_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -688,7 +688,7 @@ rte_eth_speed_bitflag(uint32_t speed, int duplex)\n }\n \n int\n-rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,\n+rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,\n \t\t      const struct rte_eth_conf *dev_conf)\n {\n \tstruct rte_eth_dev *dev;\n@@ -839,7 +839,7 @@ _rte_eth_dev_reset(struct rte_eth_dev *dev)\n }\n \n static void\n-rte_eth_dev_config_restore(uint8_t port_id)\n+rte_eth_dev_config_restore(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n \tstruct rte_eth_dev_info dev_info;\n@@ -894,7 +894,7 @@ rte_eth_dev_config_restore(uint8_t port_id)\n }\n \n int\n-rte_eth_dev_start(uint8_t port_id)\n+rte_eth_dev_start(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n \tint diag;\n@@ -906,7 +906,7 @@ rte_eth_dev_start(uint8_t port_id)\n \tRTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_start, -ENOTSUP);\n \n \tif (dev->data->dev_started != 0) {\n-\t\tRTE_PMD_DEBUG_TRACE(\"Device with port_id=%\" PRIu8\n+\t\tRTE_PMD_DEBUG_TRACE(\"Device with port_id=%\" PRIu16\n \t\t\t\" already started\\n\",\n \t\t\tport_id);\n \t\treturn 0;\n@@ -928,7 +928,7 @@ rte_eth_dev_start(uint8_t port_id)\n }\n \n void\n-rte_eth_dev_stop(uint8_t port_id)\n+rte_eth_dev_stop(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -938,7 +938,7 @@ rte_eth_dev_stop(uint8_t port_id)\n \tRTE_FUNC_PTR_OR_RET(*dev->dev_ops->dev_stop);\n \n \tif (dev->data->dev_started == 0) {\n-\t\tRTE_PMD_DEBUG_TRACE(\"Device with port_id=%\" PRIu8\n+\t\tRTE_PMD_DEBUG_TRACE(\"Device with port_id=%\" PRIu16\n \t\t\t\" already stopped\\n\",\n \t\t\tport_id);\n \t\treturn;\n@@ -949,7 +949,7 @@ rte_eth_dev_stop(uint8_t port_id)\n }\n \n int\n-rte_eth_dev_set_link_up(uint8_t port_id)\n+rte_eth_dev_set_link_up(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -962,7 +962,7 @@ rte_eth_dev_set_link_up(uint8_t port_id)\n }\n \n int\n-rte_eth_dev_set_link_down(uint8_t port_id)\n+rte_eth_dev_set_link_down(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -975,7 +975,7 @@ rte_eth_dev_set_link_down(uint8_t port_id)\n }\n \n void\n-rte_eth_dev_close(uint8_t port_id)\n+rte_eth_dev_close(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -995,7 +995,7 @@ rte_eth_dev_close(uint8_t port_id)\n }\n \n int\n-rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,\n+rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,\n \t\t       uint16_t nb_rx_desc, unsigned int socket_id,\n \t\t       const struct rte_eth_rxconf *rx_conf,\n \t\t       struct rte_mempool *mp)\n@@ -1086,7 +1086,7 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,\n }\n \n int\n-rte_eth_tx_queue_setup(uint8_t port_id, uint16_t tx_queue_id,\n+rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id,\n \t\t       uint16_t nb_tx_desc, unsigned int socket_id,\n \t\t       const struct rte_eth_txconf *tx_conf)\n {\n@@ -1190,7 +1190,7 @@ rte_eth_tx_buffer_init(struct rte_eth_dev_tx_buffer *buffer, uint16_t size)\n }\n \n int\n-rte_eth_tx_done_cleanup(uint8_t port_id, uint16_t queue_id, uint32_t free_cnt)\n+rte_eth_tx_done_cleanup(uint16_t port_id, uint16_t queue_id, uint32_t free_cnt)\n {\n \tstruct rte_eth_dev *dev = &rte_eth_devices[port_id];\n \n@@ -1204,7 +1204,7 @@ rte_eth_tx_done_cleanup(uint8_t port_id, uint16_t queue_id, uint32_t free_cnt)\n }\n \n void\n-rte_eth_promiscuous_enable(uint8_t port_id)\n+rte_eth_promiscuous_enable(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -1217,7 +1217,7 @@ rte_eth_promiscuous_enable(uint8_t port_id)\n }\n \n void\n-rte_eth_promiscuous_disable(uint8_t port_id)\n+rte_eth_promiscuous_disable(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -1230,7 +1230,7 @@ rte_eth_promiscuous_disable(uint8_t port_id)\n }\n \n int\n-rte_eth_promiscuous_get(uint8_t port_id)\n+rte_eth_promiscuous_get(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -1241,7 +1241,7 @@ rte_eth_promiscuous_get(uint8_t port_id)\n }\n \n void\n-rte_eth_allmulticast_enable(uint8_t port_id)\n+rte_eth_allmulticast_enable(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -1254,7 +1254,7 @@ rte_eth_allmulticast_enable(uint8_t port_id)\n }\n \n void\n-rte_eth_allmulticast_disable(uint8_t port_id)\n+rte_eth_allmulticast_disable(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -1267,7 +1267,7 @@ rte_eth_allmulticast_disable(uint8_t port_id)\n }\n \n int\n-rte_eth_allmulticast_get(uint8_t port_id)\n+rte_eth_allmulticast_get(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -1292,7 +1292,7 @@ rte_eth_dev_atomic_read_link_status(struct rte_eth_dev *dev,\n }\n \n void\n-rte_eth_link_get(uint8_t port_id, struct rte_eth_link *eth_link)\n+rte_eth_link_get(uint16_t port_id, struct rte_eth_link *eth_link)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -1309,7 +1309,7 @@ rte_eth_link_get(uint8_t port_id, struct rte_eth_link *eth_link)\n }\n \n void\n-rte_eth_link_get_nowait(uint8_t port_id, struct rte_eth_link *eth_link)\n+rte_eth_link_get_nowait(uint16_t port_id, struct rte_eth_link *eth_link)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -1326,7 +1326,7 @@ rte_eth_link_get_nowait(uint8_t port_id, struct rte_eth_link *eth_link)\n }\n \n int\n-rte_eth_stats_get(uint8_t port_id, struct rte_eth_stats *stats)\n+rte_eth_stats_get(uint16_t port_id, struct rte_eth_stats *stats)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -1342,7 +1342,7 @@ rte_eth_stats_get(uint8_t port_id, struct rte_eth_stats *stats)\n }\n \n void\n-rte_eth_stats_reset(uint8_t port_id)\n+rte_eth_stats_reset(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -1355,7 +1355,7 @@ rte_eth_stats_reset(uint8_t port_id)\n }\n \n static int\n-get_xstats_count(uint8_t port_id)\n+get_xstats_count(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n \tint count;\n@@ -1384,7 +1384,7 @@ get_xstats_count(uint8_t port_id)\n }\n \n int\n-rte_eth_xstats_get_id_by_name(uint8_t port_id, const char *xstat_name,\n+rte_eth_xstats_get_id_by_name(uint16_t port_id, const char *xstat_name,\n \t\tuint64_t *id)\n {\n \tint cnt_xstats, idx_xstat;\n@@ -1428,7 +1428,7 @@ rte_eth_xstats_get_id_by_name(uint8_t port_id, const char *xstat_name,\n }\n \n int\n-rte_eth_xstats_get_names_by_id(uint8_t port_id,\n+rte_eth_xstats_get_names_by_id(uint16_t port_id,\n \tstruct rte_eth_xstat_name *xstats_names, unsigned int size,\n \tuint64_t *ids)\n {\n@@ -1545,7 +1545,7 @@ rte_eth_xstats_get_names_by_id(uint8_t port_id,\n }\n \n int\n-rte_eth_xstats_get_names(uint8_t port_id,\n+rte_eth_xstats_get_names(uint16_t port_id,\n \tstruct rte_eth_xstat_name *xstats_names,\n \tunsigned int size)\n {\n@@ -1611,8 +1611,8 @@ rte_eth_xstats_get_names(uint8_t port_id,\n \n /* retrieve ethdev extended statistics */\n int\n-rte_eth_xstats_get_by_id(uint8_t port_id, const uint64_t *ids, uint64_t *values,\n-\tunsigned int n)\n+rte_eth_xstats_get_by_id(uint16_t port_id, const uint64_t *ids,\n+\t\t\t uint64_t *values, unsigned int n)\n {\n \t/* If need all xstats */\n \tif (!ids) {\n@@ -1737,7 +1737,7 @@ rte_eth_xstats_get_by_id(uint8_t port_id, const uint64_t *ids, uint64_t *values,\n }\n \n int\n-rte_eth_xstats_get(uint8_t port_id, struct rte_eth_xstat *xstats,\n+rte_eth_xstats_get(uint16_t port_id, struct rte_eth_xstat *xstats,\n \tunsigned int n)\n {\n \tstruct rte_eth_stats eth_stats;\n@@ -1819,7 +1819,7 @@ rte_eth_xstats_get(uint8_t port_id, struct rte_eth_xstat *xstats,\n \n /* reset ethdev extended statistics */\n void\n-rte_eth_xstats_reset(uint8_t port_id)\n+rte_eth_xstats_reset(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -1837,7 +1837,7 @@ rte_eth_xstats_reset(uint8_t port_id)\n }\n \n static int\n-set_queue_stats_mapping(uint8_t port_id, uint16_t queue_id, uint8_t stat_idx,\n+set_queue_stats_mapping(uint16_t port_id, uint16_t queue_id, uint8_t stat_idx,\n \t\tuint8_t is_rx)\n {\n \tstruct rte_eth_dev *dev;\n@@ -1853,7 +1853,7 @@ set_queue_stats_mapping(uint8_t port_id, uint16_t queue_id, uint8_t stat_idx,\n \n \n int\n-rte_eth_dev_set_tx_queue_stats_mapping(uint8_t port_id, uint16_t tx_queue_id,\n+rte_eth_dev_set_tx_queue_stats_mapping(uint16_t port_id, uint16_t tx_queue_id,\n \t\tuint8_t stat_idx)\n {\n \treturn set_queue_stats_mapping(port_id, tx_queue_id, stat_idx,\n@@ -1862,7 +1862,7 @@ rte_eth_dev_set_tx_queue_stats_mapping(uint8_t port_id, uint16_t tx_queue_id,\n \n \n int\n-rte_eth_dev_set_rx_queue_stats_mapping(uint8_t port_id, uint16_t rx_queue_id,\n+rte_eth_dev_set_rx_queue_stats_mapping(uint16_t port_id, uint16_t rx_queue_id,\n \t\tuint8_t stat_idx)\n {\n \treturn set_queue_stats_mapping(port_id, rx_queue_id, stat_idx,\n@@ -1870,7 +1870,7 @@ rte_eth_dev_set_rx_queue_stats_mapping(uint8_t port_id, uint16_t rx_queue_id,\n }\n \n int\n-rte_eth_dev_fw_version_get(uint8_t port_id, char *fw_version, size_t fw_size)\n+rte_eth_dev_fw_version_get(uint16_t port_id, char *fw_version, size_t fw_size)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -1882,7 +1882,7 @@ rte_eth_dev_fw_version_get(uint8_t port_id, char *fw_version, size_t fw_size)\n }\n \n void\n-rte_eth_dev_info_get(uint8_t port_id, struct rte_eth_dev_info *dev_info)\n+rte_eth_dev_info_get(uint16_t port_id, struct rte_eth_dev_info *dev_info)\n {\n \tstruct rte_eth_dev *dev;\n \tconst struct rte_eth_desc_lim lim = {\n@@ -1906,7 +1906,7 @@ rte_eth_dev_info_get(uint8_t port_id, struct rte_eth_dev_info *dev_info)\n }\n \n int\n-rte_eth_dev_get_supported_ptypes(uint8_t port_id, uint32_t ptype_mask,\n+rte_eth_dev_get_supported_ptypes(uint16_t port_id, uint32_t ptype_mask,\n \t\t\t\t uint32_t *ptypes, int num)\n {\n \tint i, j;\n@@ -1932,7 +1932,7 @@ rte_eth_dev_get_supported_ptypes(uint8_t port_id, uint32_t ptype_mask,\n }\n \n void\n-rte_eth_macaddr_get(uint8_t port_id, struct ether_addr *mac_addr)\n+rte_eth_macaddr_get(uint16_t port_id, struct ether_addr *mac_addr)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -1943,7 +1943,7 @@ rte_eth_macaddr_get(uint8_t port_id, struct ether_addr *mac_addr)\n \n \n int\n-rte_eth_dev_get_mtu(uint8_t port_id, uint16_t *mtu)\n+rte_eth_dev_get_mtu(uint16_t port_id, uint16_t *mtu)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -1955,7 +1955,7 @@ rte_eth_dev_get_mtu(uint8_t port_id, uint16_t *mtu)\n }\n \n int\n-rte_eth_dev_set_mtu(uint8_t port_id, uint16_t mtu)\n+rte_eth_dev_set_mtu(uint16_t port_id, uint16_t mtu)\n {\n \tint ret;\n \tstruct rte_eth_dev *dev;\n@@ -1972,7 +1972,7 @@ rte_eth_dev_set_mtu(uint8_t port_id, uint16_t mtu)\n }\n \n int\n-rte_eth_dev_vlan_filter(uint8_t port_id, uint16_t vlan_id, int on)\n+rte_eth_dev_vlan_filter(uint16_t port_id, uint16_t vlan_id, int on)\n {\n \tstruct rte_eth_dev *dev;\n \tint ret;\n@@ -2011,7 +2011,8 @@ rte_eth_dev_vlan_filter(uint8_t port_id, uint16_t vlan_id, int on)\n }\n \n int\n-rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, int on)\n+rte_eth_dev_set_vlan_strip_on_queue(uint16_t port_id, uint16_t rx_queue_id,\n+\t\t\t\t    int on)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -2029,7 +2030,7 @@ rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, int o\n }\n \n int\n-rte_eth_dev_set_vlan_ether_type(uint8_t port_id,\n+rte_eth_dev_set_vlan_ether_type(uint16_t port_id,\n \t\t\t\tenum rte_vlan_type vlan_type,\n \t\t\t\tuint16_t tpid)\n {\n@@ -2043,7 +2044,7 @@ rte_eth_dev_set_vlan_ether_type(uint8_t port_id,\n }\n \n int\n-rte_eth_dev_set_vlan_offload(uint8_t port_id, int offload_mask)\n+rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask)\n {\n \tstruct rte_eth_dev *dev;\n \tint ret = 0;\n@@ -2086,7 +2087,7 @@ rte_eth_dev_set_vlan_offload(uint8_t port_id, int offload_mask)\n }\n \n int\n-rte_eth_dev_get_vlan_offload(uint8_t port_id)\n+rte_eth_dev_get_vlan_offload(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n \tint ret = 0;\n@@ -2107,7 +2108,7 @@ rte_eth_dev_get_vlan_offload(uint8_t port_id)\n }\n \n int\n-rte_eth_dev_set_vlan_pvid(uint8_t port_id, uint16_t pvid, int on)\n+rte_eth_dev_set_vlan_pvid(uint16_t port_id, uint16_t pvid, int on)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -2120,7 +2121,7 @@ rte_eth_dev_set_vlan_pvid(uint8_t port_id, uint16_t pvid, int on)\n }\n \n int\n-rte_eth_dev_flow_ctrl_get(uint8_t port_id, struct rte_eth_fc_conf *fc_conf)\n+rte_eth_dev_flow_ctrl_get(uint16_t port_id, struct rte_eth_fc_conf *fc_conf)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -2132,7 +2133,7 @@ rte_eth_dev_flow_ctrl_get(uint8_t port_id, struct rte_eth_fc_conf *fc_conf)\n }\n \n int\n-rte_eth_dev_flow_ctrl_set(uint8_t port_id, struct rte_eth_fc_conf *fc_conf)\n+rte_eth_dev_flow_ctrl_set(uint16_t port_id, struct rte_eth_fc_conf *fc_conf)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -2148,7 +2149,8 @@ rte_eth_dev_flow_ctrl_set(uint8_t port_id, struct rte_eth_fc_conf *fc_conf)\n }\n \n int\n-rte_eth_dev_priority_flow_ctrl_set(uint8_t port_id, struct rte_eth_pfc_conf *pfc_conf)\n+rte_eth_dev_priority_flow_ctrl_set(uint16_t port_id,\n+\t\t\t\t   struct rte_eth_pfc_conf *pfc_conf)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -2214,7 +2216,7 @@ rte_eth_check_reta_entry(struct rte_eth_rss_reta_entry64 *reta_conf,\n }\n \n int\n-rte_eth_dev_rss_reta_update(uint8_t port_id,\n+rte_eth_dev_rss_reta_update(uint16_t port_id,\n \t\t\t    struct rte_eth_rss_reta_entry64 *reta_conf,\n \t\t\t    uint16_t reta_size)\n {\n@@ -2240,7 +2242,7 @@ rte_eth_dev_rss_reta_update(uint8_t port_id,\n }\n \n int\n-rte_eth_dev_rss_reta_query(uint8_t port_id,\n+rte_eth_dev_rss_reta_query(uint16_t port_id,\n \t\t\t   struct rte_eth_rss_reta_entry64 *reta_conf,\n \t\t\t   uint16_t reta_size)\n {\n@@ -2260,7 +2262,8 @@ rte_eth_dev_rss_reta_query(uint8_t port_id,\n }\n \n int\n-rte_eth_dev_rss_hash_update(uint8_t port_id, struct rte_eth_rss_conf *rss_conf)\n+rte_eth_dev_rss_hash_update(uint16_t port_id,\n+\t\t\t    struct rte_eth_rss_conf *rss_conf)\n {\n \tstruct rte_eth_dev *dev;\n \tuint16_t rss_hash_protos;\n@@ -2279,7 +2282,7 @@ rte_eth_dev_rss_hash_update(uint8_t port_id, struct rte_eth_rss_conf *rss_conf)\n }\n \n int\n-rte_eth_dev_rss_hash_conf_get(uint8_t port_id,\n+rte_eth_dev_rss_hash_conf_get(uint16_t port_id,\n \t\t\t      struct rte_eth_rss_conf *rss_conf)\n {\n \tstruct rte_eth_dev *dev;\n@@ -2291,7 +2294,7 @@ rte_eth_dev_rss_hash_conf_get(uint8_t port_id,\n }\n \n int\n-rte_eth_dev_udp_tunnel_port_add(uint8_t port_id,\n+rte_eth_dev_udp_tunnel_port_add(uint16_t port_id,\n \t\t\t\tstruct rte_eth_udp_tunnel *udp_tunnel)\n {\n \tstruct rte_eth_dev *dev;\n@@ -2313,7 +2316,7 @@ rte_eth_dev_udp_tunnel_port_add(uint8_t port_id,\n }\n \n int\n-rte_eth_dev_udp_tunnel_port_delete(uint8_t port_id,\n+rte_eth_dev_udp_tunnel_port_delete(uint16_t port_id,\n \t\t\t\t   struct rte_eth_udp_tunnel *udp_tunnel)\n {\n \tstruct rte_eth_dev *dev;\n@@ -2336,7 +2339,7 @@ rte_eth_dev_udp_tunnel_port_delete(uint8_t port_id,\n }\n \n int\n-rte_eth_led_on(uint8_t port_id)\n+rte_eth_led_on(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -2347,7 +2350,7 @@ rte_eth_led_on(uint8_t port_id)\n }\n \n int\n-rte_eth_led_off(uint8_t port_id)\n+rte_eth_led_off(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -2362,7 +2365,7 @@ rte_eth_led_off(uint8_t port_id)\n  * an empty spot.\n  */\n static int\n-get_mac_addr_index(uint8_t port_id, const struct ether_addr *addr)\n+get_mac_addr_index(uint16_t port_id, const struct ether_addr *addr)\n {\n \tstruct rte_eth_dev_info dev_info;\n \tstruct rte_eth_dev *dev = &rte_eth_devices[port_id];\n@@ -2381,7 +2384,7 @@ get_mac_addr_index(uint8_t port_id, const struct ether_addr *addr)\n static const struct ether_addr null_mac_addr;\n \n int\n-rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr,\n+rte_eth_dev_mac_addr_add(uint16_t port_id, struct ether_addr *addr,\n \t\t\tuint32_t pool)\n {\n \tstruct rte_eth_dev *dev;\n@@ -2434,7 +2437,7 @@ rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr,\n }\n \n int\n-rte_eth_dev_mac_addr_remove(uint8_t port_id, struct ether_addr *addr)\n+rte_eth_dev_mac_addr_remove(uint16_t port_id, struct ether_addr *addr)\n {\n \tstruct rte_eth_dev *dev;\n \tint index;\n@@ -2463,7 +2466,7 @@ rte_eth_dev_mac_addr_remove(uint8_t port_id, struct ether_addr *addr)\n }\n \n int\n-rte_eth_dev_default_mac_addr_set(uint8_t port_id, struct ether_addr *addr)\n+rte_eth_dev_default_mac_addr_set(uint16_t port_id, struct ether_addr *addr)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -2489,7 +2492,7 @@ rte_eth_dev_default_mac_addr_set(uint8_t port_id, struct ether_addr *addr)\n  * an empty spot.\n  */\n static int\n-get_hash_mac_addr_index(uint8_t port_id, const struct ether_addr *addr)\n+get_hash_mac_addr_index(uint16_t port_id, const struct ether_addr *addr)\n {\n \tstruct rte_eth_dev_info dev_info;\n \tstruct rte_eth_dev *dev = &rte_eth_devices[port_id];\n@@ -2508,7 +2511,7 @@ get_hash_mac_addr_index(uint8_t port_id, const struct ether_addr *addr)\n }\n \n int\n-rte_eth_dev_uc_hash_table_set(uint8_t port_id, struct ether_addr *addr,\n+rte_eth_dev_uc_hash_table_set(uint16_t port_id, struct ether_addr *addr,\n \t\t\t\tuint8_t on)\n {\n \tint index;\n@@ -2560,7 +2563,7 @@ rte_eth_dev_uc_hash_table_set(uint8_t port_id, struct ether_addr *addr,\n }\n \n int\n-rte_eth_dev_uc_all_hash_table_set(uint8_t port_id, uint8_t on)\n+rte_eth_dev_uc_all_hash_table_set(uint16_t port_id, uint8_t on)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -2572,7 +2575,7 @@ rte_eth_dev_uc_all_hash_table_set(uint8_t port_id, uint8_t on)\n \treturn (*dev->dev_ops->uc_all_hash_table_set)(dev, on);\n }\n \n-int rte_eth_set_queue_rate_limit(uint8_t port_id, uint16_t queue_idx,\n+int rte_eth_set_queue_rate_limit(uint16_t port_id, uint16_t queue_idx,\n \t\t\t\t\tuint16_t tx_rate)\n {\n \tstruct rte_eth_dev *dev;\n@@ -2603,7 +2606,7 @@ int rte_eth_set_queue_rate_limit(uint8_t port_id, uint16_t queue_idx,\n }\n \n int\n-rte_eth_mirror_rule_set(uint8_t port_id,\n+rte_eth_mirror_rule_set(uint16_t port_id,\n \t\t\tstruct rte_eth_mirror_conf *mirror_conf,\n \t\t\tuint8_t rule_id, uint8_t on)\n {\n@@ -2641,7 +2644,7 @@ rte_eth_mirror_rule_set(uint8_t port_id,\n }\n \n int\n-rte_eth_mirror_rule_reset(uint8_t port_id, uint8_t rule_id)\n+rte_eth_mirror_rule_reset(uint16_t port_id, uint8_t rule_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -2654,7 +2657,7 @@ rte_eth_mirror_rule_reset(uint8_t port_id, uint8_t rule_id)\n }\n \n int\n-rte_eth_dev_callback_register(uint8_t port_id,\n+rte_eth_dev_callback_register(uint16_t port_id,\n \t\t\tenum rte_eth_event_type event,\n \t\t\trte_eth_dev_cb_fn cb_fn, void *cb_arg)\n {\n@@ -2694,7 +2697,7 @@ rte_eth_dev_callback_register(uint8_t port_id,\n }\n \n int\n-rte_eth_dev_callback_unregister(uint8_t port_id,\n+rte_eth_dev_callback_unregister(uint16_t port_id,\n \t\t\tenum rte_eth_event_type event,\n \t\t\trte_eth_dev_cb_fn cb_fn, void *cb_arg)\n {\n@@ -2766,7 +2769,7 @@ _rte_eth_dev_callback_process(struct rte_eth_dev *dev,\n }\n \n int\n-rte_eth_dev_rx_intr_ctl(uint8_t port_id, int epfd, int op, void *data)\n+rte_eth_dev_rx_intr_ctl(uint16_t port_id, int epfd, int op, void *data)\n {\n \tuint32_t vec;\n \tstruct rte_eth_dev *dev;\n@@ -2827,7 +2830,7 @@ rte_eth_dma_zone_reserve(const struct rte_eth_dev *dev, const char *ring_name,\n }\n \n int\n-rte_eth_dev_rx_intr_ctl_q(uint8_t port_id, uint16_t queue_id,\n+rte_eth_dev_rx_intr_ctl_q(uint16_t port_id, uint16_t queue_id,\n \t\t\t  int epfd, int op, void *data)\n {\n \tuint32_t vec;\n@@ -2867,7 +2870,7 @@ rte_eth_dev_rx_intr_ctl_q(uint8_t port_id, uint16_t queue_id,\n }\n \n int\n-rte_eth_dev_rx_intr_enable(uint8_t port_id,\n+rte_eth_dev_rx_intr_enable(uint16_t port_id,\n \t\t\t   uint16_t queue_id)\n {\n \tstruct rte_eth_dev *dev;\n@@ -2881,7 +2884,7 @@ rte_eth_dev_rx_intr_enable(uint8_t port_id,\n }\n \n int\n-rte_eth_dev_rx_intr_disable(uint8_t port_id,\n+rte_eth_dev_rx_intr_disable(uint16_t port_id,\n \t\t\t    uint16_t queue_id)\n {\n \tstruct rte_eth_dev *dev;\n@@ -2896,7 +2899,8 @@ rte_eth_dev_rx_intr_disable(uint8_t port_id,\n \n \n int\n-rte_eth_dev_filter_supported(uint8_t port_id, enum rte_filter_type filter_type)\n+rte_eth_dev_filter_supported(uint16_t port_id,\n+\t\t\t     enum rte_filter_type filter_type)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -2909,7 +2913,7 @@ rte_eth_dev_filter_supported(uint8_t port_id, enum rte_filter_type filter_type)\n }\n \n int\n-rte_eth_dev_filter_ctrl(uint8_t port_id, enum rte_filter_type filter_type,\n+rte_eth_dev_filter_ctrl(uint16_t port_id, enum rte_filter_type filter_type,\n \t\t       enum rte_filter_op filter_op, void *arg)\n {\n \tstruct rte_eth_dev *dev;\n@@ -2922,7 +2926,7 @@ rte_eth_dev_filter_ctrl(uint8_t port_id, enum rte_filter_type filter_type,\n }\n \n void *\n-rte_eth_add_rx_callback(uint8_t port_id, uint16_t queue_id,\n+rte_eth_add_rx_callback(uint16_t port_id, uint16_t queue_id,\n \t\trte_rx_callback_fn fn, void *user_param)\n {\n #ifndef RTE_ETHDEV_RXTX_CALLBACKS\n@@ -2964,7 +2968,7 @@ rte_eth_add_rx_callback(uint8_t port_id, uint16_t queue_id,\n }\n \n void *\n-rte_eth_add_first_rx_callback(uint8_t port_id, uint16_t queue_id,\n+rte_eth_add_first_rx_callback(uint16_t port_id, uint16_t queue_id,\n \t\trte_rx_callback_fn fn, void *user_param)\n {\n #ifndef RTE_ETHDEV_RXTX_CALLBACKS\n@@ -2999,7 +3003,7 @@ rte_eth_add_first_rx_callback(uint8_t port_id, uint16_t queue_id,\n }\n \n void *\n-rte_eth_add_tx_callback(uint8_t port_id, uint16_t queue_id,\n+rte_eth_add_tx_callback(uint16_t port_id, uint16_t queue_id,\n \t\trte_tx_callback_fn fn, void *user_param)\n {\n #ifndef RTE_ETHDEV_RXTX_CALLBACKS\n@@ -3042,7 +3046,7 @@ rte_eth_add_tx_callback(uint8_t port_id, uint16_t queue_id,\n }\n \n int\n-rte_eth_remove_rx_callback(uint8_t port_id, uint16_t queue_id,\n+rte_eth_remove_rx_callback(uint16_t port_id, uint16_t queue_id,\n \t\tstruct rte_eth_rxtx_callback *user_cb)\n {\n #ifndef RTE_ETHDEV_RXTX_CALLBACKS\n@@ -3076,7 +3080,7 @@ rte_eth_remove_rx_callback(uint8_t port_id, uint16_t queue_id,\n }\n \n int\n-rte_eth_remove_tx_callback(uint8_t port_id, uint16_t queue_id,\n+rte_eth_remove_tx_callback(uint16_t port_id, uint16_t queue_id,\n \t\tstruct rte_eth_rxtx_callback *user_cb)\n {\n #ifndef RTE_ETHDEV_RXTX_CALLBACKS\n@@ -3110,7 +3114,7 @@ rte_eth_remove_tx_callback(uint8_t port_id, uint16_t queue_id,\n }\n \n int\n-rte_eth_rx_queue_info_get(uint8_t port_id, uint16_t queue_id,\n+rte_eth_rx_queue_info_get(uint16_t port_id, uint16_t queue_id,\n \tstruct rte_eth_rxq_info *qinfo)\n {\n \tstruct rte_eth_dev *dev;\n@@ -3134,7 +3138,7 @@ rte_eth_rx_queue_info_get(uint8_t port_id, uint16_t queue_id,\n }\n \n int\n-rte_eth_tx_queue_info_get(uint8_t port_id, uint16_t queue_id,\n+rte_eth_tx_queue_info_get(uint16_t port_id, uint16_t queue_id,\n \tstruct rte_eth_txq_info *qinfo)\n {\n \tstruct rte_eth_dev *dev;\n@@ -3158,7 +3162,7 @@ rte_eth_tx_queue_info_get(uint8_t port_id, uint16_t queue_id,\n }\n \n int\n-rte_eth_dev_set_mc_addr_list(uint8_t port_id,\n+rte_eth_dev_set_mc_addr_list(uint16_t port_id,\n \t\t\t     struct ether_addr *mc_addr_set,\n \t\t\t     uint32_t nb_mc_addr)\n {\n@@ -3172,7 +3176,7 @@ rte_eth_dev_set_mc_addr_list(uint8_t port_id,\n }\n \n int\n-rte_eth_timesync_enable(uint8_t port_id)\n+rte_eth_timesync_enable(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -3184,7 +3188,7 @@ rte_eth_timesync_enable(uint8_t port_id)\n }\n \n int\n-rte_eth_timesync_disable(uint8_t port_id)\n+rte_eth_timesync_disable(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -3196,7 +3200,7 @@ rte_eth_timesync_disable(uint8_t port_id)\n }\n \n int\n-rte_eth_timesync_read_rx_timestamp(uint8_t port_id, struct timespec *timestamp,\n+rte_eth_timesync_read_rx_timestamp(uint16_t port_id, struct timespec *timestamp,\n \t\t\t\t   uint32_t flags)\n {\n \tstruct rte_eth_dev *dev;\n@@ -3209,7 +3213,8 @@ rte_eth_timesync_read_rx_timestamp(uint8_t port_id, struct timespec *timestamp,\n }\n \n int\n-rte_eth_timesync_read_tx_timestamp(uint8_t port_id, struct timespec *timestamp)\n+rte_eth_timesync_read_tx_timestamp(uint16_t port_id,\n+\t\t\t\t   struct timespec *timestamp)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -3221,7 +3226,7 @@ rte_eth_timesync_read_tx_timestamp(uint8_t port_id, struct timespec *timestamp)\n }\n \n int\n-rte_eth_timesync_adjust_time(uint8_t port_id, int64_t delta)\n+rte_eth_timesync_adjust_time(uint16_t port_id, int64_t delta)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -3233,7 +3238,7 @@ rte_eth_timesync_adjust_time(uint8_t port_id, int64_t delta)\n }\n \n int\n-rte_eth_timesync_read_time(uint8_t port_id, struct timespec *timestamp)\n+rte_eth_timesync_read_time(uint16_t port_id, struct timespec *timestamp)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -3245,7 +3250,7 @@ rte_eth_timesync_read_time(uint8_t port_id, struct timespec *timestamp)\n }\n \n int\n-rte_eth_timesync_write_time(uint8_t port_id, const struct timespec *timestamp)\n+rte_eth_timesync_write_time(uint16_t port_id, const struct timespec *timestamp)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -3257,7 +3262,7 @@ rte_eth_timesync_write_time(uint8_t port_id, const struct timespec *timestamp)\n }\n \n int\n-rte_eth_dev_get_reg_info(uint8_t port_id, struct rte_dev_reg_info *info)\n+rte_eth_dev_get_reg_info(uint16_t port_id, struct rte_dev_reg_info *info)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -3269,7 +3274,7 @@ rte_eth_dev_get_reg_info(uint8_t port_id, struct rte_dev_reg_info *info)\n }\n \n int\n-rte_eth_dev_get_eeprom_length(uint8_t port_id)\n+rte_eth_dev_get_eeprom_length(uint16_t port_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -3281,7 +3286,7 @@ rte_eth_dev_get_eeprom_length(uint8_t port_id)\n }\n \n int\n-rte_eth_dev_get_eeprom(uint8_t port_id, struct rte_dev_eeprom_info *info)\n+rte_eth_dev_get_eeprom(uint16_t port_id, struct rte_dev_eeprom_info *info)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -3293,7 +3298,7 @@ rte_eth_dev_get_eeprom(uint8_t port_id, struct rte_dev_eeprom_info *info)\n }\n \n int\n-rte_eth_dev_set_eeprom(uint8_t port_id, struct rte_dev_eeprom_info *info)\n+rte_eth_dev_set_eeprom(uint16_t port_id, struct rte_dev_eeprom_info *info)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -3305,7 +3310,7 @@ rte_eth_dev_set_eeprom(uint8_t port_id, struct rte_dev_eeprom_info *info)\n }\n \n int\n-rte_eth_dev_get_dcb_info(uint8_t port_id,\n+rte_eth_dev_get_dcb_info(uint16_t port_id,\n \t\t\t     struct rte_eth_dcb_info *dcb_info)\n {\n \tstruct rte_eth_dev *dev;\n@@ -3320,7 +3325,7 @@ rte_eth_dev_get_dcb_info(uint8_t port_id,\n }\n \n int\n-rte_eth_dev_l2_tunnel_eth_type_conf(uint8_t port_id,\n+rte_eth_dev_l2_tunnel_eth_type_conf(uint16_t port_id,\n \t\t\t\t    struct rte_eth_l2_tunnel_conf *l2_tunnel)\n {\n \tstruct rte_eth_dev *dev;\n@@ -3343,7 +3348,7 @@ rte_eth_dev_l2_tunnel_eth_type_conf(uint8_t port_id,\n }\n \n int\n-rte_eth_dev_l2_tunnel_offload_set(uint8_t port_id,\n+rte_eth_dev_l2_tunnel_offload_set(uint16_t port_id,\n \t\t\t\t  struct rte_eth_l2_tunnel_conf *l2_tunnel,\n \t\t\t\t  uint32_t mask,\n \t\t\t\t  uint8_t en)\n@@ -3387,7 +3392,7 @@ rte_eth_dev_adjust_nb_desc(uint16_t *nb_desc,\n }\n \n int\n-rte_eth_dev_adjust_nb_rx_tx_desc(uint8_t port_id,\n+rte_eth_dev_adjust_nb_rx_tx_desc(uint16_t port_id,\n \t\t\t\t uint16_t *nb_rx_desc,\n \t\t\t\t uint16_t *nb_tx_desc)\n {\ndiff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h\nindex 0adf3274a..ca75b199c 100644\n--- a/lib/librte_ether/rte_ethdev.h\n+++ b/lib/librte_ether/rte_ethdev.h\n@@ -1568,7 +1568,7 @@ struct eth_dev_ops {\n  * @return\n  *   The number of packets returned to the user.\n  */\n-typedef uint16_t (*rte_rx_callback_fn)(uint8_t port, uint16_t queue,\n+typedef uint16_t (*rte_rx_callback_fn)(uint16_t port, uint16_t queue,\n \tstruct rte_mbuf *pkts[], uint16_t nb_pkts, uint16_t max_pkts,\n \tvoid *user_param);\n \n@@ -1592,7 +1592,7 @@ typedef uint16_t (*rte_rx_callback_fn)(uint8_t port, uint16_t queue,\n  * @return\n  *   The number of packets to be written to the NIC.\n  */\n-typedef uint16_t (*rte_tx_callback_fn)(uint8_t port, uint16_t queue,\n+typedef uint16_t (*rte_tx_callback_fn)(uint16_t port, uint16_t queue,\n \tstruct rte_mbuf *pkts[], uint16_t nb_pkts, void *user_param);\n \n /**\n@@ -1695,7 +1695,7 @@ struct rte_eth_dev_data {\n \t/** bitmap array of associating Ethernet MAC addresses to pools */\n \tstruct ether_addr* hash_mac_addrs;\n \t/** Device Ethernet MAC addresses of hash filtering. */\n-\tuint8_t port_id;           /**< Device [external] port identifier. */\n+\tuint16_t port_id;           /**< Device [external] port identifier. */\n \t__extension__\n \tuint8_t promiscuous   : 1, /**< RX promiscuous mode ON(1) / OFF(0). */\n \t\tscattered_rx : 1,  /**< RX of scattered packets is ON(1) / OFF(0) */\n@@ -1737,7 +1737,7 @@ extern struct rte_eth_dev rte_eth_devices[];\n  * @return\n  *   Next valid port id, RTE_MAX_ETHPORTS if there is none.\n  */\n-uint8_t rte_eth_find_next(uint8_t port_id);\n+uint16_t rte_eth_find_next(uint16_t port_id);\n \n /**\n  * Macro to iterate over all enabled ethdev ports.\n@@ -1760,7 +1760,7 @@ uint8_t rte_eth_find_next(uint8_t port_id);\n  * @return\n  *   - The total number of usable Ethernet devices.\n  */\n-uint8_t rte_eth_dev_count(void);\n+uint16_t rte_eth_dev_count(void);\n \n /**\n  * @internal\n@@ -1821,7 +1821,7 @@ int rte_eth_dev_release_port(struct rte_eth_dev *eth_dev);\n  * @return\n  *  0 on success and port_id is filled, negative on error\n  */\n-int rte_eth_dev_attach(const char *devargs, uint8_t *port_id);\n+int rte_eth_dev_attach(const char *devargs, uint16_t *port_id);\n \n /**\n  * Detach a Ethernet device specified by port identifier.\n@@ -1836,7 +1836,7 @@ int rte_eth_dev_attach(const char *devargs, uint8_t *port_id);\n  * @return\n  *  0 on success and devname is filled, negative on error\n  */\n-int rte_eth_dev_detach(uint8_t port_id, char *devname);\n+int rte_eth_dev_detach(uint16_t port_id, char *devname);\n \n /**\n  * Convert a numerical speed in Mbps to a bitmap flag that can be used in\n@@ -1880,7 +1880,7 @@ uint32_t rte_eth_speed_bitflag(uint32_t speed, int duplex);\n  *   - 0: Success, device configured.\n  *   - <0: Error code returned by the driver configuration function.\n  */\n-int rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_queue,\n+int rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_queue,\n \t\tuint16_t nb_tx_queue, const struct rte_eth_conf *eth_conf);\n \n /**\n@@ -1935,7 +1935,7 @@ void _rte_eth_dev_reset(struct rte_eth_dev *dev);\n  *      allocate network memory buffers from the memory pool when\n  *      initializing receive descriptors.\n  */\n-int rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,\n+int rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,\n \t\tuint16_t nb_rx_desc, unsigned int socket_id,\n \t\tconst struct rte_eth_rxconf *rx_conf,\n \t\tstruct rte_mempool *mb_pool);\n@@ -1983,7 +1983,7 @@ int rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,\n  *   - 0: Success, the transmit queue is correctly set up.\n  *   - -ENOMEM: Unable to allocate the transmit ring descriptors.\n  */\n-int rte_eth_tx_queue_setup(uint8_t port_id, uint16_t tx_queue_id,\n+int rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id,\n \t\tuint16_t nb_tx_desc, unsigned int socket_id,\n \t\tconst struct rte_eth_txconf *tx_conf);\n \n@@ -1997,7 +1997,7 @@ int rte_eth_tx_queue_setup(uint8_t port_id, uint16_t tx_queue_id,\n  *   a default of zero if the socket could not be determined.\n  *   -1 is returned is the port_id value is out of range.\n  */\n-int rte_eth_dev_socket_id(uint8_t port_id);\n+int rte_eth_dev_socket_id(uint16_t port_id);\n \n /**\n  * Check if port_id of device is attached\n@@ -2008,7 +2008,7 @@ int rte_eth_dev_socket_id(uint8_t port_id);\n  *   - 0 if port is out of range or not attached\n  *   - 1 if device is attached\n  */\n-int rte_eth_dev_is_valid_port(uint8_t port_id);\n+int rte_eth_dev_is_valid_port(uint16_t port_id);\n \n /**\n  * Start specified RX queue of a port. It is used when rx_deferred_start\n@@ -2025,7 +2025,7 @@ int rte_eth_dev_is_valid_port(uint8_t port_id);\n  *   - -EINVAL: The port_id or the queue_id out of range.\n  *   - -ENOTSUP: The function not supported in PMD driver.\n  */\n-int rte_eth_dev_rx_queue_start(uint8_t port_id, uint16_t rx_queue_id);\n+int rte_eth_dev_rx_queue_start(uint16_t port_id, uint16_t rx_queue_id);\n \n /**\n  * Stop specified RX queue of a port\n@@ -2041,7 +2041,7 @@ int rte_eth_dev_rx_queue_start(uint8_t port_id, uint16_t rx_queue_id);\n  *   - -EINVAL: The port_id or the queue_id out of range.\n  *   - -ENOTSUP: The function not supported in PMD driver.\n  */\n-int rte_eth_dev_rx_queue_stop(uint8_t port_id, uint16_t rx_queue_id);\n+int rte_eth_dev_rx_queue_stop(uint16_t port_id, uint16_t rx_queue_id);\n \n /**\n  * Start TX for specified queue of a port. It is used when tx_deferred_start\n@@ -2058,7 +2058,7 @@ int rte_eth_dev_rx_queue_stop(uint8_t port_id, uint16_t rx_queue_id);\n  *   - -EINVAL: The port_id or the queue_id out of range.\n  *   - -ENOTSUP: The function not supported in PMD driver.\n  */\n-int rte_eth_dev_tx_queue_start(uint8_t port_id, uint16_t tx_queue_id);\n+int rte_eth_dev_tx_queue_start(uint16_t port_id, uint16_t tx_queue_id);\n \n /**\n  * Stop specified TX queue of a port\n@@ -2074,9 +2074,7 @@ int rte_eth_dev_tx_queue_start(uint8_t port_id, uint16_t tx_queue_id);\n  *   - -EINVAL: The port_id or the queue_id out of range.\n  *   - -ENOTSUP: The function not supported in PMD driver.\n  */\n-int rte_eth_dev_tx_queue_stop(uint8_t port_id, uint16_t tx_queue_id);\n-\n-\n+int rte_eth_dev_tx_queue_stop(uint16_t port_id, uint16_t tx_queue_id);\n \n /**\n  * Start an Ethernet device.\n@@ -2093,7 +2091,7 @@ int rte_eth_dev_tx_queue_stop(uint8_t port_id, uint16_t tx_queue_id);\n  *   - 0: Success, Ethernet device started.\n  *   - <0: Error code of the driver device start function.\n  */\n-int rte_eth_dev_start(uint8_t port_id);\n+int rte_eth_dev_start(uint16_t port_id);\n \n /**\n  * Stop an Ethernet device. The device can be restarted with a call to\n@@ -2102,7 +2100,7 @@ int rte_eth_dev_start(uint8_t port_id);\n  * @param port_id\n  *   The port identifier of the Ethernet device.\n  */\n-void rte_eth_dev_stop(uint8_t port_id);\n+void rte_eth_dev_stop(uint16_t port_id);\n \n \n /**\n@@ -2117,7 +2115,7 @@ void rte_eth_dev_stop(uint8_t port_id);\n  *   - 0: Success, Ethernet device linked up.\n  *   - <0: Error code of the driver device link up function.\n  */\n-int rte_eth_dev_set_link_up(uint8_t port_id);\n+int rte_eth_dev_set_link_up(uint16_t port_id);\n \n /**\n  * Link down an Ethernet device.\n@@ -2128,7 +2126,7 @@ int rte_eth_dev_set_link_up(uint8_t port_id);\n  * @param port_id\n  *   The port identifier of the Ethernet device.\n  */\n-int rte_eth_dev_set_link_down(uint8_t port_id);\n+int rte_eth_dev_set_link_down(uint16_t port_id);\n \n /**\n  * Close a stopped Ethernet device. The device cannot be restarted!\n@@ -2138,7 +2136,7 @@ int rte_eth_dev_set_link_down(uint8_t port_id);\n  * @param port_id\n  *   The port identifier of the Ethernet device.\n  */\n-void rte_eth_dev_close(uint8_t port_id);\n+void rte_eth_dev_close(uint16_t port_id);\n \n /**\n  * Enable receipt in promiscuous mode for an Ethernet device.\n@@ -2146,7 +2144,7 @@ void rte_eth_dev_close(uint8_t port_id);\n  * @param port_id\n  *   The port identifier of the Ethernet device.\n  */\n-void rte_eth_promiscuous_enable(uint8_t port_id);\n+void rte_eth_promiscuous_enable(uint16_t port_id);\n \n /**\n  * Disable receipt in promiscuous mode for an Ethernet device.\n@@ -2154,7 +2152,7 @@ void rte_eth_promiscuous_enable(uint8_t port_id);\n  * @param port_id\n  *   The port identifier of the Ethernet device.\n  */\n-void rte_eth_promiscuous_disable(uint8_t port_id);\n+void rte_eth_promiscuous_disable(uint16_t port_id);\n \n /**\n  * Return the value of promiscuous mode for an Ethernet device.\n@@ -2166,7 +2164,7 @@ void rte_eth_promiscuous_disable(uint8_t port_id);\n  *   - (0) if promiscuous is disabled.\n  *   - (-1) on error\n  */\n-int rte_eth_promiscuous_get(uint8_t port_id);\n+int rte_eth_promiscuous_get(uint16_t port_id);\n \n /**\n  * Enable the receipt of any multicast frame by an Ethernet device.\n@@ -2174,7 +2172,7 @@ int rte_eth_promiscuous_get(uint8_t port_id);\n  * @param port_id\n  *   The port identifier of the Ethernet device.\n  */\n-void rte_eth_allmulticast_enable(uint8_t port_id);\n+void rte_eth_allmulticast_enable(uint16_t port_id);\n \n /**\n  * Disable the receipt of all multicast frames by an Ethernet device.\n@@ -2182,7 +2180,7 @@ void rte_eth_allmulticast_enable(uint8_t port_id);\n  * @param port_id\n  *   The port identifier of the Ethernet device.\n  */\n-void rte_eth_allmulticast_disable(uint8_t port_id);\n+void rte_eth_allmulticast_disable(uint16_t port_id);\n \n /**\n  * Return the value of allmulticast mode for an Ethernet device.\n@@ -2194,7 +2192,7 @@ void rte_eth_allmulticast_disable(uint8_t port_id);\n  *   - (0) if allmulticast is disabled.\n  *   - (-1) on error\n  */\n-int rte_eth_allmulticast_get(uint8_t port_id);\n+int rte_eth_allmulticast_get(uint16_t port_id);\n \n /**\n  * Retrieve the status (ON/OFF), the speed (in Mbps) and the mode (HALF-DUPLEX\n@@ -2207,7 +2205,7 @@ int rte_eth_allmulticast_get(uint8_t port_id);\n  *   A pointer to an *rte_eth_link* structure to be filled with\n  *   the status, the speed and the mode of the Ethernet device link.\n  */\n-void rte_eth_link_get(uint8_t port_id, struct rte_eth_link *link);\n+void rte_eth_link_get(uint16_t port_id, struct rte_eth_link *link);\n \n /**\n  * Retrieve the status (ON/OFF), the speed (in Mbps) and the mode (HALF-DUPLEX\n@@ -2220,7 +2218,7 @@ void rte_eth_link_get(uint8_t port_id, struct rte_eth_link *link);\n  *   A pointer to an *rte_eth_link* structure to be filled with\n  *   the status, the speed and the mode of the Ethernet device link.\n  */\n-void rte_eth_link_get_nowait(uint8_t port_id, struct rte_eth_link *link);\n+void rte_eth_link_get_nowait(uint16_t port_id, struct rte_eth_link *link);\n \n /**\n  * Retrieve the general I/O statistics of an Ethernet device.\n@@ -2239,7 +2237,7 @@ void rte_eth_link_get_nowait(uint8_t port_id, struct rte_eth_link *link);\n  * @return\n  *   Zero if successful. Non-zero otherwise.\n  */\n-int rte_eth_stats_get(uint8_t port_id, struct rte_eth_stats *stats);\n+int rte_eth_stats_get(uint16_t port_id, struct rte_eth_stats *stats);\n \n /**\n  * Reset the general I/O statistics of an Ethernet device.\n@@ -2247,7 +2245,7 @@ int rte_eth_stats_get(uint8_t port_id, struct rte_eth_stats *stats);\n  * @param port_id\n  *   The port identifier of the Ethernet device.\n  */\n-void rte_eth_stats_reset(uint8_t port_id);\n+void rte_eth_stats_reset(uint16_t port_id);\n \n /**\n  * Retrieve names of extended statistics of an Ethernet device.\n@@ -2269,7 +2267,7 @@ void rte_eth_stats_reset(uint8_t port_id);\n  *     shall not be used by the caller.\n  *   - A negative value on error (invalid port id).\n  */\n-int rte_eth_xstats_get_names(uint8_t port_id,\n+int rte_eth_xstats_get_names(uint16_t port_id,\n \t\tstruct rte_eth_xstat_name *xstats_names,\n \t\tunsigned int size);\n \n@@ -2295,7 +2293,7 @@ int rte_eth_xstats_get_names(uint8_t port_id,\n  *     shall not be used by the caller.\n  *   - A negative value on error (invalid port id).\n  */\n-int rte_eth_xstats_get(uint8_t port_id, struct rte_eth_xstat *xstats,\n+int rte_eth_xstats_get(uint16_t port_id, struct rte_eth_xstat *xstats,\n \t\tunsigned int n);\n \n /**\n@@ -2321,7 +2319,7 @@ int rte_eth_xstats_get(uint8_t port_id, struct rte_eth_xstat *xstats,\n  *   - A negative value on error (invalid port id).\n  */\n int\n-rte_eth_xstats_get_names_by_id(uint8_t port_id,\n+rte_eth_xstats_get_names_by_id(uint16_t port_id,\n \tstruct rte_eth_xstat_name *xstats_names, unsigned int size,\n \tuint64_t *ids);\n \n@@ -2348,7 +2346,7 @@ rte_eth_xstats_get_names_by_id(uint8_t port_id,\n  *     shall not be used by the caller.\n  *   - A negative value on error (invalid port id).\n  */\n-int rte_eth_xstats_get_by_id(uint8_t port_id, const uint64_t *ids,\n+int rte_eth_xstats_get_by_id(uint16_t port_id, const uint64_t *ids,\n \t\t\t     uint64_t *values, unsigned int n);\n \n /**\n@@ -2368,7 +2366,7 @@ int rte_eth_xstats_get_by_id(uint8_t port_id, const uint64_t *ids,\n  *    -ENODEV for invalid port_id,\n  *    -EINVAL if the xstat_name doesn't exist in port_id\n  */\n-int rte_eth_xstats_get_id_by_name(uint8_t port_id, const char *xstat_name,\n+int rte_eth_xstats_get_id_by_name(uint16_t port_id, const char *xstat_name,\n \t\tuint64_t *id);\n \n /**\n@@ -2377,7 +2375,7 @@ int rte_eth_xstats_get_id_by_name(uint8_t port_id, const char *xstat_name,\n  * @param port_id\n  *   The port identifier of the Ethernet device.\n  */\n-void rte_eth_xstats_reset(uint8_t port_id);\n+void rte_eth_xstats_reset(uint16_t port_id);\n \n /**\n  *  Set a mapping for the specified transmit queue to the specified per-queue\n@@ -2396,7 +2394,7 @@ void rte_eth_xstats_reset(uint8_t port_id);\n  * @return\n  *   Zero if successful. Non-zero otherwise.\n  */\n-int rte_eth_dev_set_tx_queue_stats_mapping(uint8_t port_id,\n+int rte_eth_dev_set_tx_queue_stats_mapping(uint16_t port_id,\n \t\tuint16_t tx_queue_id, uint8_t stat_idx);\n \n /**\n@@ -2416,7 +2414,7 @@ int rte_eth_dev_set_tx_queue_stats_mapping(uint8_t port_id,\n  * @return\n  *   Zero if successful. Non-zero otherwise.\n  */\n-int rte_eth_dev_set_rx_queue_stats_mapping(uint8_t port_id,\n+int rte_eth_dev_set_rx_queue_stats_mapping(uint16_t port_id,\n \t\t\t\t\t   uint16_t rx_queue_id,\n \t\t\t\t\t   uint8_t stat_idx);\n \n@@ -2429,7 +2427,7 @@ int rte_eth_dev_set_rx_queue_stats_mapping(uint8_t port_id,\n  *   A pointer to a structure of type *ether_addr* to be filled with\n  *   the Ethernet address of the Ethernet device.\n  */\n-void rte_eth_macaddr_get(uint8_t port_id, struct ether_addr *mac_addr);\n+void rte_eth_macaddr_get(uint16_t port_id, struct ether_addr *mac_addr);\n \n /**\n  * Retrieve the contextual information of an Ethernet device.\n@@ -2440,7 +2438,7 @@ void rte_eth_macaddr_get(uint8_t port_id, struct ether_addr *mac_addr);\n  *   A pointer to a structure of type *rte_eth_dev_info* to be filled with\n  *   the contextual information of the Ethernet device.\n  */\n-void rte_eth_dev_info_get(uint8_t port_id, struct rte_eth_dev_info *dev_info);\n+void rte_eth_dev_info_get(uint16_t port_id, struct rte_eth_dev_info *dev_info);\n \n /**\n  * Retrieve the firmware version of a device.\n@@ -2460,7 +2458,7 @@ void rte_eth_dev_info_get(uint8_t port_id, struct rte_eth_dev_info *dev_info);\n  *   - (>0) if *fw_size* is not enough to store firmware version, return\n  *          the size of the non truncated string.\n  */\n-int rte_eth_dev_fw_version_get(uint8_t port_id,\n+int rte_eth_dev_fw_version_get(uint16_t port_id,\n \t\t\t       char *fw_version, size_t fw_size);\n \n /**\n@@ -2501,7 +2499,7 @@ int rte_eth_dev_fw_version_get(uint8_t port_id,\n  *           count of supported ptypes will be returned.\n  *   - (-ENODEV) if *port_id* invalid.\n  */\n-int rte_eth_dev_get_supported_ptypes(uint8_t port_id, uint32_t ptype_mask,\n+int rte_eth_dev_get_supported_ptypes(uint16_t port_id, uint32_t ptype_mask,\n \t\t\t\t     uint32_t *ptypes, int num);\n \n /**\n@@ -2515,7 +2513,7 @@ int rte_eth_dev_get_supported_ptypes(uint8_t port_id, uint32_t ptype_mask,\n  *   - (0) if successful.\n  *   - (-ENODEV) if *port_id* invalid.\n  */\n-int rte_eth_dev_get_mtu(uint8_t port_id, uint16_t *mtu);\n+int rte_eth_dev_get_mtu(uint16_t port_id, uint16_t *mtu);\n \n /**\n  * Change the MTU of an Ethernet device.\n@@ -2531,7 +2529,7 @@ int rte_eth_dev_get_mtu(uint8_t port_id, uint16_t *mtu);\n  *   - (-EINVAL) if *mtu* invalid.\n  *   - (-EBUSY) if operation is not allowed when the port is running\n  */\n-int rte_eth_dev_set_mtu(uint8_t port_id, uint16_t mtu);\n+int rte_eth_dev_set_mtu(uint16_t port_id, uint16_t mtu);\n \n /**\n  * Enable/Disable hardware filtering by an Ethernet device of received\n@@ -2551,7 +2549,7 @@ int rte_eth_dev_set_mtu(uint8_t port_id, uint16_t mtu);\n  *   - (-ENOSYS) if VLAN filtering on *port_id* disabled.\n  *   - (-EINVAL) if *vlan_id* > 4095.\n  */\n-int rte_eth_dev_vlan_filter(uint8_t port_id, uint16_t vlan_id, int on);\n+int rte_eth_dev_vlan_filter(uint16_t port_id, uint16_t vlan_id, int on);\n \n /**\n  * Enable/Disable hardware VLAN Strip by a rx queue of an Ethernet device.\n@@ -2572,7 +2570,7 @@ int rte_eth_dev_vlan_filter(uint8_t port_id, uint16_t vlan_id, int on);\n  *   - (-ENODEV) if *port_id* invalid.\n  *   - (-EINVAL) if *rx_queue_id* invalid.\n  */\n-int rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id,\n+int rte_eth_dev_set_vlan_strip_on_queue(uint16_t port_id, uint16_t rx_queue_id,\n \t\tint on);\n \n /**\n@@ -2591,7 +2589,7 @@ int rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id,\n  *   - (-ENOSUP) if hardware-assisted VLAN TPID setup is not supported.\n  *   - (-ENODEV) if *port_id* invalid.\n  */\n-int rte_eth_dev_set_vlan_ether_type(uint8_t port_id,\n+int rte_eth_dev_set_vlan_ether_type(uint16_t port_id,\n \t\t\t\t    enum rte_vlan_type vlan_type,\n \t\t\t\t    uint16_t tag_type);\n \n@@ -2615,7 +2613,7 @@ int rte_eth_dev_set_vlan_ether_type(uint8_t port_id,\n  *   - (-ENOSUP) if hardware-assisted VLAN filtering not configured.\n  *   - (-ENODEV) if *port_id* invalid.\n  */\n-int rte_eth_dev_set_vlan_offload(uint8_t port_id, int offload_mask);\n+int rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask);\n \n /**\n  * Read VLAN Offload configuration from an Ethernet device\n@@ -2629,7 +2627,7 @@ int rte_eth_dev_set_vlan_offload(uint8_t port_id, int offload_mask);\n  *       ETH_VLAN_EXTEND_OFFLOAD\n  *   - (-ENODEV) if *port_id* invalid.\n  */\n-int rte_eth_dev_get_vlan_offload(uint8_t port_id);\n+int rte_eth_dev_get_vlan_offload(uint16_t port_id);\n \n /**\n  * Set port based TX VLAN insertion on or off.\n@@ -2645,7 +2643,7 @@ int rte_eth_dev_get_vlan_offload(uint8_t port_id);\n  *   - (0) if successful.\n  *   - negative if failed.\n  */\n-int rte_eth_dev_set_vlan_pvid(uint8_t port_id, uint16_t pvid, int on);\n+int rte_eth_dev_set_vlan_pvid(uint16_t port_id, uint16_t pvid, int on);\n \n /**\n  *\n@@ -2730,7 +2728,7 @@ int rte_eth_dev_set_vlan_pvid(uint8_t port_id, uint16_t pvid, int on);\n  *   *rx_pkts* array.\n  */\n static inline uint16_t\n-rte_eth_rx_burst(uint8_t port_id, uint16_t queue_id,\n+rte_eth_rx_burst(uint16_t port_id, uint16_t queue_id,\n \t\t struct rte_mbuf **rx_pkts, const uint16_t nb_pkts)\n {\n \tstruct rte_eth_dev *dev = &rte_eth_devices[port_id];\n@@ -2775,7 +2773,7 @@ rte_eth_rx_burst(uint8_t port_id, uint16_t queue_id,\n  *     (-ENOTSUP) if the device does not support this function\n  */\n static inline int\n-rte_eth_rx_queue_count(uint8_t port_id, uint16_t queue_id)\n+rte_eth_rx_queue_count(uint16_t port_id, uint16_t queue_id)\n {\n \tstruct rte_eth_dev *dev;\n \n@@ -2804,7 +2802,7 @@ rte_eth_rx_queue_count(uint8_t port_id, uint16_t queue_id)\n  *  - (-ENOTSUP) if the device does not support this function\n  */\n static inline int\n-rte_eth_rx_descriptor_done(uint8_t port_id, uint16_t queue_id, uint16_t offset)\n+rte_eth_rx_descriptor_done(uint16_t port_id, uint16_t queue_id, uint16_t offset)\n {\n \tstruct rte_eth_dev *dev = &rte_eth_devices[port_id];\n \tRTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);\n@@ -2851,7 +2849,7 @@ rte_eth_rx_descriptor_done(uint8_t port_id, uint16_t queue_id, uint16_t offset)\n  *  - (-ENODEV) bad port or queue (only if compiled with debug).\n  */\n static inline int\n-rte_eth_rx_descriptor_status(uint8_t port_id, uint16_t queue_id,\n+rte_eth_rx_descriptor_status(uint16_t port_id, uint16_t queue_id,\n \tuint16_t offset)\n {\n \tstruct rte_eth_dev *dev;\n@@ -2908,7 +2906,7 @@ rte_eth_rx_descriptor_status(uint8_t port_id, uint16_t queue_id,\n  *  - (-ENOTSUP) if the device does not support this function.\n  *  - (-ENODEV) bad port or queue (only if compiled with debug).\n  */\n-static inline int rte_eth_tx_descriptor_status(uint8_t port_id,\n+static inline int rte_eth_tx_descriptor_status(uint16_t port_id,\n \tuint16_t queue_id, uint16_t offset)\n {\n \tstruct rte_eth_dev *dev;\n@@ -2992,7 +2990,7 @@ static inline int rte_eth_tx_descriptor_status(uint8_t port_id,\n  *   *tx_pkts* parameter when the transmit ring is full or has been filled up.\n  */\n static inline uint16_t\n-rte_eth_tx_burst(uint8_t port_id, uint16_t queue_id,\n+rte_eth_tx_burst(uint16_t port_id, uint16_t queue_id,\n \t\t struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n {\n \tstruct rte_eth_dev *dev = &rte_eth_devices[port_id];\n@@ -3081,7 +3079,7 @@ rte_eth_tx_burst(uint8_t port_id, uint16_t queue_id,\n #ifndef RTE_ETHDEV_TX_PREPARE_NOOP\n \n static inline uint16_t\n-rte_eth_tx_prepare(uint8_t port_id, uint16_t queue_id,\n+rte_eth_tx_prepare(uint16_t port_id, uint16_t queue_id,\n \t\tstruct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n {\n \tstruct rte_eth_dev *dev;\n@@ -3123,7 +3121,8 @@ rte_eth_tx_prepare(uint8_t port_id, uint16_t queue_id,\n  */\n \n static inline uint16_t\n-rte_eth_tx_prepare(__rte_unused uint8_t port_id, __rte_unused uint16_t queue_id,\n+rte_eth_tx_prepare(__rte_unused uint16_t port_id,\n+\t\t   __rte_unused uint16_t queue_id,\n \t\t__rte_unused struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n {\n \treturn nb_pkts;\n@@ -3192,7 +3191,7 @@ rte_eth_tx_buffer_init(struct rte_eth_dev_tx_buffer *buffer, uint16_t size);\n  *   callback is called for any packets which could not be sent.\n  */\n static inline uint16_t\n-rte_eth_tx_buffer_flush(uint8_t port_id, uint16_t queue_id,\n+rte_eth_tx_buffer_flush(uint16_t port_id, uint16_t queue_id,\n \t\tstruct rte_eth_dev_tx_buffer *buffer)\n {\n \tuint16_t sent;\n@@ -3244,7 +3243,7 @@ rte_eth_tx_buffer_flush(uint8_t port_id, uint16_t queue_id,\n  *     the rest.\n  */\n static __rte_always_inline uint16_t\n-rte_eth_tx_buffer(uint8_t port_id, uint16_t queue_id,\n+rte_eth_tx_buffer(uint16_t port_id, uint16_t queue_id,\n \t\tstruct rte_eth_dev_tx_buffer *buffer, struct rte_mbuf *tx_pkt)\n {\n \tbuffer->pkts[buffer->length++] = tx_pkt;\n@@ -3360,7 +3359,7 @@ rte_eth_tx_buffer_count_callback(struct rte_mbuf **pkts, uint16_t unsent,\n  *     are in use.\n  */\n int\n-rte_eth_tx_done_cleanup(uint8_t port_id, uint16_t queue_id, uint32_t free_cnt);\n+rte_eth_tx_done_cleanup(uint16_t port_id, uint16_t queue_id, uint32_t free_cnt);\n \n /**\n  * The eth device event type for interrupt, and maybe others in the future.\n@@ -3378,7 +3377,7 @@ enum rte_eth_event_type {\n \tRTE_ETH_EVENT_MAX       /**< max value of this enum */\n };\n \n-typedef int (*rte_eth_dev_cb_fn)(uint8_t port_id,\n+typedef int (*rte_eth_dev_cb_fn)(uint16_t port_id,\n \t\tenum rte_eth_event_type event, void *cb_arg, void *ret_param);\n /**< user application callback to be registered for interrupts */\n \n@@ -3400,7 +3399,7 @@ typedef int (*rte_eth_dev_cb_fn)(uint8_t port_id,\n  *  - On success, zero.\n  *  - On failure, a negative value.\n  */\n-int rte_eth_dev_callback_register(uint8_t port_id,\n+int rte_eth_dev_callback_register(uint16_t port_id,\n \t\t\tenum rte_eth_event_type event,\n \t\trte_eth_dev_cb_fn cb_fn, void *cb_arg);\n \n@@ -3421,7 +3420,7 @@ int rte_eth_dev_callback_register(uint8_t port_id,\n  *  - On success, zero.\n  *  - On failure, a negative value.\n  */\n-int rte_eth_dev_callback_unregister(uint8_t port_id,\n+int rte_eth_dev_callback_unregister(uint16_t port_id,\n \t\t\tenum rte_eth_event_type event,\n \t\trte_eth_dev_cb_fn cb_fn, void *cb_arg);\n \n@@ -3467,7 +3466,7 @@ int _rte_eth_dev_callback_process(struct rte_eth_dev *dev,\n  *     that operation.\n  *   - (-ENODEV) if *port_id* invalid.\n  */\n-int rte_eth_dev_rx_intr_enable(uint8_t port_id, uint16_t queue_id);\n+int rte_eth_dev_rx_intr_enable(uint16_t port_id, uint16_t queue_id);\n \n /**\n  * When lcore wakes up from rx interrupt indicating packet coming, disable rx\n@@ -3488,7 +3487,7 @@ int rte_eth_dev_rx_intr_enable(uint8_t port_id, uint16_t queue_id);\n  *     that operation.\n  *   - (-ENODEV) if *port_id* invalid.\n  */\n-int rte_eth_dev_rx_intr_disable(uint8_t port_id, uint16_t queue_id);\n+int rte_eth_dev_rx_intr_disable(uint16_t port_id, uint16_t queue_id);\n \n /**\n  * RX Interrupt control per port.\n@@ -3507,7 +3506,7 @@ int rte_eth_dev_rx_intr_disable(uint8_t port_id, uint16_t queue_id);\n  *   - On success, zero.\n  *   - On failure, a negative value.\n  */\n-int rte_eth_dev_rx_intr_ctl(uint8_t port_id, int epfd, int op, void *data);\n+int rte_eth_dev_rx_intr_ctl(uint16_t port_id, int epfd, int op, void *data);\n \n /**\n  * RX Interrupt control per queue.\n@@ -3530,7 +3529,7 @@ int rte_eth_dev_rx_intr_ctl(uint8_t port_id, int epfd, int op, void *data);\n  *   - On success, zero.\n  *   - On failure, a negative value.\n  */\n-int rte_eth_dev_rx_intr_ctl_q(uint8_t port_id, uint16_t queue_id,\n+int rte_eth_dev_rx_intr_ctl_q(uint16_t port_id, uint16_t queue_id,\n \t\t\t      int epfd, int op, void *data);\n \n /**\n@@ -3545,7 +3544,7 @@ int rte_eth_dev_rx_intr_ctl_q(uint8_t port_id, uint16_t queue_id,\n  *     that operation.\n  *   - (-ENODEV) if *port_id* invalid.\n  */\n-int  rte_eth_led_on(uint8_t port_id);\n+int  rte_eth_led_on(uint16_t port_id);\n \n /**\n  * Turn off the LED on the Ethernet device.\n@@ -3559,7 +3558,7 @@ int  rte_eth_led_on(uint8_t port_id);\n  *     that operation.\n  *   - (-ENODEV) if *port_id* invalid.\n  */\n-int  rte_eth_led_off(uint8_t port_id);\n+int  rte_eth_led_off(uint16_t port_id);\n \n /**\n  * Get current status of the Ethernet link flow control for Ethernet device\n@@ -3573,7 +3572,7 @@ int  rte_eth_led_off(uint8_t port_id);\n  *   - (-ENOTSUP) if hardware doesn't support flow control.\n  *   - (-ENODEV)  if *port_id* invalid.\n  */\n-int rte_eth_dev_flow_ctrl_get(uint8_t port_id,\n+int rte_eth_dev_flow_ctrl_get(uint16_t port_id,\n \t\t\t      struct rte_eth_fc_conf *fc_conf);\n \n /**\n@@ -3590,7 +3589,7 @@ int rte_eth_dev_flow_ctrl_get(uint8_t port_id,\n  *   - (-EINVAL)  if bad parameter\n  *   - (-EIO)     if flow control setup failure\n  */\n-int rte_eth_dev_flow_ctrl_set(uint8_t port_id,\n+int rte_eth_dev_flow_ctrl_set(uint16_t port_id,\n \t\t\t      struct rte_eth_fc_conf *fc_conf);\n \n /**\n@@ -3608,7 +3607,7 @@ int rte_eth_dev_flow_ctrl_set(uint8_t port_id,\n  *   - (-EINVAL)  if bad parameter\n  *   - (-EIO)     if flow control setup failure\n  */\n-int rte_eth_dev_priority_flow_ctrl_set(uint8_t port_id,\n+int rte_eth_dev_priority_flow_ctrl_set(uint16_t port_id,\n \t\t\t\tstruct rte_eth_pfc_conf *pfc_conf);\n \n /**\n@@ -3629,7 +3628,7 @@ int rte_eth_dev_priority_flow_ctrl_set(uint8_t port_id,\n  *   - (-ENOSPC) if no more MAC addresses can be added.\n  *   - (-EINVAL) if MAC address is invalid.\n  */\n-int rte_eth_dev_mac_addr_add(uint8_t port, struct ether_addr *mac_addr,\n+int rte_eth_dev_mac_addr_add(uint16_t port, struct ether_addr *mac_addr,\n \t\t\t\tuint32_t pool);\n \n /**\n@@ -3645,7 +3644,7 @@ int rte_eth_dev_mac_addr_add(uint8_t port, struct ether_addr *mac_addr,\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EADDRINUSE) if attempting to remove the default MAC address\n  */\n-int rte_eth_dev_mac_addr_remove(uint8_t port, struct ether_addr *mac_addr);\n+int rte_eth_dev_mac_addr_remove(uint16_t port, struct ether_addr *mac_addr);\n \n /**\n  * Set the default MAC address.\n@@ -3660,8 +3659,8 @@ int rte_eth_dev_mac_addr_remove(uint8_t port, struct ether_addr *mac_addr);\n  *   - (-ENODEV) if *port* invalid.\n  *   - (-EINVAL) if MAC address is invalid.\n  */\n-int rte_eth_dev_default_mac_addr_set(uint8_t port, struct ether_addr *mac_addr);\n-\n+int rte_eth_dev_default_mac_addr_set(uint16_t port,\n+\t\t\t\t      struct ether_addr *mac_addr);\n \n /**\n  * Update Redirection Table(RETA) of Receive Side Scaling of Ethernet device.\n@@ -3678,7 +3677,7 @@ int rte_eth_dev_default_mac_addr_set(uint8_t port, struct ether_addr *mac_addr);\n  *   - (-ENOTSUP) if hardware doesn't support.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_eth_dev_rss_reta_update(uint8_t port,\n+int rte_eth_dev_rss_reta_update(uint16_t port,\n \t\t\t\tstruct rte_eth_rss_reta_entry64 *reta_conf,\n \t\t\t\tuint16_t reta_size);\n \n@@ -3697,7 +3696,7 @@ int rte_eth_dev_rss_reta_update(uint8_t port,\n  *   - (-ENOTSUP) if hardware doesn't support.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_eth_dev_rss_reta_query(uint8_t port,\n+int rte_eth_dev_rss_reta_query(uint16_t port,\n \t\t\t       struct rte_eth_rss_reta_entry64 *reta_conf,\n \t\t\t       uint16_t reta_size);\n \n@@ -3719,8 +3718,8 @@ int rte_eth_dev_rss_reta_query(uint8_t port,\n   *  - (-ENODEV) if *port_id* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_eth_dev_uc_hash_table_set(uint8_t port,struct ether_addr *addr,\n-\t\t\t\t\tuint8_t on);\n+int rte_eth_dev_uc_hash_table_set(uint16_t port, struct ether_addr *addr,\n+\t\t\t\t   uint8_t on);\n \n  /**\n  * Updates all unicast hash bitmaps for receiving packet with any Unicast\n@@ -3739,7 +3738,7 @@ int rte_eth_dev_uc_hash_table_set(uint8_t port,struct ether_addr *addr,\n   *  - (-ENODEV) if *port_id* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_eth_dev_uc_all_hash_table_set(uint8_t port,uint8_t on);\n+int rte_eth_dev_uc_all_hash_table_set(uint16_t port, uint8_t on);\n \n /**\n  * Set a traffic mirroring rule on an Ethernet device\n@@ -3762,7 +3761,7 @@ int rte_eth_dev_uc_all_hash_table_set(uint8_t port,uint8_t on);\n  *   - (-ENODEV) if *port_id* invalid.\n  *   - (-EINVAL) if the mr_conf information is not correct.\n  */\n-int rte_eth_mirror_rule_set(uint8_t port_id,\n+int rte_eth_mirror_rule_set(uint16_t port_id,\n \t\t\tstruct rte_eth_mirror_conf *mirror_conf,\n \t\t\tuint8_t rule_id,\n \t\t\tuint8_t on);\n@@ -3780,7 +3779,7 @@ int rte_eth_mirror_rule_set(uint8_t port_id,\n  *   - (-ENODEV) if *port_id* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_eth_mirror_rule_reset(uint8_t port_id,\n+int rte_eth_mirror_rule_reset(uint16_t port_id,\n \t\t\t\t\t uint8_t rule_id);\n \n /**\n@@ -3798,7 +3797,7 @@ int rte_eth_mirror_rule_reset(uint8_t port_id,\n  *   - (-ENODEV) if *port_id* invalid.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_eth_set_queue_rate_limit(uint8_t port_id, uint16_t queue_idx,\n+int rte_eth_set_queue_rate_limit(uint16_t port_id, uint16_t queue_idx,\n \t\t\tuint16_t tx_rate);\n \n  /**\n@@ -3814,7 +3813,7 @@ int rte_eth_set_queue_rate_limit(uint8_t port_id, uint16_t queue_idx,\n  *   - (-ENOTSUP) if hardware doesn't support.\n  *   - (-EINVAL) if bad parameter.\n  */\n-int rte_eth_dev_rss_hash_update(uint8_t port_id,\n+int rte_eth_dev_rss_hash_update(uint16_t port_id,\n \t\t\t\tstruct rte_eth_rss_conf *rss_conf);\n \n  /**\n@@ -3831,7 +3830,7 @@ int rte_eth_dev_rss_hash_update(uint8_t port_id,\n  *   - (-ENOTSUP) if hardware doesn't support RSS.\n  */\n int\n-rte_eth_dev_rss_hash_conf_get(uint8_t port_id,\n+rte_eth_dev_rss_hash_conf_get(uint16_t port_id,\n \t\t\t      struct rte_eth_rss_conf *rss_conf);\n \n  /**\n@@ -3852,7 +3851,7 @@ rte_eth_dev_rss_hash_conf_get(uint8_t port_id,\n  *   - (-ENOTSUP) if hardware doesn't support tunnel type.\n  */\n int\n-rte_eth_dev_udp_tunnel_port_add(uint8_t port_id,\n+rte_eth_dev_udp_tunnel_port_add(uint16_t port_id,\n \t\t\t\tstruct rte_eth_udp_tunnel *tunnel_udp);\n \n  /**\n@@ -3874,7 +3873,7 @@ rte_eth_dev_udp_tunnel_port_add(uint8_t port_id,\n  *   - (-ENOTSUP) if hardware doesn't support tunnel type.\n  */\n int\n-rte_eth_dev_udp_tunnel_port_delete(uint8_t port_id,\n+rte_eth_dev_udp_tunnel_port_delete(uint16_t port_id,\n \t\t\t\t   struct rte_eth_udp_tunnel *tunnel_udp);\n \n /**\n@@ -3890,7 +3889,8 @@ rte_eth_dev_udp_tunnel_port_delete(uint8_t port_id,\n  *   - (-ENOTSUP) if hardware doesn't support this filter type.\n  *   - (-ENODEV) if *port_id* invalid.\n  */\n-int rte_eth_dev_filter_supported(uint8_t port_id, enum rte_filter_type filter_type);\n+int rte_eth_dev_filter_supported(uint16_t port_id,\n+\t\t\t\t enum rte_filter_type filter_type);\n \n /**\n  * Take operations to assigned filter type on an Ethernet device.\n@@ -3910,7 +3910,7 @@ int rte_eth_dev_filter_supported(uint8_t port_id, enum rte_filter_type filter_ty\n  *   - (-ENODEV) if *port_id* invalid.\n  *   - others depends on the specific operations implementation.\n  */\n-int rte_eth_dev_filter_ctrl(uint8_t port_id, enum rte_filter_type filter_type,\n+int rte_eth_dev_filter_ctrl(uint16_t port_id, enum rte_filter_type filter_type,\n \t\t\tenum rte_filter_op filter_op, void *arg);\n \n /**\n@@ -3925,7 +3925,7 @@ int rte_eth_dev_filter_ctrl(uint8_t port_id, enum rte_filter_type filter_type,\n  *   - (-ENODEV) if port identifier is invalid.\n  *   - (-ENOTSUP) if hardware doesn't support.\n  */\n-int rte_eth_dev_get_dcb_info(uint8_t port_id,\n+int rte_eth_dev_get_dcb_info(uint16_t port_id,\n \t\t\t     struct rte_eth_dcb_info *dcb_info);\n \n /**\n@@ -3952,7 +3952,7 @@ int rte_eth_dev_get_dcb_info(uint8_t port_id,\n  *   NULL on error.\n  *   On success, a pointer value which can later be used to remove the callback.\n  */\n-void *rte_eth_add_rx_callback(uint8_t port_id, uint16_t queue_id,\n+void *rte_eth_add_rx_callback(uint16_t port_id, uint16_t queue_id,\n \t\trte_rx_callback_fn fn, void *user_param);\n \n /**\n@@ -3980,7 +3980,7 @@ void *rte_eth_add_rx_callback(uint8_t port_id, uint16_t queue_id,\n  *   NULL on error.\n  *   On success, a pointer value which can later be used to remove the callback.\n  */\n-void *rte_eth_add_first_rx_callback(uint8_t port_id, uint16_t queue_id,\n+void *rte_eth_add_first_rx_callback(uint16_t port_id, uint16_t queue_id,\n \t\trte_rx_callback_fn fn, void *user_param);\n \n /**\n@@ -4007,7 +4007,7 @@ void *rte_eth_add_first_rx_callback(uint8_t port_id, uint16_t queue_id,\n  *   NULL on error.\n  *   On success, a pointer value which can later be used to remove the callback.\n  */\n-void *rte_eth_add_tx_callback(uint8_t port_id, uint16_t queue_id,\n+void *rte_eth_add_tx_callback(uint16_t port_id, uint16_t queue_id,\n \t\trte_tx_callback_fn fn, void *user_param);\n \n /**\n@@ -4040,7 +4040,7 @@ void *rte_eth_add_tx_callback(uint8_t port_id, uint16_t queue_id,\n  *   - -EINVAL:  The port_id or the queue_id is out of range, or the callback\n  *               is NULL or not found for the port/queue.\n  */\n-int rte_eth_remove_rx_callback(uint8_t port_id, uint16_t queue_id,\n+int rte_eth_remove_rx_callback(uint16_t port_id, uint16_t queue_id,\n \t\tstruct rte_eth_rxtx_callback *user_cb);\n \n /**\n@@ -4073,7 +4073,7 @@ int rte_eth_remove_rx_callback(uint8_t port_id, uint16_t queue_id,\n  *   - -EINVAL:  The port_id or the queue_id is out of range, or the callback\n  *               is NULL or not found for the port/queue.\n  */\n-int rte_eth_remove_tx_callback(uint8_t port_id, uint16_t queue_id,\n+int rte_eth_remove_tx_callback(uint16_t port_id, uint16_t queue_id,\n \t\tstruct rte_eth_rxtx_callback *user_cb);\n \n /**\n@@ -4093,7 +4093,7 @@ int rte_eth_remove_tx_callback(uint8_t port_id, uint16_t queue_id,\n  *   - -ENOTSUP: routine is not supported by the device PMD.\n  *   - -EINVAL:  The port_id or the queue_id is out of range.\n  */\n-int rte_eth_rx_queue_info_get(uint8_t port_id, uint16_t queue_id,\n+int rte_eth_rx_queue_info_get(uint16_t port_id, uint16_t queue_id,\n \tstruct rte_eth_rxq_info *qinfo);\n \n /**\n@@ -4113,7 +4113,7 @@ int rte_eth_rx_queue_info_get(uint8_t port_id, uint16_t queue_id,\n  *   - -ENOTSUP: routine is not supported by the device PMD.\n  *   - -EINVAL:  The port_id or the queue_id is out of range.\n  */\n-int rte_eth_tx_queue_info_get(uint8_t port_id, uint16_t queue_id,\n+int rte_eth_tx_queue_info_get(uint16_t port_id, uint16_t queue_id,\n \tstruct rte_eth_txq_info *qinfo);\n \n /**\n@@ -4132,7 +4132,7 @@ int rte_eth_tx_queue_info_get(uint8_t port_id, uint16_t queue_id,\n  *   - (-ENODEV) if *port_id* invalid.\n  *   - others depends on the specific operations implementation.\n  */\n-int rte_eth_dev_get_reg_info(uint8_t port_id, struct rte_dev_reg_info *info);\n+int rte_eth_dev_get_reg_info(uint16_t port_id, struct rte_dev_reg_info *info);\n \n /**\n  * Retrieve size of device EEPROM\n@@ -4145,7 +4145,7 @@ int rte_eth_dev_get_reg_info(uint8_t port_id, struct rte_dev_reg_info *info);\n  *   - (-ENODEV) if *port_id* invalid.\n  *   - others depends on the specific operations implementation.\n  */\n-int rte_eth_dev_get_eeprom_length(uint8_t port_id);\n+int rte_eth_dev_get_eeprom_length(uint16_t port_id);\n \n /**\n  * Retrieve EEPROM and EEPROM attribute\n@@ -4161,7 +4161,7 @@ int rte_eth_dev_get_eeprom_length(uint8_t port_id);\n  *   - (-ENODEV) if *port_id* invalid.\n  *   - others depends on the specific operations implementation.\n  */\n-int rte_eth_dev_get_eeprom(uint8_t port_id, struct rte_dev_eeprom_info *info);\n+int rte_eth_dev_get_eeprom(uint16_t port_id, struct rte_dev_eeprom_info *info);\n \n /**\n  * Program EEPROM with provided data\n@@ -4177,7 +4177,7 @@ int rte_eth_dev_get_eeprom(uint8_t port_id, struct rte_dev_eeprom_info *info);\n  *   - (-ENODEV) if *port_id* invalid.\n  *   - others depends on the specific operations implementation.\n  */\n-int rte_eth_dev_set_eeprom(uint8_t port_id, struct rte_dev_eeprom_info *info);\n+int rte_eth_dev_set_eeprom(uint16_t port_id, struct rte_dev_eeprom_info *info);\n \n /**\n  * Set the list of multicast addresses to filter on an Ethernet device.\n@@ -4196,7 +4196,7 @@ int rte_eth_dev_set_eeprom(uint8_t port_id, struct rte_dev_eeprom_info *info);\n  *   - (-ENOTSUP) if PMD of *port_id* doesn't support multicast filtering.\n  *   - (-ENOSPC) if *port_id* has not enough multicast filtering resources.\n  */\n-int rte_eth_dev_set_mc_addr_list(uint8_t port_id,\n+int rte_eth_dev_set_mc_addr_list(uint16_t port_id,\n \t\t\t\t struct ether_addr *mc_addr_set,\n \t\t\t\t uint32_t nb_mc_addr);\n \n@@ -4211,7 +4211,7 @@ int rte_eth_dev_set_mc_addr_list(uint8_t port_id,\n  *   - -ENODEV: The port ID is invalid.\n  *   - -ENOTSUP: The function is not supported by the Ethernet driver.\n  */\n-int rte_eth_timesync_enable(uint8_t port_id);\n+int rte_eth_timesync_enable(uint16_t port_id);\n \n /**\n  * Disable IEEE1588/802.1AS timestamping for an Ethernet device.\n@@ -4224,7 +4224,7 @@ int rte_eth_timesync_enable(uint8_t port_id);\n  *   - -ENODEV: The port ID is invalid.\n  *   - -ENOTSUP: The function is not supported by the Ethernet driver.\n  */\n-int rte_eth_timesync_disable(uint8_t port_id);\n+int rte_eth_timesync_disable(uint16_t port_id);\n \n /**\n  * Read an IEEE1588/802.1AS RX timestamp from an Ethernet device.\n@@ -4243,7 +4243,7 @@ int rte_eth_timesync_disable(uint8_t port_id);\n  *   - -ENODEV: The port ID is invalid.\n  *   - -ENOTSUP: The function is not supported by the Ethernet driver.\n  */\n-int rte_eth_timesync_read_rx_timestamp(uint8_t port_id,\n+int rte_eth_timesync_read_rx_timestamp(uint16_t port_id,\n \t\tstruct timespec *timestamp, uint32_t flags);\n \n /**\n@@ -4260,7 +4260,7 @@ int rte_eth_timesync_read_rx_timestamp(uint8_t port_id,\n  *   - -ENODEV: The port ID is invalid.\n  *   - -ENOTSUP: The function is not supported by the Ethernet driver.\n  */\n-int rte_eth_timesync_read_tx_timestamp(uint8_t port_id,\n+int rte_eth_timesync_read_tx_timestamp(uint16_t port_id,\n \t\tstruct timespec *timestamp);\n \n /**\n@@ -4279,7 +4279,7 @@ int rte_eth_timesync_read_tx_timestamp(uint8_t port_id,\n  *   - -ENODEV: The port ID is invalid.\n  *   - -ENOTSUP: The function is not supported by the Ethernet driver.\n  */\n-int rte_eth_timesync_adjust_time(uint8_t port_id, int64_t delta);\n+int rte_eth_timesync_adjust_time(uint16_t port_id, int64_t delta);\n \n /**\n  * Read the time from the timesync clock on an Ethernet device.\n@@ -4295,7 +4295,7 @@ int rte_eth_timesync_adjust_time(uint8_t port_id, int64_t delta);\n  * @return\n  *   - 0: Success.\n  */\n-int rte_eth_timesync_read_time(uint8_t port_id, struct timespec *time);\n+int rte_eth_timesync_read_time(uint16_t port_id, struct timespec *time);\n \n /**\n  * Set the time of the timesync clock on an Ethernet device.\n@@ -4314,7 +4314,7 @@ int rte_eth_timesync_read_time(uint8_t port_id, struct timespec *time);\n  *   - -ENODEV: The port ID is invalid.\n  *   - -ENOTSUP: The function is not supported by the Ethernet driver.\n  */\n-int rte_eth_timesync_write_time(uint8_t port_id, const struct timespec *time);\n+int rte_eth_timesync_write_time(uint16_t port_id, const struct timespec *time);\n \n /**\n  * Create memzone for HW rings.\n@@ -4355,7 +4355,7 @@ rte_eth_dma_zone_reserve(const struct rte_eth_dev *eth_dev, const char *name,\n  *   - (-ENOTSUP) if hardware doesn't support tunnel type.\n  */\n int\n-rte_eth_dev_l2_tunnel_eth_type_conf(uint8_t port_id,\n+rte_eth_dev_l2_tunnel_eth_type_conf(uint16_t port_id,\n \t\t\t\t    struct rte_eth_l2_tunnel_conf *l2_tunnel);\n \n /**\n@@ -4382,7 +4382,7 @@ rte_eth_dev_l2_tunnel_eth_type_conf(uint8_t port_id,\n  *   - (-ENOTSUP) if hardware doesn't support tunnel type.\n  */\n int\n-rte_eth_dev_l2_tunnel_offload_set(uint8_t port_id,\n+rte_eth_dev_l2_tunnel_offload_set(uint16_t port_id,\n \t\t\t\t  struct rte_eth_l2_tunnel_conf *l2_tunnel,\n \t\t\t\t  uint32_t mask,\n \t\t\t\t  uint8_t en);\n@@ -4400,7 +4400,7 @@ rte_eth_dev_l2_tunnel_offload_set(uint8_t port_id,\n *   - (-ENODEV or -EINVAL) on failure.\n */\n int\n-rte_eth_dev_get_port_by_name(const char *name, uint8_t *port_id);\n+rte_eth_dev_get_port_by_name(const char *name, uint16_t *port_id);\n \n /**\n * Get the device name from port id\n@@ -4414,7 +4414,7 @@ rte_eth_dev_get_port_by_name(const char *name, uint8_t *port_id);\n *   - (-EINVAL) on failure.\n */\n int\n-rte_eth_dev_get_name_by_port(uint8_t port_id, char *name);\n+rte_eth_dev_get_name_by_port(uint16_t port_id, char *name);\n \n /**\n  * Check that numbers of Rx and Tx descriptors satisfy descriptors limits from\n@@ -4432,7 +4432,7 @@ rte_eth_dev_get_name_by_port(uint8_t port_id, char *name);\n  *   - (0) if successful.\n  *   - (-ENOTSUP, -ENODEV or -EINVAL) on failure.\n  */\n-int rte_eth_dev_adjust_nb_rx_tx_desc(uint8_t port_id,\n+int rte_eth_dev_adjust_nb_rx_tx_desc(uint16_t port_id,\n \t\t\t\t     uint16_t *nb_rx_desc,\n \t\t\t\t     uint16_t *nb_tx_desc);\n \ndiff --git a/lib/librte_ether/rte_tm.c b/lib/librte_ether/rte_tm.c\nindex 71679650e..ceac34115 100644\n--- a/lib/librte_ether/rte_tm.c\n+++ b/lib/librte_ether/rte_tm.c\n@@ -40,7 +40,7 @@\n \n /* Get generic traffic manager operations structure from a port. */\n const struct rte_tm_ops *\n-rte_tm_ops_get(uint8_t port_id, struct rte_tm_error *error)\n+rte_tm_ops_get(uint16_t port_id, struct rte_tm_error *error)\n {\n \tstruct rte_eth_dev *dev = &rte_eth_devices[port_id];\n \tconst struct rte_tm_ops *ops;\n@@ -87,7 +87,7 @@ rte_tm_ops_get(uint8_t port_id, struct rte_tm_error *error)\n \n /* Get number of leaf nodes */\n int\n-rte_tm_get_number_of_leaf_nodes(uint8_t port_id,\n+rte_tm_get_number_of_leaf_nodes(uint16_t port_id,\n \tuint32_t *n_leaf_nodes,\n \tstruct rte_tm_error *error)\n {\n@@ -113,7 +113,7 @@ rte_tm_get_number_of_leaf_nodes(uint8_t port_id,\n \n /* Check node type (leaf or non-leaf) */\n int\n-rte_tm_node_type_get(uint8_t port_id,\n+rte_tm_node_type_get(uint16_t port_id,\n \tuint32_t node_id,\n \tint *is_leaf,\n \tstruct rte_tm_error *error)\n@@ -124,7 +124,7 @@ rte_tm_node_type_get(uint8_t port_id,\n }\n \n /* Get capabilities */\n-int rte_tm_capabilities_get(uint8_t port_id,\n+int rte_tm_capabilities_get(uint16_t port_id,\n \tstruct rte_tm_capabilities *cap,\n \tstruct rte_tm_error *error)\n {\n@@ -134,7 +134,7 @@ int rte_tm_capabilities_get(uint8_t port_id,\n }\n \n /* Get level capabilities */\n-int rte_tm_level_capabilities_get(uint8_t port_id,\n+int rte_tm_level_capabilities_get(uint16_t port_id,\n \tuint32_t level_id,\n \tstruct rte_tm_level_capabilities *cap,\n \tstruct rte_tm_error *error)\n@@ -145,7 +145,7 @@ int rte_tm_level_capabilities_get(uint8_t port_id,\n }\n \n /* Get node capabilities */\n-int rte_tm_node_capabilities_get(uint8_t port_id,\n+int rte_tm_node_capabilities_get(uint16_t port_id,\n \tuint32_t node_id,\n \tstruct rte_tm_node_capabilities *cap,\n \tstruct rte_tm_error *error)\n@@ -156,7 +156,7 @@ int rte_tm_node_capabilities_get(uint8_t port_id,\n }\n \n /* Add WRED profile */\n-int rte_tm_wred_profile_add(uint8_t port_id,\n+int rte_tm_wred_profile_add(uint16_t port_id,\n \tuint32_t wred_profile_id,\n \tstruct rte_tm_wred_params *profile,\n \tstruct rte_tm_error *error)\n@@ -167,7 +167,7 @@ int rte_tm_wred_profile_add(uint8_t port_id,\n }\n \n /* Delete WRED profile */\n-int rte_tm_wred_profile_delete(uint8_t port_id,\n+int rte_tm_wred_profile_delete(uint16_t port_id,\n \tuint32_t wred_profile_id,\n \tstruct rte_tm_error *error)\n {\n@@ -177,7 +177,7 @@ int rte_tm_wred_profile_delete(uint8_t port_id,\n }\n \n /* Add/update shared WRED context */\n-int rte_tm_shared_wred_context_add_update(uint8_t port_id,\n+int rte_tm_shared_wred_context_add_update(uint16_t port_id,\n \tuint32_t shared_wred_context_id,\n \tuint32_t wred_profile_id,\n \tstruct rte_tm_error *error)\n@@ -188,7 +188,7 @@ int rte_tm_shared_wred_context_add_update(uint8_t port_id,\n }\n \n /* Delete shared WRED context */\n-int rte_tm_shared_wred_context_delete(uint8_t port_id,\n+int rte_tm_shared_wred_context_delete(uint16_t port_id,\n \tuint32_t shared_wred_context_id,\n \tstruct rte_tm_error *error)\n {\n@@ -198,7 +198,7 @@ int rte_tm_shared_wred_context_delete(uint8_t port_id,\n }\n \n /* Add shaper profile */\n-int rte_tm_shaper_profile_add(uint8_t port_id,\n+int rte_tm_shaper_profile_add(uint16_t port_id,\n \tuint32_t shaper_profile_id,\n \tstruct rte_tm_shaper_params *profile,\n \tstruct rte_tm_error *error)\n@@ -209,7 +209,7 @@ int rte_tm_shaper_profile_add(uint8_t port_id,\n }\n \n /* Delete WRED profile */\n-int rte_tm_shaper_profile_delete(uint8_t port_id,\n+int rte_tm_shaper_profile_delete(uint16_t port_id,\n \tuint32_t shaper_profile_id,\n \tstruct rte_tm_error *error)\n {\n@@ -219,7 +219,7 @@ int rte_tm_shaper_profile_delete(uint8_t port_id,\n }\n \n /* Add shared shaper */\n-int rte_tm_shared_shaper_add_update(uint8_t port_id,\n+int rte_tm_shared_shaper_add_update(uint16_t port_id,\n \tuint32_t shared_shaper_id,\n \tuint32_t shaper_profile_id,\n \tstruct rte_tm_error *error)\n@@ -230,7 +230,7 @@ int rte_tm_shared_shaper_add_update(uint8_t port_id,\n }\n \n /* Delete shared shaper */\n-int rte_tm_shared_shaper_delete(uint8_t port_id,\n+int rte_tm_shared_shaper_delete(uint16_t port_id,\n \tuint32_t shared_shaper_id,\n \tstruct rte_tm_error *error)\n {\n@@ -240,7 +240,7 @@ int rte_tm_shared_shaper_delete(uint8_t port_id,\n }\n \n /* Add node to port traffic manager hierarchy */\n-int rte_tm_node_add(uint8_t port_id,\n+int rte_tm_node_add(uint16_t port_id,\n \tuint32_t node_id,\n \tuint32_t parent_node_id,\n \tuint32_t priority,\n@@ -256,7 +256,7 @@ int rte_tm_node_add(uint8_t port_id,\n }\n \n /* Delete node from traffic manager hierarchy */\n-int rte_tm_node_delete(uint8_t port_id,\n+int rte_tm_node_delete(uint16_t port_id,\n \tuint32_t node_id,\n \tstruct rte_tm_error *error)\n {\n@@ -266,7 +266,7 @@ int rte_tm_node_delete(uint8_t port_id,\n }\n \n /* Suspend node */\n-int rte_tm_node_suspend(uint8_t port_id,\n+int rte_tm_node_suspend(uint16_t port_id,\n \tuint32_t node_id,\n \tstruct rte_tm_error *error)\n {\n@@ -276,7 +276,7 @@ int rte_tm_node_suspend(uint8_t port_id,\n }\n \n /* Resume node */\n-int rte_tm_node_resume(uint8_t port_id,\n+int rte_tm_node_resume(uint16_t port_id,\n \tuint32_t node_id,\n \tstruct rte_tm_error *error)\n {\n@@ -286,7 +286,7 @@ int rte_tm_node_resume(uint8_t port_id,\n }\n \n /* Commit the initial port traffic manager hierarchy */\n-int rte_tm_hierarchy_commit(uint8_t port_id,\n+int rte_tm_hierarchy_commit(uint16_t port_id,\n \tint clear_on_fail,\n \tstruct rte_tm_error *error)\n {\n@@ -296,7 +296,7 @@ int rte_tm_hierarchy_commit(uint8_t port_id,\n }\n \n /* Update node parent  */\n-int rte_tm_node_parent_update(uint8_t port_id,\n+int rte_tm_node_parent_update(uint16_t port_id,\n \tuint32_t node_id,\n \tuint32_t parent_node_id,\n \tuint32_t priority,\n@@ -309,7 +309,7 @@ int rte_tm_node_parent_update(uint8_t port_id,\n }\n \n /* Update node private shaper */\n-int rte_tm_node_shaper_update(uint8_t port_id,\n+int rte_tm_node_shaper_update(uint16_t port_id,\n \tuint32_t node_id,\n \tuint32_t shaper_profile_id,\n \tstruct rte_tm_error *error)\n@@ -320,7 +320,7 @@ int rte_tm_node_shaper_update(uint8_t port_id,\n }\n \n /* Update node shared shapers */\n-int rte_tm_node_shared_shaper_update(uint8_t port_id,\n+int rte_tm_node_shared_shaper_update(uint16_t port_id,\n \tuint32_t node_id,\n \tuint32_t shared_shaper_id,\n \tint add,\n@@ -332,7 +332,7 @@ int rte_tm_node_shared_shaper_update(uint8_t port_id,\n }\n \n /* Update node stats */\n-int rte_tm_node_stats_update(uint8_t port_id,\n+int rte_tm_node_stats_update(uint16_t port_id,\n \tuint32_t node_id,\n \tuint64_t stats_mask,\n \tstruct rte_tm_error *error)\n@@ -343,7 +343,7 @@ int rte_tm_node_stats_update(uint8_t port_id,\n }\n \n /* Update WFQ weight mode */\n-int rte_tm_node_wfq_weight_mode_update(uint8_t port_id,\n+int rte_tm_node_wfq_weight_mode_update(uint16_t port_id,\n \tuint32_t node_id,\n \tint *wfq_weight_mode,\n \tuint32_t n_sp_priorities,\n@@ -355,7 +355,7 @@ int rte_tm_node_wfq_weight_mode_update(uint8_t port_id,\n }\n \n /* Update node congestion management mode */\n-int rte_tm_node_cman_update(uint8_t port_id,\n+int rte_tm_node_cman_update(uint16_t port_id,\n \tuint32_t node_id,\n \tenum rte_tm_cman_mode cman,\n \tstruct rte_tm_error *error)\n@@ -366,7 +366,7 @@ int rte_tm_node_cman_update(uint8_t port_id,\n }\n \n /* Update node private WRED context */\n-int rte_tm_node_wred_context_update(uint8_t port_id,\n+int rte_tm_node_wred_context_update(uint16_t port_id,\n \tuint32_t node_id,\n \tuint32_t wred_profile_id,\n \tstruct rte_tm_error *error)\n@@ -377,7 +377,7 @@ int rte_tm_node_wred_context_update(uint8_t port_id,\n }\n \n /* Update node shared WRED context */\n-int rte_tm_node_shared_wred_context_update(uint8_t port_id,\n+int rte_tm_node_shared_wred_context_update(uint16_t port_id,\n \tuint32_t node_id,\n \tuint32_t shared_wred_context_id,\n \tint add,\n@@ -389,7 +389,7 @@ int rte_tm_node_shared_wred_context_update(uint8_t port_id,\n }\n \n /* Read and/or clear stats counters for specific node */\n-int rte_tm_node_stats_read(uint8_t port_id,\n+int rte_tm_node_stats_read(uint16_t port_id,\n \tuint32_t node_id,\n \tstruct rte_tm_node_stats *stats,\n \tuint64_t *stats_mask,\n@@ -402,7 +402,7 @@ int rte_tm_node_stats_read(uint8_t port_id,\n }\n \n /* Packet marking - VLAN DEI */\n-int rte_tm_mark_vlan_dei(uint8_t port_id,\n+int rte_tm_mark_vlan_dei(uint16_t port_id,\n \tint mark_green,\n \tint mark_yellow,\n \tint mark_red,\n@@ -414,7 +414,7 @@ int rte_tm_mark_vlan_dei(uint8_t port_id,\n }\n \n /* Packet marking - IPv4/IPv6 ECN */\n-int rte_tm_mark_ip_ecn(uint8_t port_id,\n+int rte_tm_mark_ip_ecn(uint16_t port_id,\n \tint mark_green,\n \tint mark_yellow,\n \tint mark_red,\n@@ -426,7 +426,7 @@ int rte_tm_mark_ip_ecn(uint8_t port_id,\n }\n \n /* Packet marking - IPv4/IPv6 DSCP */\n-int rte_tm_mark_ip_dscp(uint8_t port_id,\n+int rte_tm_mark_ip_dscp(uint16_t port_id,\n \tint mark_green,\n \tint mark_yellow,\n \tint mark_red,\ndiff --git a/lib/librte_ether/rte_tm.h b/lib/librte_ether/rte_tm.h\nindex ebbfa1eec..2b25a8715 100644\n--- a/lib/librte_ether/rte_tm.h\n+++ b/lib/librte_ether/rte_tm.h\n@@ -1040,7 +1040,7 @@ struct rte_tm_error {\n  *   0 on success, non-zero error code otherwise.\n  */\n int\n-rte_tm_get_number_of_leaf_nodes(uint8_t port_id,\n+rte_tm_get_number_of_leaf_nodes(uint16_t port_id,\n \tuint32_t *n_leaf_nodes,\n \tstruct rte_tm_error *error);\n \n@@ -1064,7 +1064,7 @@ rte_tm_get_number_of_leaf_nodes(uint8_t port_id,\n  *   0 on success, non-zero error code otherwise.\n  */\n int\n-rte_tm_node_type_get(uint8_t port_id,\n+rte_tm_node_type_get(uint16_t port_id,\n \tuint32_t node_id,\n \tint *is_leaf,\n \tstruct rte_tm_error *error);\n@@ -1082,7 +1082,7 @@ rte_tm_node_type_get(uint8_t port_id,\n  *   0 on success, non-zero error code otherwise.\n  */\n int\n-rte_tm_capabilities_get(uint8_t port_id,\n+rte_tm_capabilities_get(uint16_t port_id,\n \tstruct rte_tm_capabilities *cap,\n \tstruct rte_tm_error *error);\n \n@@ -1102,7 +1102,7 @@ rte_tm_capabilities_get(uint8_t port_id,\n  *   0 on success, non-zero error code otherwise.\n  */\n int\n-rte_tm_level_capabilities_get(uint8_t port_id,\n+rte_tm_level_capabilities_get(uint16_t port_id,\n \tuint32_t level_id,\n \tstruct rte_tm_level_capabilities *cap,\n \tstruct rte_tm_error *error);\n@@ -1122,7 +1122,7 @@ rte_tm_level_capabilities_get(uint8_t port_id,\n  *   0 on success, non-zero error code otherwise.\n  */\n int\n-rte_tm_node_capabilities_get(uint8_t port_id,\n+rte_tm_node_capabilities_get(uint16_t port_id,\n \tuint32_t node_id,\n \tstruct rte_tm_node_capabilities *cap,\n \tstruct rte_tm_error *error);\n@@ -1147,7 +1147,7 @@ rte_tm_node_capabilities_get(uint8_t port_id,\n  * @see struct rte_tm_capabilities::cman_wred_context_n_max\n  */\n int\n-rte_tm_wred_profile_add(uint8_t port_id,\n+rte_tm_wred_profile_add(uint16_t port_id,\n \tuint32_t wred_profile_id,\n \tstruct rte_tm_wred_params *profile,\n \tstruct rte_tm_error *error);\n@@ -1170,7 +1170,7 @@ rte_tm_wred_profile_add(uint8_t port_id,\n  * @see struct rte_tm_capabilities::cman_wred_context_n_max\n  */\n int\n-rte_tm_wred_profile_delete(uint8_t port_id,\n+rte_tm_wred_profile_delete(uint16_t port_id,\n \tuint32_t wred_profile_id,\n \tstruct rte_tm_error *error);\n \n@@ -1201,7 +1201,7 @@ rte_tm_wred_profile_delete(uint8_t port_id,\n  * @see struct rte_tm_capabilities::cman_wred_context_shared_n_max\n  */\n int\n-rte_tm_shared_wred_context_add_update(uint8_t port_id,\n+rte_tm_shared_wred_context_add_update(uint16_t port_id,\n \tuint32_t shared_wred_context_id,\n \tuint32_t wred_profile_id,\n \tstruct rte_tm_error *error);\n@@ -1225,7 +1225,7 @@ rte_tm_shared_wred_context_add_update(uint8_t port_id,\n  * @see struct rte_tm_capabilities::cman_wred_context_shared_n_max\n  */\n int\n-rte_tm_shared_wred_context_delete(uint8_t port_id,\n+rte_tm_shared_wred_context_delete(uint16_t port_id,\n \tuint32_t shared_wred_context_id,\n \tstruct rte_tm_error *error);\n \n@@ -1249,7 +1249,7 @@ rte_tm_shared_wred_context_delete(uint8_t port_id,\n  * @see struct rte_tm_capabilities::shaper_n_max\n  */\n int\n-rte_tm_shaper_profile_add(uint8_t port_id,\n+rte_tm_shaper_profile_add(uint16_t port_id,\n \tuint32_t shaper_profile_id,\n \tstruct rte_tm_shaper_params *profile,\n \tstruct rte_tm_error *error);\n@@ -1272,7 +1272,7 @@ rte_tm_shaper_profile_add(uint8_t port_id,\n  * @see struct rte_tm_capabilities::shaper_n_max\n  */\n int\n-rte_tm_shaper_profile_delete(uint8_t port_id,\n+rte_tm_shaper_profile_delete(uint16_t port_id,\n \tuint32_t shaper_profile_id,\n \tstruct rte_tm_error *error);\n \n@@ -1301,7 +1301,7 @@ rte_tm_shaper_profile_delete(uint8_t port_id,\n  * @see struct rte_tm_capabilities::shaper_shared_n_max\n  */\n int\n-rte_tm_shared_shaper_add_update(uint8_t port_id,\n+rte_tm_shared_shaper_add_update(uint16_t port_id,\n \tuint32_t shared_shaper_id,\n \tuint32_t shaper_profile_id,\n \tstruct rte_tm_error *error);\n@@ -1324,7 +1324,7 @@ rte_tm_shared_shaper_add_update(uint8_t port_id,\n  * @see struct rte_tm_capabilities::shaper_shared_n_max\n  */\n int\n-rte_tm_shared_shaper_delete(uint8_t port_id,\n+rte_tm_shared_shaper_delete(uint16_t port_id,\n \tuint32_t shared_shaper_id,\n \tstruct rte_tm_error *error);\n \n@@ -1392,7 +1392,7 @@ rte_tm_shared_shaper_delete(uint8_t port_id,\n  * @see struct rte_tm_capabilities\n  */\n int\n-rte_tm_node_add(uint8_t port_id,\n+rte_tm_node_add(uint16_t port_id,\n \tuint32_t node_id,\n \tuint32_t parent_node_id,\n \tuint32_t priority,\n@@ -1425,7 +1425,7 @@ rte_tm_node_add(uint8_t port_id,\n  * @see RTE_TM_UPDATE_NODE_ADD_DELETE\n  */\n int\n-rte_tm_node_delete(uint8_t port_id,\n+rte_tm_node_delete(uint16_t port_id,\n \tuint32_t node_id,\n \tstruct rte_tm_error *error);\n \n@@ -1449,7 +1449,7 @@ rte_tm_node_delete(uint8_t port_id,\n  * @see RTE_TM_UPDATE_NODE_SUSPEND_RESUME\n  */\n int\n-rte_tm_node_suspend(uint8_t port_id,\n+rte_tm_node_suspend(uint16_t port_id,\n \tuint32_t node_id,\n \tstruct rte_tm_error *error);\n \n@@ -1472,7 +1472,7 @@ rte_tm_node_suspend(uint8_t port_id,\n  * @see RTE_TM_UPDATE_NODE_SUSPEND_RESUME\n  */\n int\n-rte_tm_node_resume(uint8_t port_id,\n+rte_tm_node_resume(uint16_t port_id,\n \tuint32_t node_id,\n \tstruct rte_tm_error *error);\n \n@@ -1513,7 +1513,7 @@ rte_tm_node_resume(uint8_t port_id,\n  * @see rte_tm_node_delete()\n  */\n int\n-rte_tm_hierarchy_commit(uint8_t port_id,\n+rte_tm_hierarchy_commit(uint16_t port_id,\n \tint clear_on_fail,\n \tstruct rte_tm_error *error);\n \n@@ -1549,7 +1549,7 @@ rte_tm_hierarchy_commit(uint8_t port_id,\n  * @see RTE_TM_UPDATE_NODE_PARENT_CHANGE_LEVEL\n  */\n int\n-rte_tm_node_parent_update(uint8_t port_id,\n+rte_tm_node_parent_update(uint16_t port_id,\n \tuint32_t node_id,\n \tuint32_t parent_node_id,\n \tuint32_t priority,\n@@ -1578,7 +1578,7 @@ rte_tm_node_parent_update(uint8_t port_id,\n  * @see struct rte_tm_capabilities::shaper_private_n_max\n  */\n int\n-rte_tm_node_shaper_update(uint8_t port_id,\n+rte_tm_node_shaper_update(uint16_t port_id,\n \tuint32_t node_id,\n \tuint32_t shaper_profile_id,\n \tstruct rte_tm_error *error);\n@@ -1605,7 +1605,7 @@ rte_tm_node_shaper_update(uint8_t port_id,\n  * @see struct rte_tm_capabilities::shaper_shared_n_max\n  */\n int\n-rte_tm_node_shared_shaper_update(uint8_t port_id,\n+rte_tm_node_shared_shaper_update(uint16_t port_id,\n \tuint32_t node_id,\n \tuint32_t shared_shaper_id,\n \tint add,\n@@ -1632,7 +1632,7 @@ rte_tm_node_shared_shaper_update(uint8_t port_id,\n  * @see RTE_TM_UPDATE_NODE_STATS\n  */\n int\n-rte_tm_node_stats_update(uint8_t port_id,\n+rte_tm_node_stats_update(uint16_t port_id,\n \tuint32_t node_id,\n \tuint64_t stats_mask,\n \tstruct rte_tm_error *error);\n@@ -1660,7 +1660,7 @@ rte_tm_node_stats_update(uint8_t port_id,\n  * @see RTE_TM_UPDATE_NODE_N_SP_PRIORITIES\n  */\n int\n-rte_tm_node_wfq_weight_mode_update(uint8_t port_id,\n+rte_tm_node_wfq_weight_mode_update(uint16_t port_id,\n \tuint32_t node_id,\n \tint *wfq_weight_mode,\n \tuint32_t n_sp_priorities,\n@@ -1683,7 +1683,7 @@ rte_tm_node_wfq_weight_mode_update(uint8_t port_id,\n  * @see RTE_TM_UPDATE_NODE_CMAN\n  */\n int\n-rte_tm_node_cman_update(uint8_t port_id,\n+rte_tm_node_cman_update(uint16_t port_id,\n \tuint32_t node_id,\n \tenum rte_tm_cman_mode cman,\n \tstruct rte_tm_error *error);\n@@ -1707,7 +1707,7 @@ rte_tm_node_cman_update(uint8_t port_id,\n  * @see struct rte_tm_capabilities::cman_wred_context_private_n_max\n */\n int\n-rte_tm_node_wred_context_update(uint8_t port_id,\n+rte_tm_node_wred_context_update(uint16_t port_id,\n \tuint32_t node_id,\n \tuint32_t wred_profile_id,\n \tstruct rte_tm_error *error);\n@@ -1732,7 +1732,7 @@ rte_tm_node_wred_context_update(uint8_t port_id,\n  * @see struct rte_tm_capabilities::cman_wred_context_shared_n_max\n  */\n int\n-rte_tm_node_shared_wred_context_update(uint8_t port_id,\n+rte_tm_node_shared_wred_context_update(uint16_t port_id,\n \tuint32_t node_id,\n \tuint32_t shared_wred_context_id,\n \tint add,\n@@ -1764,7 +1764,7 @@ rte_tm_node_shared_wred_context_update(uint8_t port_id,\n  * @see enum rte_tm_stats_type\n  */\n int\n-rte_tm_node_stats_read(uint8_t port_id,\n+rte_tm_node_stats_read(uint16_t port_id,\n \tuint32_t node_id,\n \tstruct rte_tm_node_stats *stats,\n \tuint64_t *stats_mask,\n@@ -1801,7 +1801,7 @@ rte_tm_node_stats_read(uint8_t port_id,\n  * @see struct rte_tm_capabilities::mark_vlan_dei_supported\n  */\n int\n-rte_tm_mark_vlan_dei(uint8_t port_id,\n+rte_tm_mark_vlan_dei(uint16_t port_id,\n \tint mark_green,\n \tint mark_yellow,\n \tint mark_red,\n@@ -1851,7 +1851,7 @@ rte_tm_mark_vlan_dei(uint8_t port_id,\n  * @see struct rte_tm_capabilities::mark_ip_ecn_sctp_supported\n  */\n int\n-rte_tm_mark_ip_ecn(uint8_t port_id,\n+rte_tm_mark_ip_ecn(uint16_t port_id,\n \tint mark_green,\n \tint mark_yellow,\n \tint mark_red,\n@@ -1899,7 +1899,7 @@ rte_tm_mark_ip_ecn(uint8_t port_id,\n  * @see struct rte_tm_capabilities::mark_ip_dscp_supported\n  */\n int\n-rte_tm_mark_ip_dscp(uint8_t port_id,\n+rte_tm_mark_ip_dscp(uint16_t port_id,\n \tint mark_green,\n \tint mark_yellow,\n \tint mark_red,\ndiff --git a/lib/librte_ether/rte_tm_driver.h b/lib/librte_ether/rte_tm_driver.h\nindex a5b698fe0..b2e8ccf80 100644\n--- a/lib/librte_ether/rte_tm_driver.h\n+++ b/lib/librte_ether/rte_tm_driver.h\n@@ -357,7 +357,7 @@ rte_tm_error_set(struct rte_tm_error *error,\n  *   success, NULL otherwise.\n  */\n const struct rte_tm_ops *\n-rte_tm_ops_get(uint8_t port_id, struct rte_tm_error *error);\n+rte_tm_ops_get(uint16_t port_id, struct rte_tm_error *error);\n \n #ifdef __cplusplus\n }\ndiff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c\nindex bbb380502..b1eba4c20 100644\n--- a/lib/librte_eventdev/rte_eventdev.c\n+++ b/lib/librte_eventdev/rte_eventdev.c\n@@ -190,9 +190,9 @@ rte_event_dev_queue_config(struct rte_eventdev *dev, uint8_t nb_queues)\n #define EVENT_QUEUE_SERVICE_PRIORITY_INVALID (0xdead)\n \n static inline int\n-rte_event_dev_port_config(struct rte_eventdev *dev, uint8_t nb_ports)\n+rte_event_dev_port_config(struct rte_eventdev *dev, uint16_t nb_ports)\n {\n-\tuint8_t old_nb_ports = dev->data->nb_ports;\n+\tuint16_t old_nb_ports = dev->data->nb_ports;\n \tvoid **ports;\n \tuint16_t *links_map;\n \tuint8_t *ports_dequeue_depth;\n@@ -631,7 +631,7 @@ rte_event_queue_priority(uint8_t dev_id, uint8_t queue_id)\n }\n \n static inline int\n-is_valid_port(struct rte_eventdev *dev, uint8_t port_id)\n+is_valid_port(struct rte_eventdev *dev, uint16_t port_id)\n {\n \tif (port_id < dev->data->nb_ports)\n \t\treturn 1;\n@@ -640,7 +640,7 @@ is_valid_port(struct rte_eventdev *dev, uint8_t port_id)\n }\n \n int\n-rte_event_port_default_conf_get(uint8_t dev_id, uint8_t port_id,\n+rte_event_port_default_conf_get(uint8_t dev_id, uint16_t port_id,\n \t\t\t\t struct rte_event_port_conf *port_conf)\n {\n \tstruct rte_eventdev *dev;\n@@ -652,7 +652,7 @@ rte_event_port_default_conf_get(uint8_t dev_id, uint8_t port_id,\n \t\treturn -EINVAL;\n \n \tif (!is_valid_port(dev, port_id)) {\n-\t\tRTE_EDEV_LOG_ERR(\"Invalid port_id=%\" PRIu8, port_id);\n+\t\tRTE_EDEV_LOG_ERR(\"Invalid port_id=%\" PRIu16, port_id);\n \t\treturn -EINVAL;\n \t}\n \n@@ -663,7 +663,7 @@ rte_event_port_default_conf_get(uint8_t dev_id, uint8_t port_id,\n }\n \n int\n-rte_event_port_setup(uint8_t dev_id, uint8_t port_id,\n+rte_event_port_setup(uint8_t dev_id, uint16_t port_id,\n \t\t     const struct rte_event_port_conf *port_conf)\n {\n \tstruct rte_eventdev *dev;\n@@ -674,7 +674,7 @@ rte_event_port_setup(uint8_t dev_id, uint8_t port_id,\n \tdev = &rte_eventdevs[dev_id];\n \n \tif (!is_valid_port(dev, port_id)) {\n-\t\tRTE_EDEV_LOG_ERR(\"Invalid port_id=%\" PRIu8, port_id);\n+\t\tRTE_EDEV_LOG_ERR(\"Invalid port_id=%\" PRIu16, port_id);\n \t\treturn -EINVAL;\n \t}\n \n@@ -744,7 +744,7 @@ rte_event_port_setup(uint8_t dev_id, uint8_t port_id,\n }\n \n uint8_t\n-rte_event_port_dequeue_depth(uint8_t dev_id, uint8_t port_id)\n+rte_event_port_dequeue_depth(uint8_t dev_id, uint16_t port_id)\n {\n \tstruct rte_eventdev *dev;\n \n@@ -753,7 +753,7 @@ rte_event_port_dequeue_depth(uint8_t dev_id, uint8_t port_id)\n }\n \n uint8_t\n-rte_event_port_enqueue_depth(uint8_t dev_id, uint8_t port_id)\n+rte_event_port_enqueue_depth(uint8_t dev_id, uint16_t port_id)\n {\n \tstruct rte_eventdev *dev;\n \n@@ -771,7 +771,7 @@ rte_event_port_count(uint8_t dev_id)\n }\n \n int\n-rte_event_port_link(uint8_t dev_id, uint8_t port_id,\n+rte_event_port_link(uint8_t dev_id, uint16_t port_id,\n \t\t    const uint8_t queues[], const uint8_t priorities[],\n \t\t    uint16_t nb_links)\n {\n@@ -786,7 +786,7 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,\n \tRTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->port_link, -ENOTSUP);\n \n \tif (!is_valid_port(dev, port_id)) {\n-\t\tRTE_EDEV_LOG_ERR(\"Invalid port_id=%\" PRIu8, port_id);\n+\t\tRTE_EDEV_LOG_ERR(\"Invalid port_id=%\" PRIu16, port_id);\n \t\treturn -EINVAL;\n \t}\n \n@@ -824,7 +824,7 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,\n }\n \n int\n-rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,\n+rte_event_port_unlink(uint8_t dev_id, uint16_t port_id,\n \t\t      uint8_t queues[], uint16_t nb_unlinks)\n {\n \tstruct rte_eventdev *dev;\n@@ -837,7 +837,7 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,\n \tRTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->port_unlink, -ENOTSUP);\n \n \tif (!is_valid_port(dev, port_id)) {\n-\t\tRTE_EDEV_LOG_ERR(\"Invalid port_id=%\" PRIu8, port_id);\n+\t\tRTE_EDEV_LOG_ERR(\"Invalid port_id=%\" PRIu16, port_id);\n \t\treturn -EINVAL;\n \t}\n \n@@ -868,7 +868,7 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,\n }\n \n int\n-rte_event_port_links_get(uint8_t dev_id, uint8_t port_id,\n+rte_event_port_links_get(uint8_t dev_id, uint16_t port_id,\n \t\t\t uint8_t queues[], uint8_t priorities[])\n {\n \tstruct rte_eventdev *dev;\n@@ -878,7 +878,7 @@ rte_event_port_links_get(uint8_t dev_id, uint8_t port_id,\n \tRTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);\n \tdev = &rte_eventdevs[dev_id];\n \tif (!is_valid_port(dev, port_id)) {\n-\t\tRTE_EDEV_LOG_ERR(\"Invalid port_id=%\" PRIu8, port_id);\n+\t\tRTE_EDEV_LOG_ERR(\"Invalid port_id=%\" PRIu16, port_id);\n \t\treturn -EINVAL;\n \t}\n \n@@ -927,7 +927,7 @@ rte_event_dev_dump(uint8_t dev_id, FILE *f)\n \n static int\n xstats_get_count(uint8_t dev_id, enum rte_event_dev_xstats_mode mode,\n-\t\tuint8_t queue_port_id)\n+\t\tuint16_t queue_port_id)\n {\n \tstruct rte_eventdev *dev = &rte_eventdevs[dev_id];\n \tif (dev->dev_ops->xstats_get_names != NULL)\n@@ -939,7 +939,7 @@ xstats_get_count(uint8_t dev_id, enum rte_event_dev_xstats_mode mode,\n \n int\n rte_event_dev_xstats_names_get(uint8_t dev_id,\n-\t\tenum rte_event_dev_xstats_mode mode, uint8_t queue_port_id,\n+\t\tenum rte_event_dev_xstats_mode mode, uint16_t queue_port_id,\n \t\tstruct rte_event_dev_xstats_name *xstats_names,\n \t\tunsigned int *ids, unsigned int size)\n {\n@@ -963,7 +963,7 @@ rte_event_dev_xstats_names_get(uint8_t dev_id,\n /* retrieve eventdev extended statistics */\n int\n rte_event_dev_xstats_get(uint8_t dev_id, enum rte_event_dev_xstats_mode mode,\n-\t\tuint8_t queue_port_id, const unsigned int ids[],\n+\t\tuint16_t queue_port_id, const unsigned int ids[],\n \t\tuint64_t values[], unsigned int n)\n {\n \tRTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -ENODEV);\ndiff --git a/lib/librte_eventdev/rte_eventdev.h b/lib/librte_eventdev/rte_eventdev.h\nindex 128bc5221..3b52d0f24 100644\n--- a/lib/librte_eventdev/rte_eventdev.h\n+++ b/lib/librte_eventdev/rte_eventdev.h\n@@ -360,7 +360,7 @@ struct rte_event_dev_info {\n \t/**< Maximum number of event priority levels by this device.\n \t * Valid when the device has RTE_EVENT_DEV_CAP_EVENT_QOS capability\n \t */\n-\tuint8_t max_event_ports;\n+\tuint16_t max_event_ports;\n \t/**< Maximum number of event ports supported by this device */\n \tuint8_t max_event_port_dequeue_depth;\n \t/**< Maximum number of events can be dequeued at a time from an\n@@ -428,7 +428,7 @@ struct rte_event_dev_config {\n \t * This value cannot exceed the *max_event_queues* which previously\n \t * provided in rte_event_dev_info_get()\n \t */\n-\tuint8_t nb_event_ports;\n+\tuint16_t nb_event_ports;\n \t/**< Number of event ports to configure on this device.\n \t * This value cannot exceed the *max_event_ports* which previously\n \t * provided in rte_event_dev_info_get()\n@@ -687,7 +687,7 @@ struct rte_event_port_conf {\n  *\n  */\n int\n-rte_event_port_default_conf_get(uint8_t dev_id, uint8_t port_id,\n+rte_event_port_default_conf_get(uint8_t dev_id, uint16_t port_id,\n \t\t\t\tstruct rte_event_port_conf *port_conf);\n \n /**\n@@ -711,7 +711,7 @@ rte_event_port_default_conf_get(uint8_t dev_id, uint8_t port_id,\n  *   with RTE_EVENT_QUEUE_CFG_SINGLE_LINK to more than one event ports)\n  */\n int\n-rte_event_port_setup(uint8_t dev_id, uint8_t port_id,\n+rte_event_port_setup(uint8_t dev_id, uint16_t port_id,\n \t\t     const struct rte_event_port_conf *port_conf);\n \n /**\n@@ -728,7 +728,7 @@ rte_event_port_setup(uint8_t dev_id, uint8_t port_id,\n  * @see rte_event_dequeue_burst()\n  */\n uint8_t\n-rte_event_port_dequeue_depth(uint8_t dev_id, uint8_t port_id);\n+rte_event_port_dequeue_depth(uint8_t dev_id, uint16_t port_id);\n \n /**\n  * Get the number of enqueue queue depth configured for event port designated\n@@ -744,7 +744,7 @@ rte_event_port_dequeue_depth(uint8_t dev_id, uint8_t port_id);\n  * @see rte_event_enqueue_burst()\n  */\n uint8_t\n-rte_event_port_enqueue_depth(uint8_t dev_id, uint8_t port_id);\n+rte_event_port_enqueue_depth(uint8_t dev_id, uint16_t port_id);\n \n /**\n  * Get the number of ports on a specific event device\n@@ -1030,7 +1030,7 @@ struct rte_eventdev_data {\n \t/**< Device ID for this instance */\n \tuint8_t nb_queues;\n \t/**< Number of event queues. */\n-\tuint8_t nb_ports;\n+\tuint16_t nb_ports;\n \t/**< Number of event ports. */\n \tvoid **ports;\n \t/**< Array of pointers to ports. */\n@@ -1108,7 +1108,7 @@ rte_event_schedule(uint8_t dev_id)\n }\n \n static __rte_always_inline uint16_t\n-__rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,\n+__rte_event_enqueue_burst(uint8_t dev_id, uint16_t port_id,\n \t\t\tconst struct rte_event ev[], uint16_t nb_events,\n \t\t\tconst event_enqueue_burst_t fn)\n {\n@@ -1175,7 +1175,7 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,\n  * @see rte_event_port_enqueue_depth()\n  */\n static inline uint16_t\n-rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,\n+rte_event_enqueue_burst(uint8_t dev_id, uint16_t port_id,\n \t\t\tconst struct rte_event ev[], uint16_t nb_events)\n {\n \tconst struct rte_eventdev *dev = &rte_eventdevs[dev_id];\n@@ -1224,7 +1224,7 @@ rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,\n  * @see rte_event_port_enqueue_depth() rte_event_enqueue_burst()\n  */\n static inline uint16_t\n-rte_event_enqueue_new_burst(uint8_t dev_id, uint8_t port_id,\n+rte_event_enqueue_new_burst(uint8_t dev_id, uint16_t port_id,\n \t\t\tconst struct rte_event ev[], uint16_t nb_events)\n {\n \tconst struct rte_eventdev *dev = &rte_eventdevs[dev_id];\n@@ -1273,7 +1273,7 @@ rte_event_enqueue_new_burst(uint8_t dev_id, uint8_t port_id,\n  * @see rte_event_port_enqueue_depth() rte_event_enqueue_burst()\n  */\n static inline uint16_t\n-rte_event_enqueue_forward_burst(uint8_t dev_id, uint8_t port_id,\n+rte_event_enqueue_forward_burst(uint8_t dev_id, uint16_t port_id,\n \t\t\tconst struct rte_event ev[], uint16_t nb_events)\n {\n \tconst struct rte_eventdev *dev = &rte_eventdevs[dev_id];\n@@ -1375,7 +1375,7 @@ rte_event_dequeue_timeout_ticks(uint8_t dev_id, uint64_t ns,\n  * @see rte_event_port_dequeue_depth()\n  */\n static inline uint16_t\n-rte_event_dequeue_burst(uint8_t dev_id, uint8_t port_id, struct rte_event ev[],\n+rte_event_dequeue_burst(uint8_t dev_id, uint16_t port_id, struct rte_event ev[],\n \t\t\tuint16_t nb_events, uint64_t timeout_ticks)\n {\n \tstruct rte_eventdev *dev = &rte_eventdevs[dev_id];\n@@ -1466,7 +1466,7 @@ rte_event_dequeue_burst(uint8_t dev_id, uint8_t port_id, struct rte_event ev[],\n  *\n  */\n int\n-rte_event_port_link(uint8_t dev_id, uint8_t port_id,\n+rte_event_port_link(uint8_t dev_id, uint16_t port_id,\n \t\t    const uint8_t queues[], const uint8_t priorities[],\n \t\t    uint16_t nb_links);\n \n@@ -1510,7 +1510,7 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,\n  *\n  */\n int\n-rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,\n+rte_event_port_unlink(uint8_t dev_id, uint16_t port_id,\n \t\t      uint8_t queues[], uint16_t nb_unlinks);\n \n /**\n@@ -1541,7 +1541,7 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,\n  *\n  */\n int\n-rte_event_port_links_get(uint8_t dev_id, uint8_t port_id,\n+rte_event_port_links_get(uint8_t dev_id, uint16_t port_id,\n \t\t\t uint8_t queues[], uint8_t priorities[]);\n \n /**\n@@ -1617,7 +1617,7 @@ struct rte_event_dev_xstats_name {\n int\n rte_event_dev_xstats_names_get(uint8_t dev_id,\n \t\t\t       enum rte_event_dev_xstats_mode mode,\n-\t\t\t       uint8_t queue_port_id,\n+\t\t\t       uint16_t queue_port_id,\n \t\t\t       struct rte_event_dev_xstats_name *xstats_names,\n \t\t\t       unsigned int *ids,\n \t\t\t       unsigned int size);\n@@ -1651,7 +1651,7 @@ rte_event_dev_xstats_names_get(uint8_t dev_id,\n int\n rte_event_dev_xstats_get(uint8_t dev_id,\n \t\t\t enum rte_event_dev_xstats_mode mode,\n-\t\t\t uint8_t queue_port_id,\n+\t\t\t uint16_t queue_port_id,\n \t\t\t const unsigned int ids[],\n \t\t\t uint64_t values[], unsigned int n);\n \ndiff --git a/lib/librte_eventdev/rte_eventdev_pmd.h b/lib/librte_eventdev/rte_eventdev_pmd.h\nindex 3d72acf3a..ef7c932a7 100644\n--- a/lib/librte_eventdev/rte_eventdev_pmd.h\n+++ b/lib/librte_eventdev/rte_eventdev_pmd.h\n@@ -265,7 +265,7 @@ typedef void (*eventdev_queue_release_t)(struct rte_eventdev *dev,\n  *\n  */\n typedef void (*eventdev_port_default_conf_get_t)(struct rte_eventdev *dev,\n-\t\tuint8_t port_id, struct rte_event_port_conf *port_conf);\n+\t\tuint16_t port_id, struct rte_event_port_conf *port_conf);\n \n /**\n  * Setup an event port.\n@@ -281,7 +281,7 @@ typedef void (*eventdev_port_default_conf_get_t)(struct rte_eventdev *dev,\n  *   Returns 0 on success.\n  */\n typedef int (*eventdev_port_setup_t)(struct rte_eventdev *dev,\n-\t\tuint8_t port_id,\n+\t\tuint16_t port_id,\n \t\tconst struct rte_event_port_conf *port_conf);\n \n /**\n@@ -379,7 +379,7 @@ typedef void (*eventdev_dump_t)(struct rte_eventdev *dev, FILE *f);\n  *   The number of stat values successfully filled into the values array\n  */\n typedef int (*eventdev_xstats_get_t)(const struct rte_eventdev *dev,\n-\t\tenum rte_event_dev_xstats_mode mode, uint8_t queue_port_id,\n+\t\tenum rte_event_dev_xstats_mode mode, uint16_t queue_port_id,\n \t\tconst unsigned int ids[], uint64_t values[], unsigned int n);\n \n /**\n@@ -407,7 +407,7 @@ typedef int (*eventdev_xstats_reset_t)(struct rte_eventdev *dev,\n  *   values, and do not fill in any data into xstats_names.\n  */\n typedef int (*eventdev_xstats_get_names_t)(const struct rte_eventdev *dev,\n-\t\tenum rte_event_dev_xstats_mode mode, uint8_t queue_port_id,\n+\t\tenum rte_event_dev_xstats_mode mode, uint16_t queue_port_id,\n \t\tstruct rte_event_dev_xstats_name *xstats_names,\n \t\tunsigned int *ids, unsigned int size);\n \ndiff --git a/lib/librte_kni/rte_kni.h b/lib/librte_kni/rte_kni.h\nindex 37deb4727..87812cd55 100644\n--- a/lib/librte_kni/rte_kni.h\n+++ b/lib/librte_kni/rte_kni.h\n@@ -63,13 +63,13 @@ struct rte_mbuf;\n  * Structure which has the function pointers for KNI interface.\n  */\n struct rte_kni_ops {\n-\tuint8_t port_id; /* Port ID */\n+\tuint16_t port_id; /* Port ID */\n \n \t/* Pointer to function of changing MTU */\n-\tint (*change_mtu)(uint8_t port_id, unsigned new_mtu);\n+\tint (*change_mtu)(uint16_t port_id, unsigned int new_mtu);\n \n \t/* Pointer to function of configuring network interface */\n-\tint (*config_network_if)(uint8_t port_id, uint8_t if_up);\n+\tint (*config_network_if)(uint16_t port_id, uint8_t if_up);\n };\n \n /**\ndiff --git a/lib/librte_latencystats/rte_latencystats.c b/lib/librte_latencystats/rte_latencystats.c\nindex ce029a12c..d6ad13c4e 100644\n--- a/lib/librte_latencystats/rte_latencystats.c\n+++ b/lib/librte_latencystats/rte_latencystats.c\n@@ -135,7 +135,7 @@ rte_latencystats_fill_values(struct rte_metric_value *values)\n }\n \n static uint16_t\n-add_time_stamps(uint8_t pid __rte_unused,\n+add_time_stamps(uint16_t pid __rte_unused,\n \t\tuint16_t qid __rte_unused,\n \t\tstruct rte_mbuf **pkts,\n \t\tuint16_t nb_pkts,\n@@ -165,7 +165,7 @@ add_time_stamps(uint8_t pid __rte_unused,\n }\n \n static uint16_t\n-calc_latency(uint8_t pid __rte_unused,\n+calc_latency(uint16_t pid __rte_unused,\n \t\tuint16_t qid __rte_unused,\n \t\tstruct rte_mbuf **pkts,\n \t\tuint16_t nb_pkts,\n@@ -226,10 +226,10 @@ rte_latencystats_init(uint64_t app_samp_intvl,\n \t\trte_latency_stats_flow_type_fn user_cb)\n {\n \tunsigned int i;\n-\tuint8_t pid;\n+\tuint16_t pid;\n \tuint16_t qid;\n \tstruct rxtx_cbs *cbs = NULL;\n-\tconst uint8_t nb_ports = rte_eth_dev_count();\n+\tconst uint16_t nb_ports = rte_eth_dev_count();\n \tconst char *ptr_strings[NUM_LATENCY_STATS] = {0};\n \tconst struct rte_memzone *mz = NULL;\n \tconst unsigned int flags = 0;\n@@ -290,11 +290,11 @@ rte_latencystats_init(uint64_t app_samp_intvl,\n int\n rte_latencystats_uninit(void)\n {\n-\tuint8_t pid;\n+\tuint16_t pid;\n \tuint16_t qid;\n \tint ret = 0;\n \tstruct rxtx_cbs *cbs = NULL;\n-\tconst uint8_t nb_ports = rte_eth_dev_count();\n+\tconst uint16_t nb_ports = rte_eth_dev_count();\n \n \t/** De register Rx/Tx callbacks */\n \tfor (pid = 0; pid < nb_ports; pid++) {\ndiff --git a/lib/librte_pdump/rte_pdump.c b/lib/librte_pdump/rte_pdump.c\nindex 729e79a36..e6182d35c 100644\n--- a/lib/librte_pdump/rte_pdump.c\n+++ b/lib/librte_pdump/rte_pdump.c\n@@ -207,7 +207,7 @@ pdump_copy(struct rte_mbuf **pkts, uint16_t nb_pkts, void *user_params)\n }\n \n static uint16_t\n-pdump_rx(uint8_t port __rte_unused, uint16_t qidx __rte_unused,\n+pdump_rx(uint16_t port __rte_unused, uint16_t qidx __rte_unused,\n \tstruct rte_mbuf **pkts, uint16_t nb_pkts,\n \tuint16_t max_pkts __rte_unused,\n \tvoid *user_params)\n@@ -217,7 +217,7 @@ pdump_rx(uint8_t port __rte_unused, uint16_t qidx __rte_unused,\n }\n \n static uint16_t\n-pdump_tx(uint8_t port __rte_unused, uint16_t qidx __rte_unused,\n+pdump_tx(uint16_t port __rte_unused, uint16_t qidx __rte_unused,\n \t\tstruct rte_mbuf **pkts, uint16_t nb_pkts, void *user_params)\n {\n \tpdump_copy(pkts, nb_pkts, user_params);\n@@ -225,7 +225,7 @@ pdump_tx(uint8_t port __rte_unused, uint16_t qidx __rte_unused,\n }\n \n static int\n-pdump_regitser_rx_callbacks(uint16_t end_q, uint8_t port, uint16_t queue,\n+pdump_regitser_rx_callbacks(uint16_t end_q, uint16_t port, uint16_t queue,\n \t\t\t\tstruct rte_ring *ring, struct rte_mempool *mp,\n \t\t\t\tuint16_t operation)\n {\n@@ -279,7 +279,7 @@ pdump_regitser_rx_callbacks(uint16_t end_q, uint8_t port, uint16_t queue,\n }\n \n static int\n-pdump_regitser_tx_callbacks(uint16_t end_q, uint8_t port, uint16_t queue,\n+pdump_regitser_tx_callbacks(uint16_t end_q, uint16_t port, uint16_t queue,\n \t\t\t\tstruct rte_ring *ring, struct rte_mempool *mp,\n \t\t\t\tuint16_t operation)\n {\n@@ -337,7 +337,7 @@ static int\n set_pdump_rxtx_cbs(struct pdump_request *p)\n {\n \tuint16_t nb_rx_q = 0, nb_tx_q = 0, end_q, queue;\n-\tuint8_t port;\n+\tuint16_t port;\n \tint ret = 0;\n \tuint32_t flags;\n \tuint16_t operation;\n@@ -764,7 +764,7 @@ pdump_validate_flags(uint32_t flags)\n }\n \n static int\n-pdump_validate_port(uint8_t port, char *name)\n+pdump_validate_port(uint16_t port, char *name)\n {\n \tint ret = 0;\n \n@@ -828,7 +828,7 @@ pdump_prepare_client_request(char *device, uint16_t queue,\n }\n \n int\n-rte_pdump_enable(uint8_t port, uint16_t queue, uint32_t flags,\n+rte_pdump_enable(uint16_t port, uint16_t queue, uint32_t flags,\n \t\t\tstruct rte_ring *ring,\n \t\t\tstruct rte_mempool *mp,\n \t\t\tvoid *filter)\n@@ -876,7 +876,7 @@ rte_pdump_enable_by_deviceid(char *device_id, uint16_t queue,\n }\n \n int\n-rte_pdump_disable(uint8_t port, uint16_t queue, uint32_t flags)\n+rte_pdump_disable(uint16_t port, uint16_t queue, uint32_t flags)\n {\n \tint ret = 0;\n \tchar name[DEVICE_ID_SIZE];\ndiff --git a/lib/librte_pdump/rte_pdump.h b/lib/librte_pdump/rte_pdump.h\nindex ba6e39b09..4ec0a106f 100644\n--- a/lib/librte_pdump/rte_pdump.h\n+++ b/lib/librte_pdump/rte_pdump.h\n@@ -113,7 +113,7 @@ rte_pdump_uninit(void);\n  */\n \n int\n-rte_pdump_enable(uint8_t port, uint16_t queue, uint32_t flags,\n+rte_pdump_enable(uint16_t port, uint16_t queue, uint32_t flags,\n \t\tstruct rte_ring *ring,\n \t\tstruct rte_mempool *mp,\n \t\tvoid *filter);\n@@ -136,7 +136,7 @@ rte_pdump_enable(uint8_t port, uint16_t queue, uint32_t flags,\n  */\n \n int\n-rte_pdump_disable(uint8_t port, uint16_t queue, uint32_t flags);\n+rte_pdump_disable(uint16_t port, uint16_t queue, uint32_t flags);\n \n /**\n  * Enables packet capturing on given device id and queue.\ndiff --git a/lib/librte_port/rte_port_ethdev.c b/lib/librte_port/rte_port_ethdev.c\nindex d5c5fba55..4ed10f276 100644\n--- a/lib/librte_port/rte_port_ethdev.c\n+++ b/lib/librte_port/rte_port_ethdev.c\n@@ -60,7 +60,7 @@ struct rte_port_ethdev_reader {\n \tstruct rte_port_in_stats stats;\n \n \tuint16_t queue_id;\n-\tuint8_t port_id;\n+\tuint16_t port_id;\n };\n \n static void *\n@@ -156,7 +156,7 @@ struct rte_port_ethdev_writer {\n \tuint16_t tx_buf_count;\n \tuint64_t bsz_mask;\n \tuint16_t queue_id;\n-\tuint8_t port_id;\n+\tuint16_t port_id;\n };\n \n static void *\n@@ -337,7 +337,7 @@ struct rte_port_ethdev_writer_nodrop {\n \tuint64_t bsz_mask;\n \tuint64_t n_retries;\n \tuint16_t queue_id;\n-\tuint8_t port_id;\n+\tuint16_t port_id;\n };\n \n static void *\ndiff --git a/lib/librte_port/rte_port_ethdev.h b/lib/librte_port/rte_port_ethdev.h\nindex 201a79e41..f5ed9ab2d 100644\n--- a/lib/librte_port/rte_port_ethdev.h\n+++ b/lib/librte_port/rte_port_ethdev.h\n@@ -54,7 +54,7 @@ extern \"C\" {\n /** ethdev_reader port parameters */\n struct rte_port_ethdev_reader_params {\n \t/** NIC RX port ID */\n-\tuint8_t port_id;\n+\tuint16_t port_id;\n \n \t/** NIC RX queue ID */\n \tuint16_t queue_id;\n@@ -66,7 +66,7 @@ extern struct rte_port_in_ops rte_port_ethdev_reader_ops;\n /** ethdev_writer port parameters */\n struct rte_port_ethdev_writer_params {\n \t/** NIC RX port ID */\n-\tuint8_t port_id;\n+\tuint16_t port_id;\n \n \t/** NIC RX queue ID */\n \tuint16_t queue_id;\n@@ -82,7 +82,7 @@ extern struct rte_port_out_ops rte_port_ethdev_writer_ops;\n /** ethdev_writer_nodrop port parameters */\n struct rte_port_ethdev_writer_nodrop_params {\n \t/** NIC RX port ID */\n-\tuint8_t port_id;\n+\tuint16_t port_id;\n \n \t/** NIC RX queue ID */\n \tuint16_t queue_id;\n",
    "prefixes": [
        "dpdk-dev",
        "v2",
        "1/4"
    ]
}