ethdev: add API to retrieve queue information
[dpdk.git] / lib / librte_ether / rte_ethdev.c
index fbe2286..39f65bf 100644 (file)
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
+ *
+ *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
@@ -17,7 +17,7 @@
  *     * Neither the name of Intel Corporation nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -41,6 +41,7 @@
 #include <errno.h>
 #include <stdint.h>
 #include <inttypes.h>
+#include <netinet/in.h>
 
 #include <rte_byteorder.h>
 #include <rte_log.h>
@@ -51,7 +52,6 @@
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
 #include <rte_launch.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
 #include <rte_lcore.h>
@@ -64,6 +64,7 @@
 #include <rte_mbuf.h>
 #include <rte_errno.h>
 #include <rte_spinlock.h>
+#include <rte_string_fns.h>
 
 #include "rte_ether.h"
 #include "rte_ethdev.h"
                PMD_DEBUG_TRACE("Cannot run in secondary processes\n"); \
                return (retval); \
        } \
-} while(0)
+} while (0)
+
 #define PROC_PRIMARY_OR_RET() do { \
        if (rte_eal_process_type() != RTE_PROC_PRIMARY) { \
                PMD_DEBUG_TRACE("Cannot run in secondary processes\n"); \
                return; \
        } \
-} while(0)
+} while (0)
 
-/* Macros to check for invlaid function pointers in dev_ops structure */
+/* Macros to check for invalid function pointers in dev_ops structure */
 #define FUNC_PTR_OR_ERR_RET(func, retval) do { \
        if ((func) == NULL) { \
                PMD_DEBUG_TRACE("Function not supported\n"); \
                return (retval); \
        } \
-} while(0)
+} while (0)
+
 #define FUNC_PTR_OR_RET(func) do { \
        if ((func) == NULL) { \
                PMD_DEBUG_TRACE("Function not supported\n"); \
                return; \
        } \
-} while(0)
+} while (0)
+
+/* Macros to check for valid port */
+#define VALID_PORTID_OR_ERR_RET(port_id, retval) do {          \
+       if (!rte_eth_dev_is_valid_port(port_id)) {              \
+               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); \
+               return retval;                                  \
+       }                                                       \
+} while (0)
+
+#define VALID_PORTID_OR_RET(port_id) do {                      \
+       if (!rte_eth_dev_is_valid_port(port_id)) {              \
+               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); \
+               return;                                         \
+       }                                                       \
+} while (0)
 
 static const char *MZ_RTE_ETH_DEV_DATA = "rte_eth_dev_data";
 struct rte_eth_dev rte_eth_devices[RTE_MAX_ETHPORTS];
-static struct rte_eth_dev_data *rte_eth_dev_data = NULL;
-static uint8_t nb_ports = 0;
+static struct rte_eth_dev_data *rte_eth_dev_data;
+static uint8_t nb_ports;
 
 /* spinlock for eth device callbacks */
 static rte_spinlock_t rte_eth_dev_cb_lock = RTE_SPINLOCK_INITIALIZER;
 
+/* store statistics names and its offset in stats structure  */
+struct rte_eth_xstats_name_off {
+       char name[RTE_ETH_XSTATS_NAME_SIZE];
+       unsigned offset;
+};
+
+static const struct rte_eth_xstats_name_off rte_stats_strings[] = {
+       {"rx_packets", offsetof(struct rte_eth_stats, ipackets)},
+       {"tx_packets", offsetof(struct rte_eth_stats, opackets)},
+       {"rx_bytes", offsetof(struct rte_eth_stats, ibytes)},
+       {"tx_bytes", offsetof(struct rte_eth_stats, obytes)},
+       {"tx_errors", offsetof(struct rte_eth_stats, oerrors)},
+       {"rx_errors", offsetof(struct rte_eth_stats, ierrors)},
+       {"alloc_rx_buff_failed", offsetof(struct rte_eth_stats, rx_nombuf)},
+};
+#define RTE_NB_STATS (sizeof(rte_stats_strings) / sizeof(rte_stats_strings[0]))
+
+static const struct rte_eth_xstats_name_off rte_rxq_stats_strings[] = {
+       {"rx_packets", offsetof(struct rte_eth_stats, q_ipackets)},
+       {"rx_bytes", offsetof(struct rte_eth_stats, q_ibytes)},
+};
+#define RTE_NB_RXQ_STATS (sizeof(rte_rxq_stats_strings) /      \
+               sizeof(rte_rxq_stats_strings[0]))
+
+static const struct rte_eth_xstats_name_off rte_txq_stats_strings[] = {
+       {"tx_packets", offsetof(struct rte_eth_stats, q_opackets)},
+       {"tx_bytes", offsetof(struct rte_eth_stats, q_obytes)},
+       {"tx_errors", offsetof(struct rte_eth_stats, q_errors)},
+};
+#define RTE_NB_TXQ_STATS (sizeof(rte_txq_stats_strings) /      \
+               sizeof(rte_txq_stats_strings[0]))
+
+
 /**
  * The user application callback description.
  *
@@ -131,13 +182,18 @@ enum {
        STAT_QMAP_RX
 };
 
-static inline void
+enum {
+       DEV_DETACHED = 0,
+       DEV_ATTACHED
+};
+
+static void
 rte_eth_dev_data_alloc(void)
 {
        const unsigned flags = 0;
        const struct rte_memzone *mz;
 
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY){
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
                mz = rte_memzone_reserve(MZ_RTE_ETH_DEV_DATA,
                                RTE_MAX_ETHPORTS * sizeof(*rte_eth_dev_data),
                                rte_socket_id(), flags);
@@ -152,43 +208,114 @@ rte_eth_dev_data_alloc(void)
                                RTE_MAX_ETHPORTS * sizeof(*rte_eth_dev_data));
 }
 
-static inline struct rte_eth_dev *
-rte_eth_dev_allocate(void)
+struct rte_eth_dev *
+rte_eth_dev_allocated(const char *name)
+{
+       unsigned i;
+
+       for (i = 0; i < RTE_MAX_ETHPORTS; i++) {
+               if ((rte_eth_devices[i].attached == DEV_ATTACHED) &&
+                   strcmp(rte_eth_devices[i].data->name, name) == 0)
+                       return &rte_eth_devices[i];
+       }
+       return NULL;
+}
+
+static uint8_t
+rte_eth_dev_find_free_port(void)
+{
+       unsigned i;
+
+       for (i = 0; i < RTE_MAX_ETHPORTS; i++) {
+               if (rte_eth_devices[i].attached == DEV_DETACHED)
+                       return i;
+       }
+       return RTE_MAX_ETHPORTS;
+}
+
+struct rte_eth_dev *
+rte_eth_dev_allocate(const char *name, enum rte_eth_dev_type type)
 {
+       uint8_t port_id;
        struct rte_eth_dev *eth_dev;
 
-       if (nb_ports == RTE_MAX_ETHPORTS) {
-               PMD_DEBUG_TRACE("Reached maximum number of ethernet ports\n");
+       port_id = rte_eth_dev_find_free_port();
+       if (port_id == RTE_MAX_ETHPORTS) {
+               PMD_DEBUG_TRACE("Reached maximum number of Ethernet ports\n");
                return NULL;
        }
 
        if (rte_eth_dev_data == NULL)
                rte_eth_dev_data_alloc();
 
-       eth_dev = &rte_eth_devices[nb_ports];
-       eth_dev->data = &rte_eth_dev_data[nb_ports];
-       eth_dev->data->port_id = nb_ports++;
+       if (rte_eth_dev_allocated(name) != NULL) {
+               PMD_DEBUG_TRACE("Ethernet Device with name %s already allocated!\n",
+                               name);
+               return NULL;
+       }
+
+       eth_dev = &rte_eth_devices[port_id];
+       eth_dev->data = &rte_eth_dev_data[port_id];
+       snprintf(eth_dev->data->name, sizeof(eth_dev->data->name), "%s", name);
+       eth_dev->data->port_id = port_id;
+       eth_dev->attached = DEV_ATTACHED;
+       eth_dev->dev_type = type;
+       nb_ports++;
        return eth_dev;
 }
 
+static int
+rte_eth_dev_create_unique_device_name(char *name, size_t size,
+               struct rte_pci_device *pci_dev)
+{
+       int ret;
+
+       if ((name == NULL) || (pci_dev == NULL))
+               return -EINVAL;
+
+       ret = snprintf(name, size, "%d:%d.%d",
+                       pci_dev->addr.bus, pci_dev->addr.devid,
+                       pci_dev->addr.function);
+       if (ret < 0)
+               return ret;
+       return 0;
+}
+
+int
+rte_eth_dev_release_port(struct rte_eth_dev *eth_dev)
+{
+       if (eth_dev == NULL)
+               return -EINVAL;
+
+       eth_dev->attached = DEV_DETACHED;
+       nb_ports--;
+       return 0;
+}
+
 static int
 rte_eth_dev_init(struct rte_pci_driver *pci_drv,
                 struct rte_pci_device *pci_dev)
 {
        struct eth_driver    *eth_drv;
        struct rte_eth_dev *eth_dev;
+       char ethdev_name[RTE_ETH_NAME_MAX_LEN];
+
        int diag;
 
        eth_drv = (struct eth_driver *)pci_drv;
 
-       eth_dev = rte_eth_dev_allocate();
+       /* Create unique Ethernet device name using PCI address */
+       rte_eth_dev_create_unique_device_name(ethdev_name,
+                       sizeof(ethdev_name), pci_dev);
+
+       eth_dev = rte_eth_dev_allocate(ethdev_name, RTE_ETH_DEV_PCI);
        if (eth_dev == NULL)
                return -ENOMEM;
 
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY){
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
                eth_dev->data->dev_private = rte_zmalloc("ethdev private structure",
                                  eth_drv->dev_private_size,
-                                 CACHE_LINE_SIZE);
+                                 RTE_CACHE_LINE_SIZE);
                if (eth_dev->data->dev_private == NULL)
                        rte_panic("Cannot allocate memzone for private port data\n");
        }
@@ -197,28 +324,69 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv,
        eth_dev->data->rx_mbuf_alloc_failed = 0;
 
        /* init user callbacks */
-       TAILQ_INIT(&(eth_dev->callbacks));
+       TAILQ_INIT(&(eth_dev->link_intr_cbs));
 
        /*
-        * Set the default maximum frame size.
+        * Set the default MTU.
         */
-       eth_dev->data->max_frame_size = ETHER_MAX_LEN;
+       eth_dev->data->mtu = ETHER_MTU;
 
        /* Invoke PMD device initialization function */
-       diag = (*eth_drv->eth_dev_init)(eth_drv, eth_dev);
+       diag = (*eth_drv->eth_dev_init)(eth_dev);
        if (diag == 0)
-               return (0);
+               return 0;
 
-       PMD_DEBUG_TRACE("driver %s: eth_dev_init(vendor_id=0x%u device_id=0x%x)"
-                       " failed\n", pci_drv->name,
+       PMD_DEBUG_TRACE("driver %s: eth_dev_init(vendor_id=0x%u device_id=0x%x) failed\n",
+                       pci_drv->name,
                        (unsigned) pci_dev->id.vendor_id,
                        (unsigned) pci_dev->id.device_id);
        if (rte_eal_process_type() == RTE_PROC_PRIMARY)
                rte_free(eth_dev->data->dev_private);
-       nb_ports--;
+       rte_eth_dev_release_port(eth_dev);
        return diag;
 }
 
