ixgbe: rework vector pmd following mbuf changes

[dpdk.git] / lib / librte_pmd_vmxnet3 / vmxnet3_ethdev.c

diff --git a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c b/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c
index afff8b6..c6e69f2 100644 (file)
--- a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c
+++ b/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c
@@ -186,8 +186,7 @@ eth_vmxnet3_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,
                     struct rte_eth_dev *eth_dev)
 {
        struct rte_pci_device *pci_dev;
-       struct vmxnet3_hw *hw =
-               VMXNET3_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
+       struct vmxnet3_hw *hw = eth_dev->data->dev_private;
        uint32_t mac_hi, mac_lo, ver;
 
        PMD_INIT_FUNC_TRACE();
@@ -271,7 +270,7 @@ static struct eth_driver rte_vmxnet3_pmd = {
                .drv_flags = RTE_PCI_DRV_NEED_MAPPING,
        },
        .eth_dev_init = eth_vmxnet3_dev_init,
-       .dev_private_size = sizeof(struct vmxnet3_adapter),
+       .dev_private_size = sizeof(struct vmxnet3_hw),
 };
 
 /*
@@ -292,8 +291,7 @@ static int
 vmxnet3_dev_configure(struct rte_eth_dev *dev)
 {
        const struct rte_memzone *mz;
-       struct vmxnet3_hw *hw =
-               VMXNET3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct vmxnet3_hw *hw = dev->data->dev_private;
        size_t size;
 
        PMD_INIT_FUNC_TRACE();
@@ -368,7 +366,7 @@ static int
 vmxnet3_setup_driver_shared(struct rte_eth_dev *dev)
 {
        struct rte_eth_conf port_conf = dev->data->dev_conf;
-       struct vmxnet3_hw *hw = VMXNET3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct vmxnet3_hw *hw = dev->data->dev_private;
        Vmxnet3_DriverShared *shared = hw->shared;
        Vmxnet3_DSDevRead *devRead = &shared->devRead;
        uint32_t *mac_ptr;
@@ -487,7 +485,7 @@ static int
 vmxnet3_dev_start(struct rte_eth_dev *dev)
 {
        int status, ret;
-       struct vmxnet3_hw *hw = VMXNET3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct vmxnet3_hw *hw = dev->data->dev_private;
 
        PMD_INIT_FUNC_TRACE();
 
@@ -524,7 +522,7 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)
        }
 
        /* Setting proper Rx Mode and issue Rx Mode Update command */
