pci: introduce library and driver

[dpdk.git] / test / test / virtual_pmd.c

diff --git a/test/test/virtual_pmd.c b/test/test/virtual_pmd.c
index b209355..b57a949 100644 (file)
--- a/test/test/virtual_pmd.c
+++ b/test/test/virtual_pmd.c
@@ -33,6 +33,8 @@
 
 #include <rte_mbuf.h>
 #include <rte_ethdev.h>
+#include <rte_pci.h>
+#include <rte_bus_pci.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_memory.h>
@@ -210,13 +212,15 @@ virtual_ethdev_link_update_fail(struct rte_eth_dev *bonded_eth_dev __rte_unused,
        return -1;
 }
 
-static void
+static int
 virtual_ethdev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 {
        struct virtual_ethdev_private *dev_private = dev->data->dev_private;
 
        if (stats)
                rte_memcpy(stats, &dev_private->eth_stats, sizeof(*stats));
+
+       return 0;
 }
 
 static void
@@ -260,7 +264,7 @@ static const struct eth_dev_ops virtual_ethdev_default_dev_ops = {
 
 
 void
-virtual_ethdev_start_fn_set_success(uint8_t port_id, uint8_t success)
+virtual_ethdev_start_fn_set_success(uint16_t port_id, uint8_t success)
 {
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
        struct virtual_ethdev_private *dev_private = dev->data->dev_private;
@@ -274,7 +278,7 @@ virtual_ethdev_start_fn_set_success(uint8_t port_id, uint8_t success)
 }
 
 void
-virtual_ethdev_configure_fn_set_success(uint8_t port_id, uint8_t success)
+virtual_ethdev_configure_fn_set_success(uint16_t port_id, uint8_t success)
 {
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
        struct virtual_ethdev_private *dev_private = dev->data->dev_private;
@@ -287,7 +291,7 @@ virtual_ethdev_configure_fn_set_success(uint8_t port_id, uint8_t success)
 }
 
 void
-virtual_ethdev_rx_queue_setup_fn_set_success(uint8_t port_id, uint8_t success)
+virtual_ethdev_rx_queue_setup_fn_set_success(uint16_t port_id, uint8_t success)
 {
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
        struct virtual_ethdev_private *dev_private = dev->data->dev_private;
@@ -300,7 +304,7 @@ virtual_ethdev_rx_queue_setup_fn_set_success(uint8_t port_id, uint8_t success)
 }
 
 void
-virtual_ethdev_tx_queue_setup_fn_set_success(uint8_t port_id, uint8_t success)
+virtual_ethdev_tx_queue_setup_fn_set_success(uint16_t port_id, uint8_t success)
 {
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
        struct virtual_ethdev_private *dev_private = dev->data->dev_private;
@@ -313,7 +317,7 @@ virtual_ethdev_tx_queue_setup_fn_set_success(uint8_t port_id, uint8_t success)
 }
 
 void
-virtual_ethdev_link_update_fn_set_success(uint8_t port_id, uint8_t success)
+virtual_ethdev_link_update_fn_set_success(uint16_t port_id, uint8_t success)
 {
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
        struct virtual_ethdev_private *dev_private = dev->data->dev_private;
@@ -366,7 +370,7 @@ static uint16_t
 virtual_ethdev_tx_burst_success(void *queue, struct rte_mbuf **bufs,
                uint16_t nb_pkts)
 {
-       struct virtual_ethdev_queue *tx_q = (struct virtual_ethdev_queue *)queue;
+       struct virtual_ethdev_queue *tx_q = queue;
 
        struct rte_eth_dev *vrtl_eth_dev;
        struct virtual_ethdev_private *dev_private;
@@ -402,7 +406,7 @@ virtual_ethdev_tx_burst_fail(void *queue, struct rte_mbuf **bufs,
 
        int i;
 
-       tx_q = (struct virtual_ethdev_queue *)queue;
+       tx_q = queue;
        vrtl_eth_dev = &rte_eth_devices[tx_q->port_id];
        dev_private = vrtl_eth_dev->data->dev_private;
 
@@ -429,7 +433,7 @@ virtual_ethdev_tx_burst_fail(void *queue, struct rte_mbuf **bufs,
 
 
 void
-virtual_ethdev_rx_burst_fn_set_success(uint8_t port_id, uint8_t success)
+virtual_ethdev_rx_burst_fn_set_success(uint16_t port_id, uint8_t success)
 {
        struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id];
 
@@ -441,7 +445,7 @@ virtual_ethdev_rx_burst_fn_set_success(uint8_t port_id, uint8_t success)
 
 
 void
-virtual_ethdev_tx_burst_fn_set_success(uint8_t port_id, uint8_t success)
+virtual_ethdev_tx_burst_fn_set_success(uint16_t port_id, uint8_t success)
 {
        struct virtual_ethdev_private *dev_private = NULL;
        struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id];
@@ -457,7 +461,7 @@ virtual_ethdev_tx_burst_fn_set_success(uint8_t port_id, uint8_t success)
 }
 
 void
-virtual_ethdev_tx_burst_fn_set_tx_pkt_fail_count(uint8_t port_id,
+virtual_ethdev_tx_burst_fn_set_tx_pkt_fail_count(uint16_t port_id,
                uint8_t packet_fail_count)
 {
        struct virtual_ethdev_private *dev_private = NULL;
@@ -469,7 +473,7 @@ virtual_ethdev_tx_burst_fn_set_tx_pkt_fail_count(uint8_t port_id,
 }
 
 void
-virtual_ethdev_set_link_status(uint8_t port_id, uint8_t link_status)
+virtual_ethdev_set_link_status(uint16_t port_id, uint8_t link_status)
 {
        struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id];
 
@@ -477,18 +481,19 @@ virtual_ethdev_set_link_status(uint8_t port_id, uint8_t link_status)
 }
 
 void
-virtual_ethdev_simulate_link_status_interrupt(uint8_t port_id,
+virtual_ethdev_simulate_link_status_interrupt(uint16_t port_id,
                uint8_t link_status)
 {
        struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id];
 
        vrtl_eth_dev->data->dev_link.link_status = link_status;
 
-       _rte_eth_dev_callback_process(vrtl_eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL);
+       _rte_eth_dev_callback_process(vrtl_eth_dev, RTE_ETH_EVENT_INTR_LSC,
+                                     NULL, NULL);
 }
 
 int
-virtual_ethdev_add_mbufs_to_rx_queue(uint8_t port_id,
+virtual_ethdev_add_mbufs_to_rx_queue(uint16_t port_id,
                struct rte_mbuf **pkt_burst, int burst_length)
 {
        struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id];
@@ -500,7 +505,7 @@ virtual_ethdev_add_mbufs_to_rx_queue(uint8_t port_id,
 }
 
 int
-virtual_ethdev_get_mbufs_from_tx_queue(uint8_t port_id,
+virtual_ethdev_get_mbufs_from_tx_queue(uint16_t port_id,
                struct rte_mbuf **pkt_burst, int burst_length)
 {
        struct virtual_ethdev_private *dev_private;
@@ -511,20 +516,6 @@ virtual_ethdev_get_mbufs_from_tx_queue(uint8_t port_id,
                burst_length, NULL);
 }
 
-static uint8_t
-get_number_of_sockets(void)
-{
-       int sockets = 0;
-       int i;
-       const struct rte_memseg *ms = rte_eal_get_physmem_layout();
-
-       for (i = 0; i < RTE_MAX_MEMSEG && ms[i].addr != NULL; i++) {
-               if (sockets < ms[i].socket_id)
-                       sockets = ms[i].socket_id;
-       }
-       /* Number of sockets = maximum socket_id + 1 */
-       return ++sockets;
-}
 
 int
 virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
@@ -532,7 +523,6 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
 {
        struct rte_pci_device *pci_dev = NULL;
        struct rte_eth_dev *eth_dev = NULL;
-       struct eth_driver *eth_drv = NULL;
        struct rte_pci_driver *pci_drv = NULL;
        struct rte_pci_id *id_table = NULL;
        struct virtual_ethdev_private *dev_private = NULL;
@@ -543,17 +533,10 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
         * and internal (dev_private) data
         */
 
-       if (socket_id >= get_number_of_sockets())
-               goto err;
-
        pci_dev = rte_zmalloc_socket(name, sizeof(*pci_dev), 0, socket_id);
        if (pci_dev == NULL)
                goto err;
 
-       eth_drv = rte_zmalloc_socket(name, sizeof(*eth_drv), 0, socket_id);
-       if (eth_drv == NULL)
-               goto err;
-
        pci_drv = rte_zmalloc_socket(name, sizeof(*pci_drv), 0, socket_id);
        if (pci_drv == NULL)
                goto err;
@@ -585,6 +568,7 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
                goto err;
 
        pci_dev->device.numa_node = socket_id;
+       pci_dev->device.name = eth_dev->data->name;
        pci_drv->driver.name = virtual_ethdev_driver_name;
        pci_drv->id_table = id_table;
 
@@ -594,8 +578,8 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
                pci_drv->drv_flags &= ~RTE_PCI_DRV_INTR_LSC;
 
 
-       eth_drv->pci_drv = (struct rte_pci_driver)(*pci_drv);
-       eth_dev->driver = eth_drv;
+       eth_dev->device = &pci_dev->device;
+       eth_dev->device->driver = &pci_drv->driver;
 
        eth_dev->data->nb_rx_queues = (uint16_t)1;
        eth_dev->data->nb_tx_queues = (uint16_t)1;
@@ -622,7 +606,7 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
        dev_private->dev_ops = virtual_ethdev_default_dev_ops;
        eth_dev->dev_ops = &dev_private->dev_ops;
 
-       pci_dev->device.driver = &eth_drv->pci_drv.driver;
+       pci_dev->device.driver = &pci_drv->driver;
        eth_dev->device = &pci_dev->device;
 
        eth_dev->rx_pkt_burst = virtual_ethdev_rx_burst_success;
@@ -633,7 +617,6 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
 err:
        rte_free(pci_dev);
        rte_free(pci_drv);
-       rte_free(eth_drv);
        rte_free(id_table);
        rte_free(dev_private);