+static int
+rte_eth_dev_uninit(struct rte_pci_device *pci_dev)
+{
+       const struct eth_driver *eth_drv;
+       struct rte_eth_dev *eth_dev;
+       char ethdev_name[RTE_ETH_NAME_MAX_LEN];
+       int ret;
+
+       if (pci_dev == NULL)
+               return -EINVAL;
+
+       /* Create unique Ethernet device name using PCI address */
+       rte_eth_dev_create_unique_device_name(ethdev_name,
+                       sizeof(ethdev_name), pci_dev);
+
+       eth_dev = rte_eth_dev_allocated(ethdev_name);
+       if (eth_dev == NULL)
+               return -ENODEV;
+
+       eth_drv = (const struct eth_driver *)pci_dev->driver;
+
+       /* Invoke PMD device uninit function */
+       if (*eth_drv->eth_dev_uninit) {
+               ret = (*eth_drv->eth_dev_uninit)(eth_dev);
+               if (ret)
+                       return ret;
+       }
+
+       /* free ether device */
+       rte_eth_dev_release_port(eth_dev);
+
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+               rte_free(eth_dev->data->dev_private);
+
+       eth_dev->pci_dev = NULL;
+       eth_dev->driver = NULL;
+       eth_dev->data = NULL;
+
+       return 0;
+}
+
 /**
  * Register an Ethernet [Poll Mode] driver.
  *
@@ -237,13 +405,24 @@ void
 rte_eth_driver_register(struct eth_driver *eth_drv)
 {
        eth_drv->pci_drv.devinit = rte_eth_dev_init;
+       eth_drv->pci_drv.devuninit = rte_eth_dev_uninit;
        rte_eal_pci_register(&eth_drv->pci_drv);
 }
 
+int
+rte_eth_dev_is_valid_port(uint8_t port_id)
+{
+       if (port_id >= RTE_MAX_ETHPORTS ||
+           rte_eth_devices[port_id].attached != DEV_ATTACHED)
+               return 0;
+       else
+               return 1;
+}
+
 int
 rte_eth_dev_socket_id(uint8_t port_id)
 {
-       if (port_id >= nb_ports)
+       if (!rte_eth_dev_is_valid_port(port_id))
                return -1;
        return rte_eth_devices[port_id].pci_dev->numa_node;
 }
@@ -251,7 +430,282 @@ rte_eth_dev_socket_id(uint8_t port_id)
 uint8_t
 rte_eth_dev_count(void)
 {
-       return (nb_ports);
+       return nb_ports;
+}
+
+static enum rte_eth_dev_type
+rte_eth_dev_get_device_type(uint8_t port_id)
+{
+       if (!rte_eth_dev_is_valid_port(port_id))
+               return RTE_ETH_DEV_UNKNOWN;
+       return rte_eth_devices[port_id].dev_type;
+}
+
+static int
+rte_eth_dev_save(struct rte_eth_dev *devs, size_t size)
+{
+       if ((devs == NULL) ||
+           (size != sizeof(struct rte_eth_dev) * RTE_MAX_ETHPORTS))
+               return -EINVAL;
+
+       /* save current rte_eth_devices */
+       memcpy(devs, rte_eth_devices, size);
+       return 0;
+}
+
+static int
+rte_eth_dev_get_changed_port(struct rte_eth_dev *devs, uint8_t *port_id)
+{
+       if ((devs == NULL) || (port_id == NULL))
+               return -EINVAL;
+
+       /* check which port was attached or detached */
+       for (*port_id = 0; *port_id < RTE_MAX_ETHPORTS; (*port_id)++, devs++) {
+               if (rte_eth_devices[*port_id].attached ^ devs->attached)
+                       return 0;
+       }
+       return -ENODEV;
+}
+
+static int
+rte_eth_dev_get_addr_by_port(uint8_t port_id, struct rte_pci_addr *addr)
+{
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
+
+       if (addr == NULL) {
+               PMD_DEBUG_TRACE("Null pointer is specified\n");
+               return -EINVAL;
+       }
+
+       *addr = rte_eth_devices[port_id].pci_dev->addr;
+       return 0;
+}
+
+static int
+rte_eth_dev_get_name_by_port(uint8_t port_id, char *name)
+{
+       char *tmp;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
+
+       if (name == NULL) {
+               PMD_DEBUG_TRACE("Null pointer is specified\n");
+               return -EINVAL;
+       }
+
+       /* shouldn't check 'rte_eth_devices[i].data',
+        * because it might be overwritten by VDEV PMD */
+       tmp = rte_eth_dev_data[port_id].name;
+       strcpy(name, tmp);
+       return 0;
+}
+
+static int
+rte_eth_dev_is_detachable(uint8_t port_id)
+{
+       uint32_t drv_flags;
+
+       if (!rte_eth_dev_is_valid_port(port_id)) {
+               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
+               return -EINVAL;
+       }
+
+       if (rte_eth_devices[port_id].dev_type == RTE_ETH_DEV_PCI) {
+               switch (rte_eth_devices[port_id].pci_dev->kdrv) {
+               case RTE_KDRV_IGB_UIO:
+               case RTE_KDRV_UIO_GENERIC:
+               case RTE_KDRV_NIC_UIO:
+                       break;
+               case RTE_KDRV_VFIO:
+               default:
+                       return -ENOTSUP;
+               }
+       }
+
+       drv_flags = rte_eth_devices[port_id].driver->pci_drv.drv_flags;
+       return !(drv_flags & RTE_PCI_DRV_DETACHABLE);
+}
+
+/* attach the new physical device, then store port_id of the device */
+static int
+rte_eth_dev_attach_pdev(struct rte_pci_addr *addr, uint8_t *port_id)
+{
+       uint8_t new_port_id;
+       struct rte_eth_dev devs[RTE_MAX_ETHPORTS];
+
+       if ((addr == NULL) || (port_id == NULL))
+               goto err;
+
+       /* save current port status */
+       if (rte_eth_dev_save(devs, sizeof(devs)))
+               goto err;
+       /* re-construct pci_device_list */
+       if (rte_eal_pci_scan())
+               goto err;
+       /* invoke probe func of the driver can handle the new device.
+        * TODO:
+        * rte_eal_pci_probe_one() should return port_id.
+        * And rte_eth_dev_save() and rte_eth_dev_get_changed_port()
+        * should be removed. */
+       if (rte_eal_pci_probe_one(addr))
+               goto err;
+       /* get port_id enabled by above procedures */
+       if (rte_eth_dev_get_changed_port(devs, &new_port_id))
+               goto err;
+
+       *port_id = new_port_id;
+       return 0;
+err:
+       RTE_LOG(ERR, EAL, "Driver, cannot attach the device\n");
+       return -1;
+}
+
+/* detach the new physical device, then store pci_addr of the device */
+static int
+rte_eth_dev_detach_pdev(uint8_t port_id, struct rte_pci_addr *addr)
+{
+       struct rte_pci_addr freed_addr;
+       struct rte_pci_addr vp;
+
+       if (addr == NULL)
+               goto err;
+
+       /* check whether the driver supports detach feature, or not */
+       if (rte_eth_dev_is_detachable(port_id))
+               goto err;
+
+       /* get pci address by port id */
+       if (rte_eth_dev_get_addr_by_port(port_id, &freed_addr))
+               goto err;
+
+       /* Zeroed pci addr means the port comes from virtual device */
+       vp.domain = vp.bus = vp.devid = vp.function = 0;
+       if (rte_eal_compare_pci_addr(&vp, &freed_addr) == 0)
+               goto err;
+
+       /* invoke devuninit func of the pci driver,
+        * also remove the device from pci_device_list */
+       if (rte_eal_pci_detach(&freed_addr))
+               goto err;
+
+       *addr = freed_addr;
+       return 0;
+err:
+       RTE_LOG(ERR, EAL, "Driver, cannot detach the device\n");
+       return -1;
+}
+
+/* attach the new virtual device, then store port_id of the device */
+static int
+rte_eth_dev_attach_vdev(const char *vdevargs, uint8_t *port_id)
+{
+       char *name = NULL, *args = NULL;
+       uint8_t new_port_id;
+       struct rte_eth_dev devs[RTE_MAX_ETHPORTS];
+       int ret = -1;
+
+       if ((vdevargs == NULL) || (port_id == NULL))
+               goto end;
+
+       /* parse vdevargs, then retrieve device name and args */
+       if (rte_eal_parse_devargs_str(vdevargs, &name, &args))
+               goto end;
+
+       /* save current port status */
+       if (rte_eth_dev_save(devs, sizeof(devs)))
+               goto end;
+       /* walk around dev_driver_list to find the driver of the device,
+        * then invoke probe function o the driver.
+        * TODO:
+        * rte_eal_vdev_init() should return port_id,
+        * And rte_eth_dev_save() and rte_eth_dev_get_changed_port()
+        * should be removed. */
+       if (rte_eal_vdev_init(name, args))
+               goto end;
+       /* get port_id enabled by above procedures */
+       if (rte_eth_dev_get_changed_port(devs, &new_port_id))
+               goto end;
+       ret = 0;
+       *port_id = new_port_id;
+end:
+       if (name)
+               free(name);
+       if (args)
+               free(args);
+
+       if (ret < 0)
+               RTE_LOG(ERR, EAL, "Driver, cannot attach the device\n");
+       return ret;
+}
+
+/* detach the new virtual device, then store the name of the device */
+static int
+rte_eth_dev_detach_vdev(uint8_t port_id, char *vdevname)
+{
+       char name[RTE_ETH_NAME_MAX_LEN];
+
+       if (vdevname == NULL)
+               goto err;
+
+       /* check whether the driver supports detach feature, or not */
+       if (rte_eth_dev_is_detachable(port_id))
+               goto err;
+
+       /* get device name by port id */
+       if (rte_eth_dev_get_name_by_port(port_id, name))
+               goto err;
+       /* walk around dev_driver_list to find the driver of the device,
+        * then invoke uninit function of the driver */
+       if (rte_eal_vdev_uninit(name))
+               goto err;
+
+       strncpy(vdevname, name, sizeof(name));
+       return 0;
+err:
+       RTE_LOG(ERR, EAL, "Driver, cannot detach the device\n");
+       return -1;
+}
+
+/* attach the new device, then store port_id of the device */
+int
+rte_eth_dev_attach(const char *devargs, uint8_t *port_id)
+{
+       struct rte_pci_addr addr;
+
+       if ((devargs == NULL) || (port_id == NULL))
+               return -EINVAL;
+
+       if (eal_parse_pci_DomBDF(devargs, &addr) == 0)
+               return rte_eth_dev_attach_pdev(&addr, port_id);
+       else
+               return rte_eth_dev_attach_vdev(devargs, port_id);
+}
+
+/* detach the device, then store the name of the device */
+int
+rte_eth_dev_detach(uint8_t port_id, char *name)
+{
+       struct rte_pci_addr addr;
+       int ret;
+
+       if (name == NULL)
+               return -EINVAL;
+
+       if (rte_eth_dev_get_device_type(port_id) == RTE_ETH_DEV_PCI) {
+               ret = rte_eth_dev_get_addr_by_port(port_id, &addr);
+               if (ret < 0)
+                       return ret;
+
+               ret = rte_eth_dev_detach_pdev(port_id, &addr);
+               if (ret == 0)
+                       snprintf(name, RTE_ETH_NAME_MAX_LEN,
+                               "%04x:%02x:%02x.%d",
+                               addr.domain, addr.bus,
+                               addr.devid, addr.function);
+
+               return ret;
+       } else
+               return rte_eth_dev_detach_vdev(port_id, name);
 }
 
 static int
@@ -261,244 +715,208 @@ rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
        void **rxq;
        unsigned i;
 
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_release, -ENOTSUP);
-
-       if (dev->data->rx_queues == NULL) {
+       if (dev->data->rx_queues == NULL) { /* first time configuration */
                dev->data->rx_queues = rte_zmalloc("ethdev->rx_queues",
                                sizeof(dev->data->rx_queues[0]) * nb_queues,
-                               CACHE_LINE_SIZE);
+                               RTE_CACHE_LINE_SIZE);
                if (dev->data->rx_queues == NULL) {
                        dev->data->nb_rx_queues = 0;
                        return -(ENOMEM);
                }
-       } else {
+       } else { /* re-configure */
+               FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_release, -ENOTSUP);
+
                rxq = dev->data->rx_queues;
 
                for (i = nb_queues; i < old_nb_queues; i++)
                        (*dev->dev_ops->rx_queue_release)(rxq[i]);
                rxq = rte_realloc(rxq, sizeof(rxq[0]) * nb_queues,
-                               CACHE_LINE_SIZE);
+                               RTE_CACHE_LINE_SIZE);
                if (rxq == NULL)
                        return -(ENOMEM);
+               if (nb_queues > old_nb_queues) {
+                       uint16_t new_qs = nb_queues - old_nb_queues;
 
-               if (nb_queues > old_nb_queues)
                        memset(rxq + old_nb_queues, 0,
-                               sizeof(rxq[0]) * (nb_queues - old_nb_queues));
+                               sizeof(rxq[0]) * new_qs);
+               }
 
                dev->data->rx_queues = rxq;
 
        }
        dev->data->nb_rx_queues = nb_queues;
-       return (0);
+       return 0;
 }
 
-static int
-rte_eth_dev_tx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
+int
+rte_eth_dev_rx_queue_start(uint8_t port_id, uint16_t rx_queue_id)
 {
-       uint16_t old_nb_queues = dev->data->nb_tx_queues;
-       void **txq;
-       unsigned i;
+       struct rte_eth_dev *dev;
 
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_release, -ENOTSUP);
+       /* This function is only safe when called from the primary process
+        * in a multi-process setup*/
+       PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
 
-       if (dev->data->tx_queues == NULL) {
-               dev->data->tx_queues = rte_zmalloc("ethdev->tx_queues",
-                               sizeof(dev->data->tx_queues[0]) * nb_queues,
-                               CACHE_LINE_SIZE);
-               if (dev->data->tx_queues == NULL) {
-                       dev->data->nb_tx_queues = 0;
-                       return -(ENOMEM);
-               }
-       } else {
-               txq = dev->data->tx_queues;
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
-               for (i = nb_queues; i < old_nb_queues; i++)
-                       (*dev->dev_ops->tx_queue_release)(txq[i]);
-               txq = rte_realloc(txq, sizeof(txq[0]) * nb_queues,
-                               CACHE_LINE_SIZE);
-               if (txq == NULL)
-                       return -(ENOMEM);
+       dev = &rte_eth_devices[port_id];
+       if (rx_queue_id >= dev->data->nb_rx_queues) {
+               PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", rx_queue_id);
+               return -EINVAL;
+       }
 
-               if (nb_queues > old_nb_queues)
-                       memset(txq + old_nb_queues, 0,
-                               sizeof(txq[0]) * (nb_queues - old_nb_queues));
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_start, -ENOTSUP);
 
-               dev->data->tx_queues = txq;
+       return dev->dev_ops->rx_queue_start(dev, rx_queue_id);
 
-       }
-       dev->data->nb_tx_queues = nb_queues;
-       return (0);
 }
 