-       vmxnet3_dev_set_rxmode(hw, VMXNET3_RXM_UCAST | VMXNET3_RXM_ALL_MULTI, 1);
+       vmxnet3_dev_set_rxmode(hw, VMXNET3_RXM_UCAST | VMXNET3_RXM_BCAST, 1);
 
        /*
         * Don't need to handle events for now
@@ -544,8 +542,7 @@ static void
 vmxnet3_dev_stop(struct rte_eth_dev *dev)
 {
        struct rte_eth_link link;
-       struct vmxnet3_hw *hw =
-               VMXNET3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct vmxnet3_hw *hw = dev->data->dev_private;
 
        PMD_INIT_FUNC_TRACE();
 
@@ -580,8 +577,7 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev)
 static void
 vmxnet3_dev_close(struct rte_eth_dev *dev)
 {
-       struct vmxnet3_hw *hw =
-               VMXNET3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct vmxnet3_hw *hw = dev->data->dev_private;
 
        PMD_INIT_FUNC_TRACE();
 
@@ -594,43 +590,47 @@ static void
 vmxnet3_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 {
        unsigned int i;
-       struct vmxnet3_hw *hw = VMXNET3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct vmxnet3_hw *hw = dev->data->dev_private;
 
        VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, VMXNET3_CMD_GET_STATS);
 
-       stats->opackets = 0;
-       stats->obytes = 0;
-       stats->oerrors = 0;
-       stats->ipackets = 0;
-       stats->ibytes = 0;
-       stats->rx_nombuf = 0;
-       stats->ierrors = 0;
-       stats->imcasts  = 0;
-       stats->fdirmatch = 0;
-       stats->fdirmiss = 0;
-
+       RTE_BUILD_BUG_ON(RTE_ETHDEV_QUEUE_STAT_CNTRS < VMXNET3_MAX_TX_QUEUES);
        for (i = 0; i < hw->num_tx_queues; i++) {
-               stats->opackets += hw->tqd_start[i].stats.ucastPktsTxOK +
-                               hw->tqd_start[i].stats.mcastPktsTxOK +
-                               hw->tqd_start[i].stats.bcastPktsTxOK;
-               stats->obytes   += hw->tqd_start[i].stats.ucastBytesTxOK +
-                               hw->tqd_start[i].stats.mcastBytesTxOK +
-                               hw->tqd_start[i].stats.bcastBytesTxOK;
-               stats->oerrors  += hw->tqd_start[i].stats.pktsTxError +
-                               hw->tqd_start[i].stats.pktsTxDiscard;
+               struct UPT1_TxStats *txStats = &hw->tqd_start[i].stats;
+
+               stats->q_opackets[i] = txStats->ucastPktsTxOK +
+                       txStats->mcastPktsTxOK +
+                       txStats->bcastPktsTxOK;
+               stats->q_obytes[i] = txStats->ucastBytesTxOK +
+                       txStats->mcastBytesTxOK +
+                       txStats->bcastBytesTxOK;
+
+               stats->opackets += stats->q_opackets[i];
+               stats->obytes += stats->q_obytes[i];
+               stats->oerrors += txStats->pktsTxError +
+                       txStats->pktsTxDiscard;
        }
 
+       RTE_BUILD_BUG_ON(RTE_ETHDEV_QUEUE_STAT_CNTRS < VMXNET3_MAX_RX_QUEUES);
        for (i = 0; i < hw->num_rx_queues; i++) {
-               stats->ipackets  += hw->rqd_start[i].stats.ucastPktsRxOK +
-                               hw->rqd_start[i].stats.mcastPktsRxOK +
-                               hw->rqd_start[i].stats.bcastPktsRxOK;
-               stats->ibytes    += hw->rqd_start[i].stats.ucastBytesRxOK +
-                               hw->rqd_start[i].stats.mcastBytesRxOK +
-                               hw->rqd_start[i].stats.bcastBytesRxOK;
-               stats->rx_nombuf += hw->rqd_start[i].stats.pktsRxOutOfBuf;
-               stats->ierrors   += hw->rqd_start[i].stats.pktsRxError;
-       }
+               struct UPT1_RxStats *rxStats = &hw->rqd_start[i].stats;
+
+               stats->q_ipackets[i] = rxStats->ucastPktsRxOK +
+                       rxStats->mcastPktsRxOK +
+                       rxStats->bcastPktsRxOK;
 
+               stats->q_ibytes[i] = rxStats->ucastBytesRxOK +
+                       rxStats->mcastBytesRxOK +
+                       rxStats->bcastBytesRxOK;
+
+               stats->ipackets += stats->q_ipackets[i];
+               stats->ibytes += stats->q_ibytes[i];
+
+               stats->q_errors[i] = rxStats->pktsRxError;
+               stats->ierrors += rxStats->pktsRxError;
+               stats->imcasts += rxStats->mcastPktsRxOK;
+               stats->rx_nombuf += rxStats->pktsRxOutOfBuf;
+       }
 }
 
 static void
@@ -647,7 +647,7 @@ vmxnet3_dev_info_get(__attribute__((unused))struct rte_eth_dev *dev, struct rte_
 static int
 vmxnet3_dev_link_update(struct rte_eth_dev *dev, __attribute__((unused)) int wait_to_complete)
 {
-       struct vmxnet3_hw *hw = VMXNET3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct vmxnet3_hw *hw = dev->data->dev_private;
        struct rte_eth_link link;
        uint32_t ret;
 
@@ -690,7 +690,7 @@ vmxnet3_dev_set_rxmode(struct vmxnet3_hw *hw, uint32_t feature, int set) {
 static void
 vmxnet3_dev_promiscuous_enable(struct rte_eth_dev *dev)
 {
-       struct vmxnet3_hw *hw = VMXNET3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct vmxnet3_hw *hw = dev->data->dev_private;
 
        vmxnet3_dev_set_rxmode(hw, VMXNET3_RXM_PROMISC, 1);
 }
@@ -699,7 +699,7 @@ vmxnet3_dev_promiscuous_enable(struct rte_eth_dev *dev)
 static void
 vmxnet3_dev_promiscuous_disable(struct rte_eth_dev *dev)
 {
-       struct vmxnet3_hw *hw = VMXNET3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct vmxnet3_hw *hw = dev->data->dev_private;
 
        vmxnet3_dev_set_rxmode(hw, VMXNET3_RXM_PROMISC, 0);
 }
@@ -708,7 +708,7 @@ vmxnet3_dev_promiscuous_disable(struct rte_eth_dev *dev)
 static void
 vmxnet3_dev_allmulticast_enable(struct rte_eth_dev *dev)
 {
-       struct vmxnet3_hw *hw = VMXNET3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct vmxnet3_hw *hw = dev->data->dev_private;
 
        vmxnet3_dev_set_rxmode(hw, VMXNET3_RXM_ALL_MULTI, 1);
 }
@@ -717,7 +717,7 @@ vmxnet3_dev_allmulticast_enable(struct rte_eth_dev *dev)
 static void
 vmxnet3_dev_allmulticast_disable(struct rte_eth_dev *dev)
 {
-       struct vmxnet3_hw *hw = VMXNET3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct vmxnet3_hw *hw = dev->data->dev_private;
 
        vmxnet3_dev_set_rxmode(hw, VMXNET3_RXM_ALL_MULTI, 0);
 }