New upstream version 17.11-rc3

[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 5dd4aee..a0d4ac9 100644 (file)
--- a/drivers/net/bnx2x/bnx2x_rxtx.c
+++ b/drivers/net/bnx2x/bnx2x_rxtx.c
@@ -71,8 +71,8 @@ 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),
@@ -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. */
@@ -289,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);
 
@@ -400,7 +400,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]);
@@ -422,7 +422,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;