-static int
-rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
-                     const struct rte_eth_conf *dev_conf)
+int
+rte_eth_dev_rx_queue_stop(uint8_t port_id, uint16_t rx_queue_id)
 {
-       struct rte_eth_dev *dev = &rte_eth_devices[port_id];
-
-       if (RTE_ETH_DEV_SRIOV(dev).active != 0) {
-               /* check multi-queue mode */
-               if ((dev_conf->rxmode.mq_mode == ETH_MQ_RX_RSS) || 
-                   (dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB) ||
-                   (dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB_RSS) ||
-                   (dev_conf->txmode.mq_mode == ETH_MQ_TX_DCB)) {
-                       /* SRIOV only works in VMDq enable mode */
-                       PMD_DEBUG_TRACE("ethdev port_id=%d SRIOV active, "
-                                       "wrong VMDQ mq_mode rx %d tx %d\n", 
-                                       port_id, dev_conf->rxmode.mq_mode,
-                                       dev_conf->txmode.mq_mode);
-                       return (-EINVAL);
-               }
+       struct rte_eth_dev *dev;
 
-               switch (dev_conf->rxmode.mq_mode) {
-               case ETH_MQ_RX_VMDQ_RSS:
-               case ETH_MQ_RX_VMDQ_DCB:
-               case ETH_MQ_RX_VMDQ_DCB_RSS:
-                       /* DCB/RSS VMDQ in SRIOV mode, not implement yet */
-                       PMD_DEBUG_TRACE("ethdev port_id=%d SRIOV active, "
-                                       "unsupported VMDQ mq_mode rx %d\n", 
-                                       port_id, dev_conf->rxmode.mq_mode);
-                       return (-EINVAL);
-               default: /* ETH_MQ_RX_VMDQ_ONLY or ETH_MQ_RX_NONE */
-                       /* if nothing mq mode configure, use default scheme */
-                       dev->data->dev_conf.rxmode.mq_mode = ETH_MQ_RX_VMDQ_ONLY;
-                       if (RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool > 1)
-                               RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool = 1;
-                       break;
-               }
+       /* This function is only safe when called from the primary process
+        * in a multi-process setup*/
+       PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
 
-               switch (dev_conf->txmode.mq_mode) {
-               case ETH_MQ_TX_VMDQ_DCB:
-                       /* DCB VMDQ in SRIOV mode, not implement yet */
-                       PMD_DEBUG_TRACE("ethdev port_id=%d SRIOV active, "
-                                       "unsupported VMDQ mq_mode tx %d\n", 
-                                       port_id, dev_conf->txmode.mq_mode);
-                       return (-EINVAL);
-               default: /* ETH_MQ_TX_VMDQ_ONLY or ETH_MQ_TX_NONE */
-                       /* if nothing mq mode configure, use default scheme */
-                       dev->data->dev_conf.txmode.mq_mode = ETH_MQ_TX_VMDQ_ONLY;
-                       if (RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool > 1)
-                               RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool = 1;
-                       break;
-               }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
-               /* check valid queue number */
-               if ((nb_rx_q > RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool) ||
-                   (nb_tx_q > RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool)) {
-                       PMD_DEBUG_TRACE("ethdev port_id=%d SRIOV active, "
-                                   "queue number must less equal to %d\n", 
-                                       port_id, RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool);
-                       return (-EINVAL);
-               }
-       } else {
-               /* For vmdb+dcb mode check our configuration before we go further */
-               if (dev_conf->rxmode.mq_mode == ETH_MQ_RX_VMDQ_DCB) {
-                       const struct rte_eth_vmdq_dcb_conf *conf;
-                       
-                       if (nb_rx_q != ETH_VMDQ_DCB_NUM_QUEUES) {
-                               PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB, nb_rx_q "
-                                               "!= %d\n",
-                                               port_id, ETH_VMDQ_DCB_NUM_QUEUES);
-                               return (-EINVAL);
-                       }
-                       conf = &(dev_conf->rx_adv_conf.vmdq_dcb_conf);
-                       if (! (conf->nb_queue_pools == ETH_16_POOLS ||
-                              conf->nb_queue_pools == ETH_32_POOLS)) {
-                               PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB selected, "
-                                               "nb_queue_pools must be %d or %d\n",
-                                               port_id, ETH_16_POOLS, ETH_32_POOLS);
-                               return (-EINVAL);
-                       }
-               }
-               if (dev_conf->txmode.mq_mode == ETH_MQ_TX_VMDQ_DCB) {
-                       const struct rte_eth_vmdq_dcb_tx_conf *conf;
-                       
-                       if (nb_tx_q != ETH_VMDQ_DCB_NUM_QUEUES) {
-                               PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB, nb_tx_q "
-                                               "!= %d\n",
-                                               port_id, ETH_VMDQ_DCB_NUM_QUEUES);
-                               return (-EINVAL);
-                       }
-                       conf = &(dev_conf->tx_adv_conf.vmdq_dcb_tx_conf);
-                       if (! (conf->nb_queue_pools == ETH_16_POOLS ||
-                              conf->nb_queue_pools == ETH_32_POOLS)) {
-                               PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB selected, "
-                                               "nb_queue_pools != %d or nb_queue_pools "
-                                               "!= %d\n",
-                                               port_id, ETH_16_POOLS, ETH_32_POOLS);
-                               return (-EINVAL);
-                       }
-               }
-               
-               /* For DCB mode check our configuration before we go further */
-               if (dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB) {
-                       const struct rte_eth_dcb_rx_conf *conf;
-                       
-                       if (nb_rx_q != ETH_DCB_NUM_QUEUES) {
-                               PMD_DEBUG_TRACE("ethdev port_id=%d DCB, nb_rx_q "
-                                               "!= %d\n",
-                                               port_id, ETH_DCB_NUM_QUEUES);
-                               return (-EINVAL);
-                       }
-                       conf = &(dev_conf->rx_adv_conf.dcb_rx_conf);
-                       if (! (conf->nb_tcs == ETH_4_TCS ||
-                              conf->nb_tcs == ETH_8_TCS)) {
-                               PMD_DEBUG_TRACE("ethdev port_id=%d DCB selected, "
-                                               "nb_tcs != %d or nb_tcs "
-                                               "!= %d\n",
-                                               port_id, ETH_4_TCS, ETH_8_TCS);
-                               return (-EINVAL);
-                       }
-               }
-               
-               if (dev_conf->txmode.mq_mode == ETH_MQ_TX_DCB) {
-                       const struct rte_eth_dcb_tx_conf *conf;
-                       
-                       if (nb_tx_q != ETH_DCB_NUM_QUEUES) {
-                               PMD_DEBUG_TRACE("ethdev port_id=%d DCB, nb_tx_q "
-                                               "!= %d\n",
-                                               port_id, ETH_DCB_NUM_QUEUES);
-                               return (-EINVAL);
-                       }
-                       conf = &(dev_conf->tx_adv_conf.dcb_tx_conf);
-                       if (! (conf->nb_tcs == ETH_4_TCS ||
-                              conf->nb_tcs == ETH_8_TCS)) {
-                               PMD_DEBUG_TRACE("ethdev port_id=%d DCB selected, "
-                                               "nb_tcs != %d or nb_tcs "
-                                               "!= %d\n",
-                                               port_id, ETH_4_TCS, ETH_8_TCS);
-                               return (-EINVAL);
-                       }
-               }
+       dev = &rte_eth_devices[port_id];
+       if (rx_queue_id >= dev->data->nb_rx_queues) {
+               PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", rx_queue_id);
+               return -EINVAL;
        }
-       return 0;
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_stop, -ENOTSUP);
+
+       return dev->dev_ops->rx_queue_stop(dev, rx_queue_id);
+
 }
 
 int
-rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
-                     const struct rte_eth_conf *dev_conf)
+rte_eth_dev_tx_queue_start(uint8_t port_id, uint16_t tx_queue_id)
 {
        struct rte_eth_dev *dev;
-       struct rte_eth_dev_info dev_info;
-       int diag;
 
        /* This function is only safe when called from the primary process
         * in a multi-process setup*/
        PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
 
-       if (port_id >= nb_ports || port_id >= RTE_MAX_ETHPORTS) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-EINVAL);
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
+
        dev = &rte_eth_devices[port_id];
+       if (tx_queue_id >= dev->data->nb_tx_queues) {
+               PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", tx_queue_id);
+               return -EINVAL;
+       }
 
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_infos_get, -ENOTSUP);
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_configure, -ENOTSUP);
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_start, -ENOTSUP);
 
-       if (dev->data->dev_started) {
-               PMD_DEBUG_TRACE(
-                   "port %d must be stopped to allow configuration\n", port_id);
-               return (-EBUSY);
+       return dev->dev_ops->tx_queue_start(dev, tx_queue_id);
+
+}
+
+int
+rte_eth_dev_tx_queue_stop(uint8_t port_id, uint16_t tx_queue_id)
+{
+       struct rte_eth_dev *dev;
+
+       /* This function is only safe when called from the primary process
+        * in a multi-process setup*/
+       PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
+
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
+
+       dev = &rte_eth_devices[port_id];
+       if (tx_queue_id >= dev->data->nb_tx_queues) {
+               PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", tx_queue_id);
+               return -EINVAL;
+       }
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_stop, -ENOTSUP);
+
+       return dev->dev_ops->tx_queue_stop(dev, tx_queue_id);
+
+}
+
+static int
+rte_eth_dev_tx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
+{
+       uint16_t old_nb_queues = dev->data->nb_tx_queues;
+       void **txq;
+       unsigned i;
+
+       if (dev->data->tx_queues == NULL) { /* first time configuration */
+               dev->data->tx_queues = rte_zmalloc("ethdev->tx_queues",
+                                                  sizeof(dev->data->tx_queues[0]) * nb_queues,
+                                                  RTE_CACHE_LINE_SIZE);
+               if (dev->data->tx_queues == NULL) {
+                       dev->data->nb_tx_queues = 0;
+                       return -(ENOMEM);
+               }
+       } else { /* re-configure */
+               FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_release, -ENOTSUP);
+
+               txq = dev->data->tx_queues;
+
+               for (i = nb_queues; i < old_nb_queues; i++)
+                       (*dev->dev_ops->tx_queue_release)(txq[i]);
+               txq = rte_realloc(txq, sizeof(txq[0]) * nb_queues,
+                                 RTE_CACHE_LINE_SIZE);
+               if (txq == NULL)
+                       return -ENOMEM;
+               if (nb_queues > old_nb_queues) {
+                       uint16_t new_qs = nb_queues - old_nb_queues;
+
+                       memset(txq + old_nb_queues, 0,
+                              sizeof(txq[0]) * new_qs);
+               }
+
+               dev->data->tx_queues = txq;
+
+       }
+       dev->data->nb_tx_queues = nb_queues;
+       return 0;
+}
+
+int
+rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
+                     const struct rte_eth_conf *dev_conf)
+{
+       struct rte_eth_dev *dev;
+       struct rte_eth_dev_info dev_info;
+       int diag;
+
+       /* This function is only safe when called from the primary process
+        * in a multi-process setup*/
+       PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
+
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
+
+       if (nb_rx_q > RTE_MAX_QUEUES_PER_PORT) {
+               PMD_DEBUG_TRACE(
+                       "Number of RX queues requested (%u) is greater than max supported(%d)\n",
+                       nb_rx_q, RTE_MAX_QUEUES_PER_PORT);
+               return -EINVAL;
+       }
+
+       if (nb_tx_q > RTE_MAX_QUEUES_PER_PORT) {
+               PMD_DEBUG_TRACE(
+                       "Number of TX queues requested (%u) is greater than max supported(%d)\n",
+                       nb_tx_q, RTE_MAX_QUEUES_PER_PORT);
+               return -EINVAL;
+       }
+
+       dev = &rte_eth_devices[port_id];
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_infos_get, -ENOTSUP);
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_configure, -ENOTSUP);
+
+       if (dev->data->dev_started) {
+               PMD_DEBUG_TRACE(
+                   "port %d must be stopped to allow configuration\n", port_id);
+               return -EBUSY;
        }
 
        /*
@@ -510,26 +928,40 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
        if (nb_rx_q > dev_info.max_rx_queues) {
                PMD_DEBUG_TRACE("ethdev port_id=%d nb_rx_queues=%d > %d\n",
                                port_id, nb_rx_q, dev_info.max_rx_queues);
-               return (-EINVAL);
+               return -EINVAL;
        }
        if (nb_rx_q == 0) {
                PMD_DEBUG_TRACE("ethdev port_id=%d nb_rx_q == 0\n", port_id);
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        if (nb_tx_q > dev_info.max_tx_queues) {
                PMD_DEBUG_TRACE("ethdev port_id=%d nb_tx_queues=%d > %d\n",
                                port_id, nb_tx_q, dev_info.max_tx_queues);
-               return (-EINVAL);
+               return -EINVAL;
        }
        if (nb_tx_q == 0) {
                PMD_DEBUG_TRACE("ethdev port_id=%d nb_tx_q == 0\n", port_id);
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        /* Copy the dev_conf parameter into the dev structure */
        memcpy(&dev->data->dev_conf, dev_conf, sizeof(dev->data->dev_conf));
 
+       /*
+        * If link state interrupt is enabled, check that the
+        * device supports it.
+        */
+       if (dev_conf->intr_conf.lsc == 1) {
+               const struct rte_pci_driver *pci_drv = &dev->driver->pci_drv;
+
+               if (!(pci_drv->drv_flags & RTE_PCI_DRV_INTR_LSC)) {
+                       PMD_DEBUG_TRACE("driver %s does not support lsc\n",
+                                       pci_drv->name);
+                       return -EINVAL;
+               }
+       }
+
        /*
         * If jumbo frames are enabled, check that the maximum RX packet
         * length is supported by the configured device.
@@ -542,26 +974,21 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                                port_id,
                                (unsigned)dev_conf->rxmode.max_rx_pkt_len,
                                (unsigned)dev_info.max_rx_pktlen);
-                       return (-EINVAL);
-               }
-               else if (dev_conf->rxmode.max_rx_pkt_len < ETHER_MIN_LEN) {
+                       return -EINVAL;
+               } else if (dev_conf->rxmode.max_rx_pkt_len < ETHER_MIN_LEN) {
                        PMD_DEBUG_TRACE("ethdev port_id=%d max_rx_pkt_len %u"
                                " < min valid value %u\n",
                                port_id,
                                (unsigned)dev_conf->rxmode.max_rx_pkt_len,
                                (unsigned)ETHER_MIN_LEN);
-                       return (-EINVAL);
+                       return -EINVAL;
                }
-       } else
-               /* Use default value */
-               dev->data->dev_conf.rxmode.max_rx_pkt_len = ETHER_MAX_LEN;
-
-       /* multipe queue mode checking */
-       diag = rte_eth_dev_check_mq_mode(port_id, nb_rx_q, nb_tx_q, dev_conf);
-       if (diag != 0) {
-               PMD_DEBUG_TRACE("port%d rte_eth_dev_check_mq_mode = %d\n",
-                               port_id, diag);
-               return diag;
+       } else {
+               if (dev_conf->rxmode.max_rx_pkt_len < ETHER_MIN_LEN ||
+                       dev_conf->rxmode.max_rx_pkt_len > ETHER_MAX_LEN)
+                       /* Use default value */
+                       dev->data->dev_conf.rxmode.max_rx_pkt_len =
+                                                       ETHER_MAX_LEN;
        }
 
        /*
@@ -619,7 +1046,8 @@ rte_eth_dev_config_restore(uint8_t port_id)
                        continue;
 
                /* add address to the hardware */
-               if  (*dev->dev_ops->mac_addr_add)
+               if  (*dev->dev_ops->mac_addr_add &&
+                       (dev->data->mac_pool_sel[i] & (1ULL << pool)))
                        (*dev->dev_ops->mac_addr_add)(dev, &addr, i, pool);
                else {
                        PMD_DEBUG_TRACE("port %d: MAC address array not supported\n",
@@ -635,7 +1063,7 @@ rte_eth_dev_config_restore(uint8_t port_id)
        else if (rte_eth_promiscuous_get(port_id) == 0)
                rte_eth_promiscuous_disable(port_id);
 
-       /* replay allmulticast configuration */
+       /* replay all multicast configuration */
        if (rte_eth_allmulticast_get(port_id) == 1)
                rte_eth_allmulticast_enable(port_id);
        else if (rte_eth_allmulticast_get(port_id) == 0)
@@ -652,13 +1080,19 @@ rte_eth_dev_start(uint8_t port_id)
         * in a multi-process setup*/
        PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-EINVAL);
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
+
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_start, -ENOTSUP);
+
+       if (dev->data->dev_started != 0) {
+               PMD_DEBUG_TRACE("Device with port_id=%" PRIu8
+                       " already started\n",
+                       port_id);
+               return 0;
+       }
+
        diag = (*dev->dev_ops->dev_start)(dev);
        if (diag == 0)
                dev->data->dev_started = 1;
@@ -667,6 +1101,10 @@ rte_eth_dev_start(uint8_t port_id)
 
        rte_eth_dev_config_restore(port_id);
 
+       if (dev->data->dev_conf.intr_conf.lsc != 0) {
+               FUNC_PTR_OR_ERR_RET(*dev->dev_ops->link_update, -ENOTSUP);
+               (*dev->dev_ops->link_update)(dev, 0);
+       }
        return 0;
 }
 
@@ -679,17 +1117,56 @@ rte_eth_dev_stop(uint8_t port_id)
         * in a multi-process setup*/
        PROC_PRIMARY_OR_RET();
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
+       VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_RET(*dev->dev_ops->dev_stop);
+
+       if (dev->data->dev_started == 0) {
+               PMD_DEBUG_TRACE("Device with port_id=%" PRIu8
+                       " already stopped\n",
+                       port_id);
+               return;
+       }
+
        dev->data->dev_started = 0;
        (*dev->dev_ops->dev_stop)(dev);
 }
 
