git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/bntx: use new API to get iova address XXX
[dpdk.git]
/
drivers
/
net
/
bnxt
/
bnxt_rxr.c
diff --git
a/drivers/net/bnxt/bnxt_rxr.c
b/drivers/net/bnxt/bnxt_rxr.c
index
d68d26f
..
226de3c
100644
(file)
--- a/
drivers/net/bnxt/bnxt_rxr.c
+++ b/
drivers/net/bnxt/bnxt_rxr.c
@@
-65,17
+65,17
@@
static inline int bnxt_alloc_rx_data(struct bnxt_rx_queue *rxq,
{
struct rx_prod_pkt_bd *rxbd = &rxr->rx_desc_ring[prod];
struct bnxt_sw_rx_bd *rx_buf = &rxr->rx_buf_ring[prod];
{
struct rx_prod_pkt_bd *rxbd = &rxr->rx_desc_ring[prod];
struct bnxt_sw_rx_bd *rx_buf = &rxr->rx_buf_ring[prod];
- struct rte_mbuf *
data
;
+ struct rte_mbuf *
m
;
-
data
= __bnxt_alloc_rx_data(rxq->mb_pool);
- if (!
data
) {
+
m
= __bnxt_alloc_rx_data(rxq->mb_pool);
+ if (!
m
) {
rte_atomic64_inc(&rxq->bp->rx_mbuf_alloc_fail);
return -ENOMEM;
}
rte_atomic64_inc(&rxq->bp->rx_mbuf_alloc_fail);
return -ENOMEM;
}
- rx_buf->mbuf =
data
;
+ rx_buf->mbuf =
m
;
- rxbd->addr = rte_cpu_to_le_64(
RTE_MBUF_DATA_DMA_ADDR(rx_buf->mbuf
));
+ rxbd->addr = rte_cpu_to_le_64(
rte_mbuf_data_iova_default(m
));
return 0;
}
return 0;
}
@@
-86,10
+86,10
@@
static inline int bnxt_alloc_ag_data(struct bnxt_rx_queue *rxq,
{
struct rx_prod_pkt_bd *rxbd = &rxr->ag_desc_ring[prod];
struct bnxt_sw_rx_bd *rx_buf = &rxr->ag_buf_ring[prod];
{
struct rx_prod_pkt_bd *rxbd = &rxr->ag_desc_ring[prod];
struct bnxt_sw_rx_bd *rx_buf = &rxr->ag_buf_ring[prod];
- struct rte_mbuf *
data
;
+ struct rte_mbuf *
m
;
-
data
= __bnxt_alloc_rx_data(rxq->mb_pool);
- if (!
data
) {
+
m
= __bnxt_alloc_rx_data(rxq->mb_pool);
+ if (!
m
) {
rte_atomic64_inc(&rxq->bp->rx_mbuf_alloc_fail);
return -ENOMEM;
}
rte_atomic64_inc(&rxq->bp->rx_mbuf_alloc_fail);
return -ENOMEM;
}
@@
-100,9
+100,9
@@
static inline int bnxt_alloc_ag_data(struct bnxt_rx_queue *rxq,
RTE_LOG(ERR, PMD, "Jumbo Frame. rx_buf is NULL\n");
RTE_LOG(ERR, PMD, "Jumbo Frame. rx_buf is NULL\n");
- rx_buf->mbuf =
data
;
+ rx_buf->mbuf =
m
;
- rxbd->addr = rte_cpu_to_le_64(
RTE_MBUF_DATA_DMA_ADDR(rx_buf->mbuf
));
+ rxbd->addr = rte_cpu_to_le_64(
rte_mbuf_data_iova_default(m
));
return 0;
}
return 0;
}
@@
-123,7
+123,7
@@
static inline void bnxt_reuse_rx_mbuf(struct bnxt_rx_ring_info *rxr,
prod_bd = &rxr->rx_desc_ring[prod];
prod_bd = &rxr->rx_desc_ring[prod];
- prod_bd->addr = rte_cpu_to_le_64(
RTE_MBUF_DATA_DMA_ADDR
(mbuf));
+ prod_bd->addr = rte_cpu_to_le_64(
rte_mbuf_data_iova_default
(mbuf));
rxr->rx_prod = prod;
}
rxr->rx_prod = prod;
}
@@
-199,7
+199,7
@@
static void bnxt_tpa_start(struct bnxt_rx_queue *rxq,
if (tpa_start1->flags2 &
rte_cpu_to_le_32(RX_TPA_START_CMPL_FLAGS2_META_FORMAT_VLAN)) {
mbuf->vlan_tci = rte_le_to_cpu_32(tpa_start1->metadata);
if (tpa_start1->flags2 &
rte_cpu_to_le_32(RX_TPA_START_CMPL_FLAGS2_META_FORMAT_VLAN)) {
mbuf->vlan_tci = rte_le_to_cpu_32(tpa_start1->metadata);
- mbuf->ol_flags |= PKT_RX_VLAN
_PKT
;
+ mbuf->ol_flags |= PKT_RX_VLAN;
}
if (likely(tpa_start1->flags2 &
rte_cpu_to_le_32(RX_TPA_START_CMPL_FLAGS2_L4_CS_CALC)))
}
if (likely(tpa_start1->flags2 &
rte_cpu_to_le_32(RX_TPA_START_CMPL_FLAGS2_L4_CS_CALC)))
@@
-442,6
+442,7
@@
static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
rte_prefetch0(mbuf);
rte_prefetch0(mbuf);
+ mbuf->data_off = RTE_PKTMBUF_HEADROOM;
mbuf->nb_segs = 1;
mbuf->next = NULL;
mbuf->pkt_len = rxcmp->len;
mbuf->nb_segs = 1;
mbuf->next = NULL;
mbuf->pkt_len = rxcmp->len;
@@
-464,7
+465,7
@@
static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
(RX_PKT_CMPL_METADATA_VID_MASK |
RX_PKT_CMPL_METADATA_DE |
RX_PKT_CMPL_METADATA_PRI_MASK);
(RX_PKT_CMPL_METADATA_VID_MASK |
RX_PKT_CMPL_METADATA_DE |
RX_PKT_CMPL_METADATA_PRI_MASK);
- mbuf->ol_flags |= PKT_RX_VLAN
_PKT
;
+ mbuf->ol_flags |= PKT_RX_VLAN;
}
if (likely(RX_CMP_IP_CS_OK(rxcmp1)))
}
if (likely(RX_CMP_IP_CS_OK(rxcmp1)))