New upstream version 17.11.5

[deb_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 170e48f..fdbc90e 100644 (file)
--- a/drivers/net/bnx2x/bnx2x_rxtx.c
+++ b/drivers/net/bnx2x/bnx2x_rxtx.c
@@ -19,7 +19,7 @@ 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.driver.name, ring_name,
+                       dev->device->driver->name, ring_name,
                        dev->data->port_id, queue_id);
 
        mz = rte_memzone_lookup(z_name);
@@ -71,14 +71,14 @@ bnx2x_dev_rx_queue_setup(struct rte_eth_dev *dev,
        struct bnx2x_softc *sc = dev->data->dev_private;
        struct bnx2x_fastpath *fp = &sc->fp[queue_idx];
        struct eth_rx_cqe_next_page *nextpg;
-       phys_addr_t *rx_bd;
-       phys_addr_t busaddr;
+       rte_iova_t *rx_bd;
+       rte_iova_t busaddr;
 
        /* First allocate the rx queue data structure */
        rxq = rte_zmalloc_socket("ethdev RX queue", sizeof(struct bnx2x_rx_queue),
                                 RTE_CACHE_LINE_SIZE, socket_id);
        if (NULL == rxq) {
-               PMD_INIT_LOG(ERR, "rte_zmalloc for rxq failed!");
+               PMD_DRV_LOG(ERR, sc, "rte_zmalloc for rxq failed!");
                return -ENOMEM;
        }
        rxq->sc = sc;
@@ -94,7 +94,7 @@ 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);
 