+int
+rte_eth_dev_set_link_up(uint8_t port_id)
+{
+       struct rte_eth_dev *dev;
+
+       /* This function is only safe when called from the primary process
+        * in a multi-process setup*/
+       PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
+
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
+
+       dev = &rte_eth_devices[port_id];
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_set_link_up, -ENOTSUP);
+       return (*dev->dev_ops->dev_set_link_up)(dev);
+}
+
+int
+rte_eth_dev_set_link_down(uint8_t port_id)
+{
+       struct rte_eth_dev *dev;
+
+       /* This function is only safe when called from the primary process
+        * in a multi-process setup*/
+       PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
+
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
+
+       dev = &rte_eth_devices[port_id];
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_set_link_down, -ENOTSUP);
+       return (*dev->dev_ops->dev_set_link_down)(dev);
+}
+
 void
 rte_eth_dev_close(uint8_t port_id)
 {
@@ -699,16 +1176,17 @@ rte_eth_dev_close(uint8_t port_id)
         * in a multi-process setup*/
        PROC_PRIMARY_OR_RET();
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
-
+       VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_RET(*dev->dev_ops->dev_close);
        dev->data->dev_started = 0;
        (*dev->dev_ops->dev_close)(dev);
+
+       rte_free(dev->data->rx_queues);
+       dev->data->rx_queues = NULL;
+       rte_free(dev->data->tx_queues);
+       dev->data->tx_queues = NULL;
 }
 
 int
@@ -717,22 +1195,21 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,
                       const struct rte_eth_rxconf *rx_conf,
                       struct rte_mempool *mp)
 {
+       int ret;
+       uint32_t mbp_buf_size;
        struct rte_eth_dev *dev;
-       struct rte_pktmbuf_pool_private *mbp_priv;
        struct rte_eth_dev_info dev_info;
 
        /* This function is only safe when called from the primary process
         * in a multi-process setup*/
        PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-EINVAL);
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
+
        dev = &rte_eth_devices[port_id];
        if (rx_queue_id >= dev->data->nb_rx_queues) {
                PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", rx_queue_id);
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        if (dev->data->dev_started) {
@@ -749,31 +1226,53 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,
         * This value must be provided in the private data of the memory pool.
         * First check that the memory pool has a valid private data.
         */
-       (*dev->dev_ops->dev_infos_get)(dev, &dev_info);
+       rte_eth_dev_info_get(port_id, &dev_info);
        if (mp->private_data_size < sizeof(struct rte_pktmbuf_pool_private)) {
                PMD_DEBUG_TRACE("%s private_data_size %d < %d\n",
                                mp->name, (int) mp->private_data_size,
                                (int) sizeof(struct rte_pktmbuf_pool_private));
-               return (-ENOSPC);
+               return -ENOSPC;
        }
-       mbp_priv = (struct rte_pktmbuf_pool_private *)
-               ((char *)mp + sizeof(struct rte_mempool));
-       if ((uint32_t) (mbp_priv->mbuf_data_room_size - RTE_PKTMBUF_HEADROOM) <
-           dev_info.min_rx_bufsize) {
+       mbp_buf_size = rte_pktmbuf_data_room_size(mp);
+
+       if ((mbp_buf_size - RTE_PKTMBUF_HEADROOM) < dev_info.min_rx_bufsize) {
                PMD_DEBUG_TRACE("%s mbuf_data_room_size %d < %d "
                                "(RTE_PKTMBUF_HEADROOM=%d + min_rx_bufsize(dev)"
                                "=%d)\n",
                                mp->name,
-                               (int)mbp_priv->mbuf_data_room_size,
+                               (int)mbp_buf_size,
                                (int)(RTE_PKTMBUF_HEADROOM +
                                      dev_info.min_rx_bufsize),
                                (int)RTE_PKTMBUF_HEADROOM,
                                (int)dev_info.min_rx_bufsize);
-               return (-EINVAL);
+               return -EINVAL;
+       }
+
+       if (nb_rx_desc > dev_info.rx_desc_lim.nb_max ||
+                       nb_rx_desc < dev_info.rx_desc_lim.nb_min ||
+                       nb_rx_desc % dev_info.rx_desc_lim.nb_align != 0) {
+
+               PMD_DEBUG_TRACE("Invalid value for nb_rx_desc(=%hu), "
+                       "should be: <= %hu, = %hu, and a product of %hu\n",
+                       nb_rx_desc,
+                       dev_info.rx_desc_lim.nb_max,
+                       dev_info.rx_desc_lim.nb_min,
+                       dev_info.rx_desc_lim.nb_align);
+               return -EINVAL;
+       }
+
+       if (rx_conf == NULL)
+               rx_conf = &dev_info.default_rxconf;
+
+       ret = (*dev->dev_ops->rx_queue_setup)(dev, rx_queue_id, nb_rx_desc,
+                                             socket_id, rx_conf, mp);
+       if (!ret) {
+               if (!dev->data->min_rx_buf_size ||
+                   dev->data->min_rx_buf_size > mbp_buf_size)
+                       dev->data->min_rx_buf_size = mbp_buf_size;
        }
 
-       return (*dev->dev_ops->rx_queue_setup)(dev, rx_queue_id, nb_rx_desc,
-                                              socket_id, rx_conf, mp);
+       return ret;
 }
 
 int
@@ -782,19 +1281,18 @@ rte_eth_tx_queue_setup(uint8_t port_id, uint16_t tx_queue_id,
                       const struct rte_eth_txconf *tx_conf)
 {
        struct rte_eth_dev *dev;
+       struct rte_eth_dev_info dev_info;
 
        /* This function is only safe when called from the primary process
         * in a multi-process setup*/
        PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
 
-       if (port_id >= RTE_MAX_ETHPORTS || port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-EINVAL);
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
+
        dev = &rte_eth_devices[port_id];
        if (tx_queue_id >= dev->data->nb_tx_queues) {
                PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", tx_queue_id);
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        if (dev->data->dev_started) {
@@ -803,7 +1301,14 @@ rte_eth_tx_queue_setup(uint8_t port_id, uint16_t tx_queue_id,
                return -EBUSY;
        }
 
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_infos_get, -ENOTSUP);
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_setup, -ENOTSUP);
+
+       rte_eth_dev_info_get(port_id, &dev_info);
+
+       if (tx_conf == NULL)
+               tx_conf = &dev_info.default_txconf;
+
        return (*dev->dev_ops->tx_queue_setup)(dev, tx_queue_id, nb_tx_desc,
                                               socket_id, tx_conf);
 }
@@ -813,10 +1318,7 @@ rte_eth_promiscuous_enable(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
+       VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_RET(*dev->dev_ops->promiscuous_enable);
@@ -829,10 +1331,7 @@ rte_eth_promiscuous_disable(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
+       VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_RET(*dev->dev_ops->promiscuous_disable);
@@ -845,10 +1344,7 @@ rte_eth_promiscuous_get(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -1;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
        dev = &rte_eth_devices[port_id];
        return dev->data->promiscuous;
@@ -859,10 +1355,7 @@ rte_eth_allmulticast_enable(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
+       VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_RET(*dev->dev_ops->allmulticast_enable);
@@ -875,10 +1368,7 @@ rte_eth_allmulticast_disable(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
+       VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_RET(*dev->dev_ops->allmulticast_disable);
@@ -891,10 +1381,7 @@ rte_eth_allmulticast_get(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -1;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
        dev = &rte_eth_devices[port_id];
        return dev->data->all_multicast;
@@ -919,16 +1406,13 @@ rte_eth_link_get(uint8_t port_id, struct rte_eth_link *eth_link)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
+       VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
-       FUNC_PTR_OR_RET(*dev->dev_ops->link_update);
 
        if (dev->data->dev_conf.intr_conf.lsc != 0)
                rte_eth_dev_atomic_read_link_status(dev, eth_link);
        else {
+               FUNC_PTR_OR_RET(*dev->dev_ops->link_update);
                (*dev->dev_ops->link_update)(dev, 1);
                *eth_link = dev->data->dev_link;
        }
@@ -939,36 +1423,32 @@ rte_eth_link_get_nowait(uint8_t port_id, struct rte_eth_link *eth_link)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
+       VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
-       FUNC_PTR_OR_RET(*dev->dev_ops->link_update);
 
        if (dev->data->dev_conf.intr_conf.lsc != 0)
                rte_eth_dev_atomic_read_link_status(dev, eth_link);
        else {
+               FUNC_PTR_OR_RET(*dev->dev_ops->link_update);
                (*dev->dev_ops->link_update)(dev, 0);
                *eth_link = dev->data->dev_link;
        }
 }
 
-void
+int
 rte_eth_stats_get(uint8_t port_id, struct rte_eth_stats *stats)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
+
        dev = &rte_eth_devices[port_id];
        memset(stats, 0, sizeof(*stats));
 
-       FUNC_PTR_OR_RET(*dev->dev_ops->stats_get);
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->stats_get, -ENOTSUP);
        (*dev->dev_ops->stats_get)(dev, stats);
        stats->rx_nombuf = dev->data->rx_mbuf_alloc_failed;
+       return 0;
 }
 
 void
@@ -976,16 +1456,111 @@ rte_eth_stats_reset(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
+       VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_RET(*dev->dev_ops->stats_reset);
        (*dev->dev_ops->stats_reset)(dev);
 }
 
+/* retrieve ethdev extended statistics */
+int
+rte_eth_xstats_get(uint8_t port_id, struct rte_eth_xstats *xstats,
+       unsigned n)
+{
+       struct rte_eth_stats eth_stats;
+       struct rte_eth_dev *dev;
+       unsigned count = 0, i, q;
+       signed xcount = 0;
+       uint64_t val, *stats_ptr;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
+
+       dev = &rte_eth_devices[port_id];
+
+       /* Return generic statistics */
+       count = RTE_NB_STATS;
+       count += dev->data->nb_rx_queues * RTE_NB_RXQ_STATS;
+       count += dev->data->nb_tx_queues * RTE_NB_TXQ_STATS;
+
+       /* implemented by the driver */
+       if (dev->dev_ops->xstats_get != NULL) {
+               /* Retrieve the xstats from the driver at the end of the
+                * xstats struct.
+                */
+               xcount = (*dev->dev_ops->xstats_get)(dev, &xstats[count],
+                        (n > count) ? n - count : 0);
+
+               if (xcount < 0)
+                       return xcount;
+       }
+
+       if (n < count + xcount)
+               return count + xcount;
+
+       /* now fill the xstats structure */
+       count = 0;
+       rte_eth_stats_get(port_id, &eth_stats);
+
+       /* global stats */
+       for (i = 0; i < RTE_NB_STATS; i++) {
+               stats_ptr = RTE_PTR_ADD(&eth_stats,
+                                       rte_stats_strings[i].offset);
+               val = *stats_ptr;
+               snprintf(xstats[count].name, sizeof(xstats[count].name),
+                       "%s", rte_stats_strings[i].name);
+               xstats[count++].value = val;
+       }
+
+       /* per-rxq stats */
+       for (q = 0; q < dev->data->nb_rx_queues; q++) {
+               for (i = 0; i < RTE_NB_RXQ_STATS; i++) {
+                       stats_ptr = RTE_PTR_ADD(&eth_stats,
+                                       rte_rxq_stats_strings[i].offset +
+                                       q * sizeof(uint64_t));
+                       val = *stats_ptr;
+                       snprintf(xstats[count].name, sizeof(xstats[count].name),
+                               "rx_queue_%u_%s", q,
+                               rte_rxq_stats_strings[i].name);
+                       xstats[count++].value = val;
+               }
+       }
+
+       /* per-txq stats */
+       for (q = 0; q < dev->data->nb_tx_queues; q++) {
+               for (i = 0; i < RTE_NB_TXQ_STATS; i++) {
+                       stats_ptr = RTE_PTR_ADD(&eth_stats,
+                                       rte_txq_stats_strings[i].offset +
+                                       q * sizeof(uint64_t));
+                       val = *stats_ptr;
+                       snprintf(xstats[count].name, sizeof(xstats[count].name),
+                               "tx_queue_%u_%s", q,
+                               rte_txq_stats_strings[i].name);
+                       xstats[count++].value = val;
+               }
+       }
+
+       return count + xcount;
+}
+
+/* reset ethdev extended statistics */
+void
+rte_eth_xstats_reset(uint8_t port_id)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_RET(port_id);
+       dev = &rte_eth_devices[port_id];
+
+       /* implemented by the driver */
+       if (dev->dev_ops->xstats_reset != NULL) {
+               (*dev->dev_ops->xstats_reset)(dev);
+               return;
+       }
+
+       /* fallback to default */
+       rte_eth_stats_reset(port_id);
+}
 
 static int
 set_queue_stats_mapping(uint8_t port_id, uint16_t queue_id, uint8_t stat_idx,
@@ -993,10 +1568,8 @@ set_queue_stats_mapping(uint8_t port_id, uint16_t queue_id, uint8_t stat_idx,
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_stats_mapping_set, -ENOTSUP);
@@ -1027,17 +1600,24 @@ void
 rte_eth_dev_info_get(uint8_t port_id, struct rte_eth_dev_info *dev_info)
 {
        struct rte_eth_dev *dev;
+       const struct rte_eth_desc_lim lim = {
+               .nb_max = UINT16_MAX,
+               .nb_min = 0,
+               .nb_align = 1,
+       };
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
+       VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
 
+       memset(dev_info, 0, sizeof(struct rte_eth_dev_info));
+       dev_info->rx_desc_lim = lim;
+       dev_info->tx_desc_lim = lim;
+
        FUNC_PTR_OR_RET(*dev->dev_ops->dev_infos_get);
        (*dev->dev_ops->dev_infos_get)(dev, dev_info);
        dev_info->pci_dev = dev->pci_dev;
-       dev_info->driver_name = dev->driver->pci_drv.name;
+       if (dev->driver)
+               dev_info->driver_name = dev->driver->pci_drv.name;
 }
 
 void
@@ -1045,37 +1625,61 @@ rte_eth_macaddr_get(uint8_t port_id, struct ether_addr *mac_addr)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
+       VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
        ether_addr_copy(&dev->data->mac_addrs[0], mac_addr);
 }
 
+
 int
-rte_eth_dev_vlan_filter(uint8_t port_id, uint16_t vlan_id, int on)
+rte_eth_dev_get_mtu(uint8_t port_id, uint16_t *mtu)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+       *mtu = dev->data->mtu;
+       return 0;
+}
+
+int
+rte_eth_dev_set_mtu(uint8_t port_id, uint16_t mtu)
+{
+       int ret;
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+       dev = &rte_eth_devices[port_id];
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mtu_set, -ENOTSUP);
+
+       ret = (*dev->dev_ops->mtu_set)(dev, mtu);
+       if (!ret)
+               dev->data->mtu = mtu;
+
+       return ret;
+}
+
+int
+rte_eth_dev_vlan_filter(uint8_t port_id, uint16_t vlan_id, int on)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
-       if (! (dev->data->dev_conf.rxmode.hw_vlan_filter)) {
+       if (!(dev->data->dev_conf.rxmode.hw_vlan_filter)) {
                PMD_DEBUG_TRACE("port %d: vlan-filtering disabled\n", port_id);
-               return (-ENOSYS);
+               return -ENOSYS;
        }
 
        if (vlan_id > 4095) {
                PMD_DEBUG_TRACE("(port_id=%d) invalid vlan_id=%u > 4095\n",
                                port_id, (unsigned) vlan_id);
-               return (-EINVAL);
+               return -EINVAL;
        }
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_filter_set, -ENOTSUP);
-       (*dev->dev_ops->vlan_filter_set)(dev, vlan_id, on);
-       return (0);
+
+       return (*dev->dev_ops->vlan_filter_set)(dev, vlan_id, on);
 }
 
 int
@@ -1083,21 +1687,17 @@ rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, int o
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
        if (rx_queue_id >= dev->data->nb_rx_queues) {
                PMD_DEBUG_TRACE("Invalid rx_queue_id=%d\n", port_id);
-               return (-EINVAL);
+               return -EINVAL;
        }
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_strip_queue_set, -ENOTSUP);
        (*dev->dev_ops->vlan_strip_queue_set)(dev, rx_queue_id, on);
 
