drivers/net: do not use ethdev driver

[dpdk.git] / drivers / net / bnx2x / bnx2x_rxtx.c

diff --git a/drivers/net/bnx2x/bnx2x_rxtx.c b/drivers/net/bnx2x/bnx2x_rxtx.c
index 8eeb9d5..5dd4aee 100644 (file)
--- a/drivers/net/bnx2x/bnx2x_rxtx.c
+++ b/drivers/net/bnx2x/bnx2x_rxtx.c
@@ -19,7 +19,8 @@ ring_dma_zone_reserve(struct rte_eth_dev *dev, const char *ring_name,
        const struct rte_memzone *mz;
 
        snprintf(z_name, sizeof(z_name), "%s_%s_%d_%d",
-                       dev->driver->pci_drv.name, ring_name, dev->data->port_id, queue_id);
+                       dev->device->driver->name, ring_name,
+                       dev->data->port_id, queue_id);
 
        mz = rte_memzone_lookup(z_name);
        if (mz)
@@ -59,7 +60,7 @@ bnx2x_dev_rx_queue_setup(struct rte_eth_dev *dev,
                       uint16_t queue_idx,
                       uint16_t nb_desc,
                       unsigned int socket_id,
-                      const struct rte_eth_rxconf *rx_conf,
+                      __rte_unused const struct rte_eth_rxconf *rx_conf,
                       struct rte_mempool *mp)
 {
        uint16_t j, idx;
@@ -84,7 +85,6 @@ bnx2x_dev_rx_queue_setup(struct rte_eth_dev *dev,
        rxq->mb_pool = mp;
        rxq->queue_id = queue_idx;
        rxq->port_id = dev->data->port_id;
-       rxq->crc_len = (uint8_t)((dev->data->dev_conf.rxmode.hw_strip_crc) ? 0 : ETHER_CRC_LEN);
 
        rxq->nb_rx_pages = 1;
        while (USABLE_RX_BD(rxq) < nb_desc)
@@ -94,13 +94,9 @@ bnx2x_dev_rx_queue_setup(struct rte_eth_dev *dev,
        sc->rx_ring_size = USABLE_RX_BD(rxq);
        rxq->nb_cq_pages = RCQ_BD_PAGES(rxq);
 
-       rxq->rx_free_thresh = rx_conf->rx_free_thresh ?
-               rx_conf->rx_free_thresh : DEFAULT_RX_FREE_THRESH;
-
-       PMD_INIT_LOG(DEBUG, "fp[%02d] req_bd=%u, thresh=%u, usable_bd=%lu, "
+       PMD_INIT_LOG(DEBUG, "fp[%02d] req_bd=%u, usable_bd=%lu, "
                       "total_bd=%lu, rx_pages=%u, cq_pages=%u",
-                      queue_idx, nb_desc, rxq->rx_free_thresh,
-                      (unsigned long)USABLE_RX_BD(rxq),
+                      queue_idx, nb_desc, (unsigned long)USABLE_RX_BD(rxq),
                       (unsigned long)TOTAL_RX_BD(rxq), rxq->nb_rx_pages,
                       rxq->nb_cq_pages);
 
@@ -135,7 +131,6 @@ bnx2x_dev_rx_queue_setup(struct rte_eth_dev *dev,
        }
 
        /* Initialize software ring entries */
-       rxq->rx_mbuf_alloc = 0;
        for (idx = 0; idx < rxq->nb_rx_desc; idx = NEXT_RX_BD(idx)) {
                mbuf = rte_mbuf_raw_alloc(mp);
                if (NULL == mbuf) {
@@ -146,7 +141,6 @@ bnx2x_dev_rx_queue_setup(struct rte_eth_dev *dev,
                }
                rxq->sw_ring[idx] = mbuf;
                rxq->rx_ring[idx] = mbuf->buf_physaddr;
-               rxq->rx_mbuf_alloc++;
        }
        rxq->pkt_first_seg = NULL;
        rxq->pkt_last_seg = NULL;
@@ -211,10 +205,9 @@ bnx2x_xmit_pkts(void *p_txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
        struct bnx2x_tx_queue *txq;
        struct bnx2x_softc *sc;
        struct bnx2x_fastpath *fp;
-       uint32_t burst;
-       struct rte_mbuf **m = tx_pkts;
        uint16_t nb_tx_pkts;
        uint16_t nb_pkt_sent = 0;
+       uint32_t ret;
 
        txq = p_txq;
        sc = txq->sc;
@@ -228,19 +221,23 @@ bnx2x_xmit_pkts(void *p_txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
        if (unlikely(nb_tx_pkts == 0))
                return 0;
 
-       burst = RTE_MIN(nb_tx_pkts, RTE_PMD_BNX2X_TX_MAX_BURST);
-
        while (nb_tx_pkts--) {
+               struct rte_mbuf *m = *tx_pkts++;
                assert(m != NULL);
-               bnx2x_tx_encap(txq, m, burst);
-               bnx2x_update_fp_sb_idx(fp);
-               if ((txq->nb_tx_desc - txq->nb_tx_avail) >
-                                       txq->tx_free_thresh)
-                       bnx2x_txeof(sc, fp);
-               m += burst;
+               ret = bnx2x_tx_encap(txq, m);
+               fp->tx_db.data.prod += ret;
                nb_pkt_sent++;
        }
 
+       bnx2x_update_fp_sb_idx(fp);
+       mb();
+       DOORBELL(sc, txq->queue_id, fp->tx_db.raw);
+       mb();
+
+       if ((txq->nb_tx_desc - txq->nb_tx_avail) >
+                               txq->tx_free_thresh)
+               bnx2x_txeof(sc, fp);
+
        return nb_pkt_sent;
 }
 
@@ -276,6 +273,8 @@ bnx2x_dev_tx_queue_setup(struct rte_eth_dev *dev,
 
        txq->tx_free_thresh = tx_conf->tx_free_thresh ?
                tx_conf->tx_free_thresh : DEFAULT_TX_FREE_THRESH;
+       txq->tx_free_thresh = min(txq->tx_free_thresh,
+                                 txq->nb_tx_desc - BDS_PER_TX_PKT);
 
        PMD_INIT_LOG(DEBUG, "fp[%02d] req_bd=%u, thresh=%u, usable_bd=%lu, "
                     "total_bd=%lu, tx_pages=%u",
@@ -415,7 +414,6 @@ bnx2x_recv_pkts(void *p_rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                rx_mb->next = NULL;
                rx_mb->pkt_len = rx_mb->data_len = len;
                rx_mb->port = rxq->port_id;
-               rx_mb->buf_len = len + pad;
                rte_prefetch1(rte_pktmbuf_mtod(rx_mb, void *));
 
                /*