-       PMD_INIT_LOG(DEBUG, "fp[%02d] req_bd=%u, usable_bd=%lu, "
+       PMD_DRV_LOG(DEBUG, sc, "fp[%02d] req_bd=%u, usable_bd=%lu, "
                       "total_bd=%lu, rx_pages=%u, cq_pages=%u",
                       queue_idx, nb_desc, (unsigned long)USABLE_RX_BD(rxq),
                       (unsigned long)TOTAL_RX_BD(rxq), rxq->nb_rx_pages,
@@ -108,7 +108,7 @@ bnx2x_dev_rx_queue_setup(struct rte_eth_dev *dev,
                bnx2x_rx_queue_release(rxq);
                return -ENOMEM;
        }
-       fp->rx_desc_mapping = rxq->rx_ring_phys_addr = (uint64_t)dma->phys_addr;
+       fp->rx_desc_mapping = rxq->rx_ring_phys_addr = (uint64_t)dma->iova;
        rxq->rx_ring = (uint64_t*)dma->addr;
        memset((void *)rxq->rx_ring, 0, dma_size);
 
@@ -140,7 +140,7 @@ bnx2x_dev_rx_queue_setup(struct rte_eth_dev *dev,
                        return -ENOMEM;
                }
                rxq->sw_ring[idx] = mbuf;
-               rxq->rx_ring[idx] = mbuf->buf_physaddr;
+               rxq->rx_ring[idx] = mbuf->buf_iova;
        }
        rxq->pkt_first_seg = NULL;
        rxq->pkt_last_seg = NULL;
@@ -154,7 +154,7 @@ bnx2x_dev_rx_queue_setup(struct rte_eth_dev *dev,
                PMD_RX_LOG(ERR, "RCQ  alloc failed");
                return -ENOMEM;
        }
-       fp->rx_comp_mapping = rxq->cq_ring_phys_addr = (uint64_t)dma->phys_addr;
+       fp->rx_comp_mapping = rxq->cq_ring_phys_addr = (uint64_t)dma->iova;
        rxq->cq_ring = (union eth_rx_cqe*)dma->addr;
 
        /* Link the CQ chain pages. */
@@ -273,8 +273,10 @@ 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, "
+       PMD_DRV_LOG(DEBUG, sc, "fp[%02d] req_bd=%u, thresh=%u, usable_bd=%lu, "
                     "total_bd=%lu, tx_pages=%u",
                     queue_idx, nb_desc, txq->tx_free_thresh,
                     (unsigned long)USABLE_TX_BD(txq),
@@ -287,7 +289,7 @@ bnx2x_dev_tx_queue_setup(struct rte_eth_dev *dev,
                bnx2x_tx_queue_release(txq);
                return -ENOMEM;
        }
-       fp->tx_desc_mapping = txq->tx_ring_phys_addr = (uint64_t)tz->phys_addr;
+       fp->tx_desc_mapping = txq->tx_ring_phys_addr = (uint64_t)tz->iova;
        txq->tx_ring = (union eth_tx_bd_types *) tz->addr;
        memset(txq->tx_ring, 0, tsize);
 
@@ -300,7 +302,7 @@ bnx2x_dev_tx_queue_setup(struct rte_eth_dev *dev,
                return -ENOMEM;
        }
 
-       /* PMD_DRV_LOG(DEBUG, "sw_ring=%p hw_ring=%p dma_addr=0x%"PRIx64,
+       /* PMD_DRV_LOG(DEBUG, sc, "sw_ring=%p hw_ring=%p dma_addr=0x%"PRIx64,
           txq->sw_ring, txq->tx_ring, txq->tx_ring_phys_addr); */
 
        /* Link TX pages */
@@ -309,7 +311,9 @@ bnx2x_dev_tx_queue_setup(struct rte_eth_dev *dev,
                busaddr = txq->tx_ring_phys_addr + BNX2X_PAGE_SIZE * (i % txq->nb_tx_pages);
                tx_n_bd->addr_hi = rte_cpu_to_le_32(U64_HI(busaddr));
                tx_n_bd->addr_lo = rte_cpu_to_le_32(U64_LO(busaddr));
-               /* PMD_DRV_LOG(DEBUG, "link tx page %lu", (TOTAL_TX_BD_PER_PAGE * i - 1)); */
+               /* PMD_DRV_LOG(DEBUG, sc, "link tx page %lu",
+                *          (TOTAL_TX_BD_PER_PAGE * i - 1));
+                */
        }
 
        txq->queue_id = queue_idx;
@@ -398,7 +402,7 @@ bnx2x_recv_pkts(void *p_rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 
                rx_mb = rxq->sw_ring[bd_cons];
                rxq->sw_ring[bd_cons] = new_mb;
-               rxq->rx_ring[bd_prod] = new_mb->buf_physaddr;
+               rxq->rx_ring[bd_prod] = new_mb->buf_iova;
 
                rx_pref = NEXT_RX_BD(bd_cons) & MAX_RX_BD(rxq);
                rte_prefetch0(rxq->sw_ring[rx_pref]);
@@ -420,7 +424,7 @@ bnx2x_recv_pkts(void *p_rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                 */
                if (cqe_fp->pars_flags.flags & PARSING_FLAGS_VLAN) {
                        rx_mb->vlan_tci = cqe_fp->vlan_tag;
-                       rx_mb->ol_flags |= PKT_RX_VLAN_PKT;
+                       rx_mb->ol_flags |= PKT_RX_VLAN;
                }
 
                rx_pkts[nb_rx] = rx_mb;
@@ -459,9 +463,12 @@ bnx2x_dev_rx_init(struct rte_eth_dev *dev)
 void
 bnx2x_dev_clear_queues(struct rte_eth_dev *dev)
 {
+#ifdef RTE_LIBRTE_BNX2X_DEBUG_INIT
+       struct bnx2x_softc *sc = dev->data->dev_private;
+#endif
        uint8_t i;
 
-       PMD_INIT_FUNC_TRACE();
+       PMD_INIT_FUNC_TRACE(sc);
 
        for (i = 0; i < dev->data->nb_tx_queues; i++) {
                struct bnx2x_tx_queue *txq = dev->data->tx_queues[i];