-       return (0);
+       return 0;
 }
 
 int
@@ -1105,16 +1705,12 @@ rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t tpid)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_tpid_set, -ENOTSUP);
        (*dev->dev_ops->vlan_tpid_set)(dev, tpid);
 
-       return (0);
+       return 0;
 }
 
 int
@@ -1124,40 +1720,36 @@ rte_eth_dev_set_vlan_offload(uint8_t port_id, int offload_mask)
        int ret = 0;
        int mask = 0;
        int cur, org = 0;
-       
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
-       }
 
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
 
        /*check which option changed by application*/
        cur = !!(offload_mask & ETH_VLAN_STRIP_OFFLOAD);
        org = !!(dev->data->dev_conf.rxmode.hw_vlan_strip);
-       if (cur != org){
+       if (cur != org) {
                dev->data->dev_conf.rxmode.hw_vlan_strip = (uint8_t)cur;
                mask |= ETH_VLAN_STRIP_MASK;
        }
-       
+
        cur = !!(offload_mask & ETH_VLAN_FILTER_OFFLOAD);
        org = !!(dev->data->dev_conf.rxmode.hw_vlan_filter);
-       if (cur != org){
+       if (cur != org) {
                dev->data->dev_conf.rxmode.hw_vlan_filter = (uint8_t)cur;
                mask |= ETH_VLAN_FILTER_MASK;
        }
 
        cur = !!(offload_mask & ETH_VLAN_EXTEND_OFFLOAD);
        org = !!(dev->data->dev_conf.rxmode.hw_vlan_extend);
-       if (cur != org){
+       if (cur != org) {
                dev->data->dev_conf.rxmode.hw_vlan_extend = (uint8_t)cur;
                mask |= ETH_VLAN_EXTEND_MASK;
        }
 
        /*no change*/
-       if(mask == 0)
+       if (mask == 0)
                return ret;
-       
+
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_offload_set, -ENOTSUP);
        (*dev->dev_ops->vlan_offload_set)(dev, mask);
 
@@ -1170,398 +1762,257 @@ rte_eth_dev_get_vlan_offload(uint8_t port_id)
        struct rte_eth_dev *dev;
        int ret = 0;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
 
        if (dev->data->dev_conf.rxmode.hw_vlan_strip)
-               ret |= ETH_VLAN_STRIP_OFFLOAD ;
+               ret |= ETH_VLAN_STRIP_OFFLOAD;
 
        if (dev->data->dev_conf.rxmode.hw_vlan_filter)
-               ret |= ETH_VLAN_FILTER_OFFLOAD ;
+               ret |= ETH_VLAN_FILTER_OFFLOAD;
 
        if (dev->data->dev_conf.rxmode.hw_vlan_extend)
-               ret |= ETH_VLAN_EXTEND_OFFLOAD ;
+               ret |= ETH_VLAN_EXTEND_OFFLOAD;
 
        return ret;
 }
 
-
 int
-rte_eth_dev_fdir_add_signature_filter(uint8_t port_id,
-                                     struct rte_fdir_filter *fdir_filter,
-                                     uint8_t queue)
+rte_eth_dev_set_vlan_pvid(uint8_t port_id, uint16_t pvid, int on)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_pvid_set, -ENOTSUP);
+       (*dev->dev_ops->vlan_pvid_set)(dev, pvid, on);
 
-       if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_SIGNATURE) {
-               PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n",
-                               port_id, dev->data->dev_conf.fdir_conf.mode);
-               return (-ENOSYS);
-       }
-
-       if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP
-            || fdir_filter->l4type == RTE_FDIR_L4TYPE_NONE)
-           && (fdir_filter->port_src || fdir_filter->port_dst)) {
-               PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \
-                               "None l4type, source & destinations ports " \
-                               "should be null!\n");
-               return (-EINVAL);
-       }
-
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_add_signature_filter, -ENOTSUP);
-       return (*dev->dev_ops->fdir_add_signature_filter)(dev, fdir_filter,
-                                                               queue);
+       return 0;
 }
 
 int
-rte_eth_dev_fdir_update_signature_filter(uint8_t port_id,
-                                        struct rte_fdir_filter *fdir_filter,
-                                        uint8_t queue)
+rte_eth_dev_flow_ctrl_get(uint8_t port_id, struct rte_eth_fc_conf *fc_conf)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
-
-       if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_SIGNATURE) {
-               PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n",
-                               port_id, dev->data->dev_conf.fdir_conf.mode);
-               return (-ENOSYS);
-       }
-
-       if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP
-            || fdir_filter->l4type == RTE_FDIR_L4TYPE_NONE)
-           && (fdir_filter->port_src || fdir_filter->port_dst)) {
-               PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \
-                               "None l4type, source & destinations ports " \
-                               "should be null!\n");
-               return (-EINVAL);
-       }
-
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_update_signature_filter, -ENOTSUP);
-       return (*dev->dev_ops->fdir_update_signature_filter)(dev, fdir_filter,
-                                                               queue);
-
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->flow_ctrl_get, -ENOTSUP);
+       memset(fc_conf, 0, sizeof(*fc_conf));
+       return (*dev->dev_ops->flow_ctrl_get)(dev, fc_conf);
 }
 
 int
-rte_eth_dev_fdir_remove_signature_filter(uint8_t port_id,
-                                        struct rte_fdir_filter *fdir_filter)
+rte_eth_dev_flow_ctrl_set(uint8_t port_id, struct rte_eth_fc_conf *fc_conf)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+       if ((fc_conf->send_xon != 0) && (fc_conf->send_xon != 1)) {
+               PMD_DEBUG_TRACE("Invalid send_xon, only 0/1 allowed\n");
+               return -EINVAL;
        }
 
        dev = &rte_eth_devices[port_id];
-
-       if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_SIGNATURE) {
-               PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n",
-                               port_id, dev->data->dev_conf.fdir_conf.mode);
-               return (-ENOSYS);
-       }
-
-       if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP
-            || fdir_filter->l4type == RTE_FDIR_L4TYPE_NONE)
-           && (fdir_filter->port_src || fdir_filter->port_dst)) {
-               PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \
-                               "None l4type source & destinations ports " \
-                               "should be null!\n");
-               return (-EINVAL);
-       }
-
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_remove_signature_filter, -ENOTSUP);
-       return (*dev->dev_ops->fdir_remove_signature_filter)(dev, fdir_filter);
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->flow_ctrl_set, -ENOTSUP);
+       return (*dev->dev_ops->flow_ctrl_set)(dev, fc_conf);
 }
 
 int
-rte_eth_dev_fdir_get_infos(uint8_t port_id, struct rte_eth_fdir *fdir)
+rte_eth_dev_priority_flow_ctrl_set(uint8_t port_id, struct rte_eth_pfc_conf *pfc_conf)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+       if (pfc_conf->priority > (ETH_DCB_NUM_USER_PRIORITIES - 1)) {
+               PMD_DEBUG_TRACE("Invalid priority, only 0-7 allowed\n");
+               return -EINVAL;
        }
 
        dev = &rte_eth_devices[port_id];
-       if (! (dev->data->dev_conf.fdir_conf.mode)) {
-               PMD_DEBUG_TRACE("port %d: pkt-filter disabled\n", port_id);
-               return (-ENOSYS);
-       }
-
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_infos_get, -ENOTSUP);
-
-       (*dev->dev_ops->fdir_infos_get)(dev, fdir);
-       return (0);
+       /* High water, low water validation are device specific */
+       if  (*dev->dev_ops->priority_flow_ctrl_set)
+               return (*dev->dev_ops->priority_flow_ctrl_set)(dev, pfc_conf);
+       return -ENOTSUP;
 }
 
-int
-rte_eth_dev_fdir_add_perfect_filter(uint8_t port_id,
-                                   struct rte_fdir_filter *fdir_filter,
-                                   uint16_t soft_id, uint8_t queue,
-                                   uint8_t drop)
+static int
+rte_eth_check_reta_mask(struct rte_eth_rss_reta_entry64 *reta_conf,
+                       uint16_t reta_size)
 {
-       struct rte_eth_dev *dev;
-
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
-       }
+       uint16_t i, num;
 
-       dev = &rte_eth_devices[port_id];
+       if (!reta_conf)
+               return -EINVAL;
 
-       if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT) {
-               PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n",
-                               port_id, dev->data->dev_conf.fdir_conf.mode);
-               return (-ENOSYS);
+       if (reta_size != RTE_ALIGN(reta_size, RTE_RETA_GROUP_SIZE)) {
+               PMD_DEBUG_TRACE("Invalid reta size, should be %u aligned\n",
+                                                       RTE_RETA_GROUP_SIZE);
+               return -EINVAL;
        }
 
-       if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP
-            || fdir_filter->l4type == RTE_FDIR_L4TYPE_NONE)
-           && (fdir_filter->port_src || fdir_filter->port_dst)) {
-               PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \
-                               "None l4type, source & destinations ports " \
-                               "should be null!\n");
-               return (-EINVAL);
+       num = reta_size / RTE_RETA_GROUP_SIZE;
+       for (i = 0; i < num; i++) {
+               if (reta_conf[i].mask)
+                       return 0;
        }
 
-       /* For now IPv6 is not supported with perfect filter */
-       if (fdir_filter->iptype == RTE_FDIR_IPTYPE_IPV6)
-               return (-ENOTSUP);
-
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_add_perfect_filter, -ENOTSUP);
-       return (*dev->dev_ops->fdir_add_perfect_filter)(dev, fdir_filter,
-                                                               soft_id, queue,
-                                                               drop);
+       return -EINVAL;
 }
 
-int
-rte_eth_dev_fdir_update_perfect_filter(uint8_t port_id,
-                                      struct rte_fdir_filter *fdir_filter,
-                                      uint16_t soft_id, uint8_t queue,
-                                      uint8_t drop)
+static int
+rte_eth_check_reta_entry(struct rte_eth_rss_reta_entry64 *reta_conf,
+                        uint16_t reta_size,
+                        uint8_t max_rxq)
 {
-       struct rte_eth_dev *dev;
+       uint16_t i, idx, shift;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
-       }
-
-       dev = &rte_eth_devices[port_id];
+       if (!reta_conf)
+               return -EINVAL;
 
-       if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT) {
-               PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n",
-                               port_id, dev->data->dev_conf.fdir_conf.mode);
-               return (-ENOSYS);
+       if (max_rxq == 0) {
+               PMD_DEBUG_TRACE("No receive queue is available\n");
+               return -EINVAL;
        }
 
-       if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP
-            || fdir_filter->l4type == RTE_FDIR_L4TYPE_NONE)
-           && (fdir_filter->port_src || fdir_filter->port_dst)) {
-               PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \
-                               "None l4type, source & destinations ports " \
-                               "should be null!\n");
-               return (-EINVAL);
+       for (i = 0; i < reta_size; i++) {
+               idx = i / RTE_RETA_GROUP_SIZE;
+               shift = i % RTE_RETA_GROUP_SIZE;
+               if ((reta_conf[idx].mask & (1ULL << shift)) &&
+                       (reta_conf[idx].reta[shift] >= max_rxq)) {
+                       PMD_DEBUG_TRACE("reta_conf[%u]->reta[%u]: %u exceeds "
+                               "the maximum rxq index: %u\n", idx, shift,
+                               reta_conf[idx].reta[shift], max_rxq);
+                       return -EINVAL;
+               }
        }
 
-       /* For now IPv6 is not supported with perfect filter */
-       if (fdir_filter->iptype == RTE_FDIR_IPTYPE_IPV6)
-               return (-ENOTSUP);
-
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_update_perfect_filter, -ENOTSUP);
-       return (*dev->dev_ops->fdir_update_perfect_filter)(dev, fdir_filter,
-                                                       soft_id, queue, drop);
+       return 0;
 }
 
 int
-rte_eth_dev_fdir_remove_perfect_filter(uint8_t port_id,
-                                      struct rte_fdir_filter *fdir_filter,
-                                      uint16_t soft_id)
+rte_eth_dev_rss_reta_update(uint8_t port_id,
+                           struct rte_eth_rss_reta_entry64 *reta_conf,
+                           uint16_t reta_size)
 {
        struct rte_eth_dev *dev;
+       int ret;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+       /* Check mask bits */
+       ret = rte_eth_check_reta_mask(reta_conf, reta_size);
+       if (ret < 0)
+               return ret;
 
        dev = &rte_eth_devices[port_id];
 
-       if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT) {
-               PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n",
-                               port_id, dev->data->dev_conf.fdir_conf.mode);
-               return (-ENOSYS);
-       }
-
-       if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP
-            || fdir_filter->l4type == RTE_FDIR_L4TYPE_NONE)
-           && (fdir_filter->port_src || fdir_filter->port_dst)) {
-               PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \
-                               "None l4type, source & destinations ports " \
-                               "should be null!\n");
-               return (-EINVAL);
-       }
-
-       /* For now IPv6 is not supported with perfect filter */
-       if (fdir_filter->iptype == RTE_FDIR_IPTYPE_IPV6)
-               return (-ENOTSUP);
+       /* Check entry value */
+       ret = rte_eth_check_reta_entry(reta_conf, reta_size,
+                               dev->data->nb_rx_queues);
+       if (ret < 0)
+               return ret;
 
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_remove_perfect_filter, -ENOTSUP);
-       return (*dev->dev_ops->fdir_remove_perfect_filter)(dev, fdir_filter,
-                                                               soft_id);
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->reta_update, -ENOTSUP);
+       return (*dev->dev_ops->reta_update)(dev, reta_conf, reta_size);
 }
 
 int
-rte_eth_dev_fdir_set_masks(uint8_t port_id, struct rte_fdir_masks *fdir_mask)
+rte_eth_dev_rss_reta_query(uint8_t port_id,
+                          struct rte_eth_rss_reta_entry64 *reta_conf,
+                          uint16_t reta_size)
 {
        struct rte_eth_dev *dev;
+       int ret;
 
        if (port_id >= nb_ports) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+               return -ENODEV;
        }
 
-       dev = &rte_eth_devices[port_id];
-       if (! (dev->data->dev_conf.fdir_conf.mode)) {
-               PMD_DEBUG_TRACE("port %d: pkt-filter disabled\n", port_id);
-               return (-ENOSYS);
-       }
+       /* Check mask bits */
+       ret = rte_eth_check_reta_mask(reta_conf, reta_size);
+       if (ret < 0)
+               return ret;
 
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_set_masks, -ENOTSUP);
-       return (*dev->dev_ops->fdir_set_masks)(dev, fdir_mask);
+       dev = &rte_eth_devices[port_id];
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->reta_query, -ENOTSUP);
+       return (*dev->dev_ops->reta_query)(dev, reta_conf, reta_size);
 }
 
 int
-rte_eth_dev_flow_ctrl_set(uint8_t port_id, struct rte_eth_fc_conf *fc_conf)
+rte_eth_dev_rss_hash_update(uint8_t port_id, struct rte_eth_rss_conf *rss_conf)
 {
        struct rte_eth_dev *dev;
+       uint16_t rss_hash_protos;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
-       }
-
-       if ((fc_conf->send_xon != 0) && (fc_conf->send_xon != 1)) {
-               PMD_DEBUG_TRACE("Invalid send_xon, only 0/1 allowed\n");
-               return (-EINVAL);
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+       rss_hash_protos = rss_conf->rss_hf;
+       if ((rss_hash_protos != 0) &&
+           ((rss_hash_protos & ETH_RSS_PROTO_MASK) == 0)) {
+               PMD_DEBUG_TRACE("Invalid rss_hash_protos=0x%x\n",
+                               rss_hash_protos);
+               return -EINVAL;
        }
-
        dev = &rte_eth_devices[port_id];
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->flow_ctrl_set, -ENOTSUP);
-       return (*dev->dev_ops->flow_ctrl_set)(dev, fc_conf);
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rss_hash_update, -ENOTSUP);
+       return (*dev->dev_ops->rss_hash_update)(dev, rss_conf);
 }
 
 int
-rte_eth_dev_priority_flow_ctrl_set(uint8_t port_id, struct rte_eth_pfc_conf *pfc_conf)
+rte_eth_dev_rss_hash_conf_get(uint8_t port_id,
+                             struct rte_eth_rss_conf *rss_conf)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
-       }
-
-       if (pfc_conf->priority > (ETH_DCB_NUM_USER_PRIORITIES - 1)) {
-               PMD_DEBUG_TRACE("Invalid priority, only 0-7 allowed\n");
-               return (-EINVAL);
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
-       /* High water, low water validation are device specific */
-       if  (*dev->dev_ops->priority_flow_ctrl_set)
-               return (*dev->dev_ops->priority_flow_ctrl_set)(dev, pfc_conf);
-       return (-ENOTSUP);
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rss_hash_conf_get, -ENOTSUP);
+       return (*dev->dev_ops->rss_hash_conf_get)(dev, rss_conf);
 }
 
 int
-rte_eth_dev_rss_reta_update(uint8_t port_id, struct rte_eth_rss_reta *reta_conf)
+rte_eth_dev_udp_tunnel_add(uint8_t port_id,
+                          struct rte_eth_udp_tunnel *udp_tunnel)
 {
        struct rte_eth_dev *dev;
-       uint8_t i,j;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
-       }
-
-       /* Invalid mask bit(s) setting */
-       if ((reta_conf->mask_lo == 0) && (reta_conf->mask_hi == 0)) {
-               PMD_DEBUG_TRACE("Invalid update mask bits for port=%d\n",port_id);
-               return (-EINVAL);
-       }
-
-       if (reta_conf->mask_lo != 0) {
-               for (i = 0; i < ETH_RSS_RETA_NUM_ENTRIES/2; i++) {
-                       if ((reta_conf->mask_lo & (1ULL << i)) &&
-                               (reta_conf->reta[i] >= ETH_RSS_RETA_MAX_QUEUE)) {
-                               PMD_DEBUG_TRACE("RETA hash index output"
-                                       "configration for port=%d,invalid"
-                                       "queue=%d\n",port_id,reta_conf->reta[i]);
-
-                               return (-EINVAL);
-                       } 
-               }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+       if (udp_tunnel == NULL) {
+               PMD_DEBUG_TRACE("Invalid udp_tunnel parameter\n");
+               return -EINVAL;
        }
 
-       if (reta_conf->mask_hi != 0) {
-               for (i = 0; i< ETH_RSS_RETA_NUM_ENTRIES/2; i++) {       
-                       j = (uint8_t)(i + ETH_RSS_RETA_NUM_ENTRIES/2);
-
-                       /* Check if the max entry >= 128 */
-                       if ((reta_conf->mask_hi & (1ULL << i)) && 
-                               (reta_conf->reta[j] >= ETH_RSS_RETA_MAX_QUEUE)) {
-                               PMD_DEBUG_TRACE("RETA hash index output"
-                                       "configration for port=%d,invalid"
-                                       "queue=%d\n",port_id,reta_conf->reta[j]);
-
-                               return (-EINVAL);
-                       }
-               }
+       if (udp_tunnel->prot_type >= RTE_TUNNEL_TYPE_MAX) {
+               PMD_DEBUG_TRACE("Invalid tunnel type\n");
+               return -EINVAL;
        }
 
        dev = &rte_eth_devices[port_id];
-
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->reta_update, -ENOTSUP);
-       return (*dev->dev_ops->reta_update)(dev, reta_conf);
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->udp_tunnel_add, -ENOTSUP);
+       return (*dev->dev_ops->udp_tunnel_add)(dev, udp_tunnel);
 }
 
-int 
-rte_eth_dev_rss_reta_query(uint8_t port_id, struct rte_eth_rss_reta *reta_conf)
+int
+rte_eth_dev_udp_tunnel_delete(uint8_t port_id,
+                             struct rte_eth_udp_tunnel *udp_tunnel)
 {
        struct rte_eth_dev *dev;
-       
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+       dev = &rte_eth_devices[port_id];
+
+       if (udp_tunnel == NULL) {
+               PMD_DEBUG_TRACE("Invalid udp_tunnel parameter\n");
+               return -EINVAL;
        }
 
-       if((reta_conf->mask_lo == 0) && (reta_conf->mask_hi == 0)) {
-               PMD_DEBUG_TRACE("Invalid update mask bits for the port=%d\n",port_id);
-               return (-EINVAL);
+       if (udp_tunnel->prot_type >= RTE_TUNNEL_TYPE_MAX) {
+               PMD_DEBUG_TRACE("Invalid tunnel type\n");
+               return -EINVAL;
        }
 
-       dev = &rte_eth_devices[port_id];
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->reta_query, -ENOTSUP);
-       return (*dev->dev_ops->reta_query)(dev, reta_conf);
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->udp_tunnel_del, -ENOTSUP);
+       return (*dev->dev_ops->udp_tunnel_del)(dev, udp_tunnel);
 }
 
 int
@@ -1569,14 +2020,10 @@ rte_eth_led_on(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_led_on, -ENOTSUP);
-       return ((*dev->dev_ops->dev_led_on)(dev));
+       return (*dev->dev_ops->dev_led_on)(dev);
 }
 
 int
@@ -1584,22 +2031,18 @@ rte_eth_led_off(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_led_off, -ENOTSUP);
-       return ((*dev->dev_ops->dev_led_off)(dev));
+       return (*dev->dev_ops->dev_led_off)(dev);
 }
 
 /*
  * Returns index into MAC address array of addr. Use 00:00:00:00:00:00 to find
  * an empty spot.
  */
-static inline int
-get_mac_addr_index(uint8_t port_id, struct ether_addr *addr)
+static int
+get_mac_addr_index(uint8_t port_id, const struct ether_addr *addr)
 {
        struct rte_eth_dev_info dev_info;
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
@@ -1614,36 +2057,44 @@ get_mac_addr_index(uint8_t port_id, struct ether_addr *addr)
        return -1;
 }
 
-static struct ether_addr null_mac_addr = {{0, 0, 0, 0, 0, 0}};
+static const struct ether_addr null_mac_addr;
 
 int
 rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr,
-               uint32_t pool)
+                       uint32_t pool)
 {
        struct rte_eth_dev *dev;
        int index;
+       uint64_t pool_mask;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mac_addr_add, -ENOTSUP);
 
        if (is_zero_ether_addr(addr)) {
-               PMD_DEBUG_TRACE("port %d: Cannot add NULL MAC address\n", port_id);
-               return (-EINVAL);
+               PMD_DEBUG_TRACE("port %d: Cannot add NULL MAC address\n",
+                       port_id);
+               return -EINVAL;
+       }
+       if (pool >= ETH_64_POOLS) {
+               PMD_DEBUG_TRACE("pool id must be 0-%d\n", ETH_64_POOLS - 1);
+               return -EINVAL;
        }
 
-       /* Check if it's already there, and do nothing */
        index = get_mac_addr_index(port_id, addr);
-       if (index >= 0)
-               return 0;
-
-       index = get_mac_addr_index(port_id, &null_mac_addr);
        if (index < 0) {
-               PMD_DEBUG_TRACE("port %d: MAC address array full\n", port_id);
-               return (-ENOSPC);
+               index = get_mac_addr_index(port_id, &null_mac_addr);
+               if (index < 0) {
+                       PMD_DEBUG_TRACE("port %d: MAC address array full\n",
+                               port_id);
+                       return -ENOSPC;
+               }
+       } else {
+               pool_mask = dev->data->mac_pool_sel[index];
+
+               /* Check if both MAC address and pool is already there, and do nothing */
+               if (pool_mask & (1ULL << pool))
+                       return 0;
        }
 
        /* Update NIC */
@@ -1652,6 +2103,9 @@ rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr,
        /* Update address in NIC data structure */
        ether_addr_copy(addr, &dev->data->mac_addrs[index]);
 
+       /* Update pool bitmap in NIC data structure */
+       dev->data->mac_pool_sel[index] |= (1ULL << pool);
+
        return 0;
 }
 
@@ -1661,17 +2115,14 @@ rte_eth_dev_mac_addr_remove(uint8_t port_id, struct ether_addr *addr)
        struct rte_eth_dev *dev;
        int index;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mac_addr_remove, -ENOTSUP);
 
        index = get_mac_addr_index(port_id, addr);
        if (index == 0) {
                PMD_DEBUG_TRACE("port %d: Cannot remove default MAC address\n", port_id);
-               return (-EADDRINUSE);
+               return -EADDRINUSE;
        } else if (index < 0)
                return 0;  /* Do nothing if address wasn't found */
 
@@ -1681,78 +2132,393 @@ rte_eth_dev_mac_addr_remove(uint8_t port_id, struct ether_addr *addr)
        /* Update address in NIC data structure */
        ether_addr_copy(&null_mac_addr, &dev->data->mac_addrs[index]);
 
+       /* reset pool bitmap */
+       dev->data->mac_pool_sel[index] = 0;
+
        return 0;
 }
 
-#ifdef RTE_LIBRTE_ETHDEV_DEBUG
-uint16_t
-rte_eth_rx_burst(uint8_t port_id, uint16_t queue_id,
-                struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
+int
+rte_eth_dev_default_mac_addr_set(uint8_t port_id, struct ether_addr *addr)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return 0;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       if (!is_valid_assigned_ether_addr(addr))
+               return -EINVAL;
+
        dev = &rte_eth_devices[port_id];
-       FUNC_PTR_OR_ERR_RET(*dev->rx_pkt_burst, -ENOTSUP);
-       if (queue_id >= dev->data->nb_rx_queues) {
-               PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", queue_id);
-               return 0;
-       }
-       return (*dev->rx_pkt_burst)(dev->data->rx_queues[queue_id],
-                                               rx_pkts, nb_pkts);
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mac_addr_set, -ENOTSUP);
+
+       /* Update default address in NIC data structure */
+       ether_addr_copy(addr, &dev->data->mac_addrs[0]);
+
+       (*dev->dev_ops->mac_addr_set)(dev, addr);
+
+       return 0;
 }
 
-uint16_t
-rte_eth_tx_burst(uint8_t port_id, uint16_t queue_id,
-                struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
+int
+rte_eth_dev_set_vf_rxmode(uint8_t port_id,  uint16_t vf,
+                               uint16_t rx_mode, uint8_t on)
 {
+       uint16_t num_vfs;
        struct rte_eth_dev *dev;
+       struct rte_eth_dev_info dev_info;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return 0;
-       }
        dev = &rte_eth_devices[port_id];
+       rte_eth_dev_info_get(port_id, &dev_info);
 
-       FUNC_PTR_OR_ERR_RET(*dev->tx_pkt_burst, -ENOTSUP);
-       if (queue_id >= dev->data->nb_tx_queues) {
-               PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", queue_id);
-               return 0;
+       num_vfs = dev_info.max_vfs;
+       if (vf > num_vfs) {
+               PMD_DEBUG_TRACE("set VF RX mode:invalid VF id %d\n", vf);
+               return -EINVAL;
        }
-       return (*dev->tx_pkt_burst)(dev->data->tx_queues[queue_id],
-                                               tx_pkts, nb_pkts);
+
+       if (rx_mode == 0) {
+               PMD_DEBUG_TRACE("set VF RX mode:mode mask ca not be zero\n");
+               return -EINVAL;
+       }
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_rx_mode, -ENOTSUP);
+       return (*dev->dev_ops->set_vf_rx_mode)(dev, vf, rx_mode, on);
 }
 
-uint32_t
-rte_eth_rx_queue_count(uint8_t port_id, uint16_t queue_id)
+/*
+ * Returns index into MAC address array of addr. Use 00:00:00:00:00:00 to find
+ * an empty spot.
+ */
+static int
+get_hash_mac_addr_index(uint8_t port_id, const struct ether_addr *addr)
 {
-       struct rte_eth_dev *dev;
+       struct rte_eth_dev_info dev_info;
+       struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+       unsigned i;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return 0;
-       }
-       dev = &rte_eth_devices[port_id];
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_count, -ENOTSUP);
-       return (*dev->dev_ops->rx_queue_count)(dev, queue_id);  
+       rte_eth_dev_info_get(port_id, &dev_info);
+       if (!dev->data->hash_mac_addrs)
+               return -1;
+
+       for (i = 0; i < dev_info.max_hash_mac_addrs; i++)
+               if (memcmp(addr, &dev->data->hash_mac_addrs[i],
+                       ETHER_ADDR_LEN) == 0)
+                       return i;
+
+       return -1;
 }
 
 int
-rte_eth_rx_descriptor_done(uint8_t port_id, uint16_t queue_id, uint16_t offset)
+rte_eth_dev_uc_hash_table_set(uint8_t port_id, struct ether_addr *addr,
+                               uint8_t on)
 {
+       int index;
+       int ret;
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-ENODEV);
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+       if (is_zero_ether_addr(addr)) {
+               PMD_DEBUG_TRACE("port %d: Cannot add NULL MAC address\n",
+                       port_id);
+               return -EINVAL;
+       }
+
+       index = get_hash_mac_addr_index(port_id, addr);
+       /* Check if it's already there, and do nothing */
+       if ((index >= 0) && (on))
+               return 0;
+
+       if (index < 0) {
+               if (!on) {
+                       PMD_DEBUG_TRACE("port %d: the MAC address was not "
+                               "set in UTA\n", port_id);
+                       return -EINVAL;
+               }
+
+               index = get_hash_mac_addr_index(port_id, &null_mac_addr);
+               if (index < 0) {
+                       PMD_DEBUG_TRACE("port %d: MAC address array full\n",
+                                       port_id);
+                       return -ENOSPC;
+               }
+       }
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->uc_hash_table_set, -ENOTSUP);
+       ret = (*dev->dev_ops->uc_hash_table_set)(dev, addr, on);
+       if (ret == 0) {
+               /* Update address in NIC data structure */
+               if (on)
+                       ether_addr_copy(addr,
+                                       &dev->data->hash_mac_addrs[index]);
+               else
+                       ether_addr_copy(&null_mac_addr,
+                                       &dev->data->hash_mac_addrs[index]);
+       }
+
+       return ret;
+}
+
+int
+rte_eth_dev_uc_all_hash_table_set(uint8_t port_id, uint8_t on)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->uc_all_hash_table_set, -ENOTSUP);
+       return (*dev->dev_ops->uc_all_hash_table_set)(dev, on);
+}
+
+int
+rte_eth_dev_set_vf_rx(uint8_t port_id, uint16_t vf, uint8_t on)
+{
+       uint16_t num_vfs;
+       struct rte_eth_dev *dev;
+       struct rte_eth_dev_info dev_info;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+       rte_eth_dev_info_get(port_id, &dev_info);
+
+       num_vfs = dev_info.max_vfs;
+       if (vf > num_vfs) {
+               PMD_DEBUG_TRACE("port %d: invalid vf id\n", port_id);
+               return -EINVAL;
+       }
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_rx, -ENOTSUP);
+       return (*dev->dev_ops->set_vf_rx)(dev, vf, on);
+}
+
+int
+rte_eth_dev_set_vf_tx(uint8_t port_id, uint16_t vf, uint8_t on)
+{
+       uint16_t num_vfs;
+       struct rte_eth_dev *dev;
+       struct rte_eth_dev_info dev_info;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+       rte_eth_dev_info_get(port_id, &dev_info);
+
+       num_vfs = dev_info.max_vfs;
+       if (vf > num_vfs) {
+               PMD_DEBUG_TRACE("set pool tx:invalid pool id=%d\n", vf);
+               return -EINVAL;
+       }
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_tx, -ENOTSUP);
+       return (*dev->dev_ops->set_vf_tx)(dev, vf, on);
+}
+
+int
+rte_eth_dev_set_vf_vlan_filter(uint8_t port_id, uint16_t vlan_id,
+                              uint64_t vf_mask, uint8_t vlan_on)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+
+       if (vlan_id > ETHER_MAX_VLAN_ID) {
+               PMD_DEBUG_TRACE("VF VLAN filter:invalid VLAN id=%d\n",
+                       vlan_id);
+               return -EINVAL;
+       }
+
+       if (vf_mask == 0) {
+               PMD_DEBUG_TRACE("VF VLAN filter:pool_mask can not be 0\n");
+               return -EINVAL;
+       }
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_vlan_filter, -ENOTSUP);
+       return (*dev->dev_ops->set_vf_vlan_filter)(dev, vlan_id,
+                                                  vf_mask, vlan_on);
+}
+
+int rte_eth_set_queue_rate_limit(uint8_t port_id, uint16_t queue_idx,
+                                       uint16_t tx_rate)
+{
+       struct rte_eth_dev *dev;
+       struct rte_eth_dev_info dev_info;
+       struct rte_eth_link link;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+       rte_eth_dev_info_get(port_id, &dev_info);
+       link = dev->data->dev_link;
+
+       if (queue_idx > dev_info.max_tx_queues) {
+               PMD_DEBUG_TRACE("set queue rate limit:port %d: "
+                               "invalid queue id=%d\n", port_id, queue_idx);
+               return -EINVAL;
+       }
+
+       if (tx_rate > link.link_speed) {
+               PMD_DEBUG_TRACE("set queue rate limit:invalid tx_rate=%d, "
+                               "bigger than link speed= %d\n",
+                       tx_rate, link.link_speed);
+               return -EINVAL;
+       }
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_queue_rate_limit, -ENOTSUP);
+       return (*dev->dev_ops->set_queue_rate_limit)(dev, queue_idx, tx_rate);
+}
+
+int rte_eth_set_vf_rate_limit(uint8_t port_id, uint16_t vf, uint16_t tx_rate,
+                               uint64_t q_msk)
+{
+       struct rte_eth_dev *dev;
+       struct rte_eth_dev_info dev_info;
+       struct rte_eth_link link;
+
+       if (q_msk == 0)
+               return 0;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+       rte_eth_dev_info_get(port_id, &dev_info);
+       link = dev->data->dev_link;
+
+       if (vf > dev_info.max_vfs) {
+               PMD_DEBUG_TRACE("set VF rate limit:port %d: "
+                               "invalid vf id=%d\n", port_id, vf);
+               return -EINVAL;
+       }
+
+       if (tx_rate > link.link_speed) {
+               PMD_DEBUG_TRACE("set VF rate limit:invalid tx_rate=%d, "
+                               "bigger than link speed= %d\n",
+                               tx_rate, link.link_speed);
+               return -EINVAL;
+       }
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_rate_limit, -ENOTSUP);
+       return (*dev->dev_ops->set_vf_rate_limit)(dev, vf, tx_rate, q_msk);
+}
+
+int
+rte_eth_mirror_rule_set(uint8_t port_id,
+                       struct rte_eth_mirror_conf *mirror_conf,
+                       uint8_t rule_id, uint8_t on)
+{
+       struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+       if (mirror_conf->rule_type == 0) {
+               PMD_DEBUG_TRACE("mirror rule type can not be 0.\n");
+               return -EINVAL;
+       }
+
+       if (mirror_conf->dst_pool >= ETH_64_POOLS) {
+               PMD_DEBUG_TRACE("Invalid dst pool, pool id must be 0-%d\n",
+                               ETH_64_POOLS - 1);
+               return -EINVAL;
+       }
+
+       if ((mirror_conf->rule_type & (ETH_MIRROR_VIRTUAL_POOL_UP |
+            ETH_MIRROR_VIRTUAL_POOL_DOWN)) &&
+           (mirror_conf->pool_mask == 0)) {
+               PMD_DEBUG_TRACE("Invalid mirror pool, pool mask can not be 0.\n");
+               return -EINVAL;
+       }
+
+       if ((mirror_conf->rule_type & ETH_MIRROR_VLAN) &&
+           mirror_conf->vlan.vlan_mask == 0) {
+               PMD_DEBUG_TRACE("Invalid vlan mask, vlan mask can not be 0.\n");
+               return -EINVAL;
+       }
+
+       dev = &rte_eth_devices[port_id];
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mirror_rule_set, -ENOTSUP);
+
+       return (*dev->dev_ops->mirror_rule_set)(dev, mirror_conf, rule_id, on);
+}
+
+int
+rte_eth_mirror_rule_reset(uint8_t port_id, uint8_t rule_id)
+{
+       struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mirror_rule_reset, -ENOTSUP);
+
+       return (*dev->dev_ops->mirror_rule_reset)(dev, rule_id);
+}
+
+#ifdef RTE_LIBRTE_ETHDEV_DEBUG
+uint16_t
+rte_eth_rx_burst(uint8_t port_id, uint16_t queue_id,
+                struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, 0);
+
+       dev = &rte_eth_devices[port_id];
+       FUNC_PTR_OR_ERR_RET(*dev->rx_pkt_burst, 0);
+       if (queue_id >= dev->data->nb_rx_queues) {
+               PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", queue_id);
+               return 0;
+       }
+       return (*dev->rx_pkt_burst)(dev->data->rx_queues[queue_id],
+                                               rx_pkts, nb_pkts);
+}
+
+uint16_t
+rte_eth_tx_burst(uint8_t port_id, uint16_t queue_id,
+                struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, 0);
+
+       dev = &rte_eth_devices[port_id];
+
+       FUNC_PTR_OR_ERR_RET(*dev->tx_pkt_burst, 0);
+       if (queue_id >= dev->data->nb_tx_queues) {
+               PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", queue_id);
+               return 0;
        }
+       return (*dev->tx_pkt_burst)(dev->data->tx_queues[queue_id],
+                                               tx_pkts, nb_pkts);
+}
+
+uint32_t
+rte_eth_rx_queue_count(uint8_t port_id, uint16_t queue_id)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, 0);
+
+       dev = &rte_eth_devices[port_id];
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_count, 0);
+       return (*dev->dev_ops->rx_queue_count)(dev, queue_id);
+}
+
+int
+rte_eth_rx_descriptor_done(uint8_t port_id, uint16_t queue_id, uint16_t offset)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_descriptor_done, -ENOTSUP);
-       return (*dev->dev_ops->rx_descriptor_done)( \
-               dev->data->rx_queues[queue_id], offset);
+       return (*dev->dev_ops->rx_descriptor_done)(dev->data->rx_queues[queue_id],
+                                                  offset);
 }
 #endif
 
@@ -1765,16 +2531,14 @@ rte_eth_dev_callback_register(uint8_t port_id,
        struct rte_eth_dev_callback *user_cb;
 
        if (!cb_fn)
-               return (-EINVAL);
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-EINVAL);
-       }
+               return -EINVAL;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
        dev = &rte_eth_devices[port_id];
        rte_spinlock_lock(&rte_eth_dev_cb_lock);
 
-       TAILQ_FOREACH(user_cb, &(dev->callbacks), next) {
+       TAILQ_FOREACH(user_cb, &(dev->link_intr_cbs), next) {
                if (user_cb->cb_fn == cb_fn &&
                        user_cb->cb_arg == cb_arg &&
                        user_cb->event == event) {
@@ -1783,16 +2547,18 @@ rte_eth_dev_callback_register(uint8_t port_id,
        }
 
        /* create a new callback. */
-       if (user_cb == NULL && (user_cb = rte_zmalloc("INTR_USER_CALLBACK",
-                       sizeof(struct rte_eth_dev_callback), 0)) != NULL) {
+       if (user_cb == NULL)
+               user_cb = rte_zmalloc("INTR_USER_CALLBACK",
+                                     sizeof(struct rte_eth_dev_callback), 0);
+       if (user_cb != NULL) {
                user_cb->cb_fn = cb_fn;
                user_cb->cb_arg = cb_arg;
                user_cb->event = event;
-               TAILQ_INSERT_TAIL(&(dev->callbacks), user_cb, next);
+               TAILQ_INSERT_TAIL(&(dev->link_intr_cbs), user_cb, next);
        }
 
        rte_spinlock_unlock(&rte_eth_dev_cb_lock);
-       return ((user_cb == NULL) ? -ENOMEM : 0);
+       return (user_cb == NULL) ? -ENOMEM : 0;
 }
 
 int
@@ -1805,17 +2571,15 @@ rte_eth_dev_callback_unregister(uint8_t port_id,
        struct rte_eth_dev_callback *cb, *next;
 
        if (!cb_fn)
-               return (-EINVAL);
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return (-EINVAL);
-       }
+               return -EINVAL;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
        dev = &rte_eth_devices[port_id];
        rte_spinlock_lock(&rte_eth_dev_cb_lock);
 
        ret = 0;
-       for (cb = TAILQ_FIRST(&dev->callbacks); cb != NULL; cb = next) {
+       for (cb = TAILQ_FIRST(&dev->link_intr_cbs); cb != NULL; cb = next) {
 
                next = TAILQ_NEXT(cb, next);
 
@@ -1829,7 +2593,7 @@ rte_eth_dev_callback_unregister(uint8_t port_id,
                 * then remove it.
                 */
                if (cb->active == 0) {
-                       TAILQ_REMOVE(&(dev->callbacks), cb, next);
+                       TAILQ_REMOVE(&(dev->link_intr_cbs), cb, next);
                        rte_free(cb);
                } else {
                        ret = -EAGAIN;
@@ -1837,7 +2601,7 @@ rte_eth_dev_callback_unregister(uint8_t port_id,
        }
 
        rte_spinlock_unlock(&rte_eth_dev_cb_lock);
-       return (ret);
+       return ret;
 }
 
 void
@@ -1848,7 +2612,7 @@ _rte_eth_dev_callback_process(struct rte_eth_dev *dev,
        struct rte_eth_dev_callback dev_cb;
 
        rte_spinlock_lock(&rte_eth_dev_cb_lock);
-       TAILQ_FOREACH(cb_lst, &(dev->callbacks), next) {
+       TAILQ_FOREACH(cb_lst, &(dev->link_intr_cbs), next) {
                if (cb_lst->cb_fn == NULL || cb_lst->event != event)
                        continue;
                dev_cb = *cb_lst;
@@ -1861,3 +2625,607 @@ _rte_eth_dev_callback_process(struct rte_eth_dev *dev,
        }
        rte_spinlock_unlock(&rte_eth_dev_cb_lock);
 }
+
+int
+rte_eth_dev_rx_intr_ctl(uint8_t port_id, int epfd, int op, void *data)
+{
+       uint32_t vec;
+       struct rte_eth_dev *dev;
+       struct rte_intr_handle *intr_handle;
+       uint16_t qid;
+       int rc;
+
+       if (!rte_eth_dev_is_valid_port(port_id)) {
+               PMD_DEBUG_TRACE("Invalid port_id=%u\n", port_id);
+               return -ENODEV;
+       }
+
+       dev = &rte_eth_devices[port_id];
+       intr_handle = &dev->pci_dev->intr_handle;
+       if (!intr_handle->intr_vec) {
+               PMD_DEBUG_TRACE("RX Intr vector unset\n");
+               return -EPERM;
+       }
+
+       for (qid = 0; qid < dev->data->nb_rx_queues; qid++) {
+               vec = intr_handle->intr_vec[qid];
+               rc = rte_intr_rx_ctl(intr_handle, epfd, op, vec, data);
+               if (rc && rc != -EEXIST) {
+                       PMD_DEBUG_TRACE("p %u q %u rx ctl error"
+                                       " op %d epfd %d vec %u\n",
+                                       port_id, qid, op, epfd, vec);
+               }
+       }
+
+       return 0;
+}
+
+int
+rte_eth_dev_rx_intr_ctl_q(uint8_t port_id, uint16_t queue_id,
+                         int epfd, int op, void *data)
+{
+       uint32_t vec;
+       struct rte_eth_dev *dev;
+       struct rte_intr_handle *intr_handle;
+       int rc;
+
+       if (!rte_eth_dev_is_valid_port(port_id)) {
+               PMD_DEBUG_TRACE("Invalid port_id=%u\n", port_id);
+               return -ENODEV;
+       }
+
+       dev = &rte_eth_devices[port_id];
+       if (queue_id >= dev->data->nb_rx_queues) {
+               PMD_DEBUG_TRACE("Invalid RX queue_id=%u\n", queue_id);
+               return -EINVAL;
+       }
+
+       intr_handle = &dev->pci_dev->intr_handle;
+       if (!intr_handle->intr_vec) {
+               PMD_DEBUG_TRACE("RX Intr vector unset\n");
+               return -EPERM;
+       }
+
+       vec = intr_handle->intr_vec[queue_id];
+       rc = rte_intr_rx_ctl(intr_handle, epfd, op, vec, data);
+       if (rc && rc != -EEXIST) {
+               PMD_DEBUG_TRACE("p %u q %u rx ctl error"
+                               " op %d epfd %d vec %u\n",
+                               port_id, queue_id, op, epfd, vec);
+               return rc;
+       }
+
+       return 0;
+}
+
+int
+rte_eth_dev_rx_intr_enable(uint8_t port_id,
+                          uint16_t queue_id)
+{
+       struct rte_eth_dev *dev;
+
+       if (!rte_eth_dev_is_valid_port(port_id)) {
+               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
+               return -ENODEV;
+       }
+
+       dev = &rte_eth_devices[port_id];
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_intr_enable, -ENOTSUP);
+       return (*dev->dev_ops->rx_queue_intr_enable)(dev, queue_id);
+}
+
+int
+rte_eth_dev_rx_intr_disable(uint8_t port_id,
+                           uint16_t queue_id)
+{
+       struct rte_eth_dev *dev;
+
+       if (!rte_eth_dev_is_valid_port(port_id)) {
+               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
+               return -ENODEV;
+       }
+
+       dev = &rte_eth_devices[port_id];
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_intr_disable, -ENOTSUP);
+       return (*dev->dev_ops->rx_queue_intr_disable)(dev, queue_id);
+}
+
+#ifdef RTE_NIC_BYPASS
+int rte_eth_dev_bypass_init(uint8_t port_id)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_init, -ENOTSUP);
+       (*dev->dev_ops->bypass_init)(dev);
+       return 0;
+}
+
+int
+rte_eth_dev_bypass_state_show(uint8_t port_id, uint32_t *state)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_state_show, -ENOTSUP);
+       (*dev->dev_ops->bypass_state_show)(dev, state);
+       return 0;
+}
+
+int
+rte_eth_dev_bypass_state_set(uint8_t port_id, uint32_t *new_state)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_state_set, -ENOTSUP);
+       (*dev->dev_ops->bypass_state_set)(dev, new_state);
+       return 0;
+}
+
+int
+rte_eth_dev_bypass_event_show(uint8_t port_id, uint32_t event, uint32_t *state)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_state_show, -ENOTSUP);
+       (*dev->dev_ops->bypass_event_show)(dev, event, state);
+       return 0;
+}
+
+int
+rte_eth_dev_bypass_event_store(uint8_t port_id, uint32_t event, uint32_t state)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_event_set, -ENOTSUP);
+       (*dev->dev_ops->bypass_event_set)(dev, event, state);
+       return 0;
+}
+
+int
+rte_eth_dev_wd_timeout_store(uint8_t port_id, uint32_t timeout)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_wd_timeout_set, -ENOTSUP);
+       (*dev->dev_ops->bypass_wd_timeout_set)(dev, timeout);
+       return 0;
+}
+
+int
+rte_eth_dev_bypass_ver_show(uint8_t port_id, uint32_t *ver)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_ver_show, -ENOTSUP);
+       (*dev->dev_ops->bypass_ver_show)(dev, ver);
+       return 0;
+}
+
+int
+rte_eth_dev_bypass_wd_timeout_show(uint8_t port_id, uint32_t *wd_timeout)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_wd_timeout_show, -ENOTSUP);
+       (*dev->dev_ops->bypass_wd_timeout_show)(dev, wd_timeout);
+       return 0;
+}
+
+int
+rte_eth_dev_bypass_wd_reset(uint8_t port_id)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_wd_reset, -ENOTSUP);
+       (*dev->dev_ops->bypass_wd_reset)(dev);
+       return 0;
+}
+#endif
+
+int
+rte_eth_dev_filter_supported(uint8_t port_id, enum rte_filter_type filter_type)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->filter_ctrl, -ENOTSUP);
+       return (*dev->dev_ops->filter_ctrl)(dev, filter_type,
+                               RTE_ETH_FILTER_NOP, NULL);
+}
+
+int
+rte_eth_dev_filter_ctrl(uint8_t port_id, enum rte_filter_type filter_type,
+                      enum rte_filter_op filter_op, void *arg)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->filter_ctrl, -ENOTSUP);
+       return (*dev->dev_ops->filter_ctrl)(dev, filter_type, filter_op, arg);
+}
+
+void *
+rte_eth_add_rx_callback(uint8_t port_id, uint16_t queue_id,
+               rte_rx_callback_fn fn, void *user_param)
+{
+#ifndef RTE_ETHDEV_RXTX_CALLBACKS
+       rte_errno = ENOTSUP;
+       return NULL;
+#endif
+       /* check input parameters */
+       if (!rte_eth_dev_is_valid_port(port_id) || fn == NULL ||
+                   queue_id >= rte_eth_devices[port_id].data->nb_rx_queues) {
+               rte_errno = EINVAL;
+               return NULL;
+       }
+
+       struct rte_eth_rxtx_callback *cb = rte_zmalloc(NULL, sizeof(*cb), 0);
+
+       if (cb == NULL) {
+               rte_errno = ENOMEM;
+               return NULL;
+       }
+
+       cb->fn.rx = fn;
+       cb->param = user_param;
+
+       /* Add the callbacks in fifo order. */
+       struct rte_eth_rxtx_callback *tail =
+               rte_eth_devices[port_id].post_rx_burst_cbs[queue_id];
+
+       if (!tail) {
+               rte_eth_devices[port_id].post_rx_burst_cbs[queue_id] = cb;
+
+       } else {
+               while (tail->next)
+                       tail = tail->next;
+               tail->next = cb;
+       }
+
+       return cb;
+}
+
+void *
+rte_eth_add_tx_callback(uint8_t port_id, uint16_t queue_id,
+               rte_tx_callback_fn fn, void *user_param)
+{
+#ifndef RTE_ETHDEV_RXTX_CALLBACKS
+       rte_errno = ENOTSUP;
+       return NULL;
+#endif
+       /* check input parameters */
+       if (!rte_eth_dev_is_valid_port(port_id) || fn == NULL ||
+                   queue_id >= rte_eth_devices[port_id].data->nb_tx_queues) {
+               rte_errno = EINVAL;
+               return NULL;
+       }
+
+       struct rte_eth_rxtx_callback *cb = rte_zmalloc(NULL, sizeof(*cb), 0);
+
+       if (cb == NULL) {
+               rte_errno = ENOMEM;
+               return NULL;
+       }
+
+       cb->fn.tx = fn;
+       cb->param = user_param;
+
+       /* Add the callbacks in fifo order. */
+       struct rte_eth_rxtx_callback *tail =
+               rte_eth_devices[port_id].pre_tx_burst_cbs[queue_id];
+
+       if (!tail) {
+               rte_eth_devices[port_id].pre_tx_burst_cbs[queue_id] = cb;
+
+       } else {
+               while (tail->next)
+                       tail = tail->next;
+               tail->next = cb;
+       }
+
+       return cb;
+}
+
+int
+rte_eth_remove_rx_callback(uint8_t port_id, uint16_t queue_id,
+               struct rte_eth_rxtx_callback *user_cb)
+{
+#ifndef RTE_ETHDEV_RXTX_CALLBACKS
+       return -ENOTSUP;
+#endif
+       /* Check input parameters. */
+       if (!rte_eth_dev_is_valid_port(port_id) || user_cb == NULL ||
+                   queue_id >= rte_eth_devices[port_id].data->nb_rx_queues) {
+               return -EINVAL;
+       }
+
+       struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+       struct rte_eth_rxtx_callback *cb = dev->post_rx_burst_cbs[queue_id];
+       struct rte_eth_rxtx_callback *prev_cb;
+
+       /* Reset head pointer and remove user cb if first in the list. */
+       if (cb == user_cb) {
+               dev->post_rx_burst_cbs[queue_id] = user_cb->next;
+               return 0;
+       }
+
+       /* Remove the user cb from the callback list. */
+       do {
+               prev_cb = cb;
+               cb = cb->next;
+
+               if (cb == user_cb) {
+                       prev_cb->next = user_cb->next;
+                       return 0;
+               }
+
+       } while (cb != NULL);
+
+       /* Callback wasn't found. */
+       return -EINVAL;
+}
+
+int
+rte_eth_remove_tx_callback(uint8_t port_id, uint16_t queue_id,
+               struct rte_eth_rxtx_callback *user_cb)
+{
+#ifndef RTE_ETHDEV_RXTX_CALLBACKS
+       return -ENOTSUP;
+#endif
+       /* Check input parameters. */
+       if (!rte_eth_dev_is_valid_port(port_id) || user_cb == NULL ||
+                   queue_id >= rte_eth_devices[port_id].data->nb_tx_queues) {
+               return -EINVAL;
+       }
+
+       struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+       struct rte_eth_rxtx_callback *cb = dev->pre_tx_burst_cbs[queue_id];
+       struct rte_eth_rxtx_callback *prev_cb;
+
+       /* Reset head pointer and remove user cb if first in the list. */
+       if (cb == user_cb) {
+               dev->pre_tx_burst_cbs[queue_id] = user_cb->next;
+               return 0;
+       }
+
+       /* Remove the user cb from the callback list. */
+       do {
+               prev_cb = cb;
+               cb = cb->next;
+
+               if (cb == user_cb) {
+                       prev_cb->next = user_cb->next;
+                       return 0;
+               }
+
+       } while (cb != NULL);
+
+       /* Callback wasn't found. */
+       return -EINVAL;
+}
+
+int
+rte_eth_rx_queue_info_get(uint8_t port_id, uint16_t queue_id,
+       struct rte_eth_rxq_info *qinfo)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       if (qinfo == NULL)
+               return -EINVAL;
+
+       dev = &rte_eth_devices[port_id];
+       if (queue_id >= dev->data->nb_rx_queues) {
+               PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", queue_id);
+               return -EINVAL;
+       }
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rxq_info_get, -ENOTSUP);
+
+       memset(qinfo, 0, sizeof(*qinfo));
+       dev->dev_ops->rxq_info_get(dev, queue_id, qinfo);
+       return 0;
+}
+
+int
+rte_eth_tx_queue_info_get(uint8_t port_id, uint16_t queue_id,
+       struct rte_eth_txq_info *qinfo)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       if (qinfo == NULL)
+               return -EINVAL;
+
+       dev = &rte_eth_devices[port_id];
+       if (queue_id >= dev->data->nb_tx_queues) {
+               PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", queue_id);
+               return -EINVAL;
+       }
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->txq_info_get, -ENOTSUP);
+
+       memset(qinfo, 0, sizeof(*qinfo));
+       dev->dev_ops->txq_info_get(dev, queue_id, qinfo);
+       return 0;
+}
+
+int
+rte_eth_dev_set_mc_addr_list(uint8_t port_id,
+                            struct ether_addr *mc_addr_set,
+                            uint32_t nb_mc_addr)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_mc_addr_list, -ENOTSUP);
+       return dev->dev_ops->set_mc_addr_list(dev, mc_addr_set, nb_mc_addr);
+}
+
+int
+rte_eth_timesync_enable(uint8_t port_id)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+       dev = &rte_eth_devices[port_id];
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->timesync_enable, -ENOTSUP);
+       return (*dev->dev_ops->timesync_enable)(dev);
+}
+
+int
+rte_eth_timesync_disable(uint8_t port_id)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+       dev = &rte_eth_devices[port_id];
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->timesync_disable, -ENOTSUP);
+       return (*dev->dev_ops->timesync_disable)(dev);
+}
+
+int
+rte_eth_timesync_read_rx_timestamp(uint8_t port_id, struct timespec *timestamp,
+                                  uint32_t flags)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+       dev = &rte_eth_devices[port_id];
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->timesync_read_rx_timestamp, -ENOTSUP);
+       return (*dev->dev_ops->timesync_read_rx_timestamp)(dev, timestamp, flags);
+}
+
+int
+rte_eth_timesync_read_tx_timestamp(uint8_t port_id, struct timespec *timestamp)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+       dev = &rte_eth_devices[port_id];
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->timesync_read_tx_timestamp, -ENOTSUP);
+       return (*dev->dev_ops->timesync_read_tx_timestamp)(dev, timestamp);
+}
+
+int
+rte_eth_dev_get_reg_length(uint8_t port_id)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_reg_length, -ENOTSUP);
+       return (*dev->dev_ops->get_reg_length)(dev);
+}
+
+int
+rte_eth_dev_get_reg_info(uint8_t port_id, struct rte_dev_reg_info *info)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_reg, -ENOTSUP);
+       return (*dev->dev_ops->get_reg)(dev, info);
+}
+
+int
+rte_eth_dev_get_eeprom_length(uint8_t port_id)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_eeprom_length, -ENOTSUP);
+       return (*dev->dev_ops->get_eeprom_length)(dev);
+}
+
+int
+rte_eth_dev_get_eeprom(uint8_t port_id, struct rte_dev_eeprom_info *info)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_eeprom, -ENOTSUP);
+       return (*dev->dev_ops->get_eeprom)(dev, info);
+}
+
+int
+rte_eth_dev_set_eeprom(uint8_t port_id, struct rte_dev_eeprom_info *info)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       dev = &rte_eth_devices[port_id];
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_eeprom, -ENOTSUP);
+       return (*dev->dev_ops->set_eeprom)(dev, info);
+}
+
+int
+rte_eth_dev_get_dcb_info(uint8_t port_id,
+                            struct rte_eth_dcb_info *dcb_info)
+{
+       struct rte_eth_dev *dev;
+
+       if (!rte_eth_dev_is_valid_port(port_id)) {
+               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
+               return -ENODEV;
+       }
+
+       dev = &rte_eth_devices[port_id];
+       memset(dcb_info, 0, sizeof(struct rte_eth_dcb_info));
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_dcb_info, -ENOTSUP);
+       return (*dev->dev_ops->get_dcb_info)(dev, dcb_info);
+}