From: Chengwen Feng <fengcheng...@huawei.com>
Claim PMD does not require IOVA mbuf field,
so it can build when disabling enable_iova_as_pa.
Signed-off-by: Chengwen Feng <fengcheng...@huawei.com>
Reviewed-by: Ruifeng Wang <ruifeng.w...@arm.com>
Acked-by: Dongdong Liu <liudongdo...@huawei.com>
---
drivers/net/hns3/hns3_rxtx_vec_neon.h | 2 +-
drivers/net/hns3/hns3_rxtx_vec_sve.c | 13 +++++++++----
drivers/net/hns3/meson.build | 6 ++----
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/drivers/net/hns3/hns3_rxtx_vec_neon.h
b/drivers/net/hns3/hns3_rxtx_vec_neon.h
index 55d9bf817d..6c49c70fc7 100644
--- a/drivers/net/hns3/hns3_rxtx_vec_neon.h
+++ b/drivers/net/hns3/hns3_rxtx_vec_neon.h
@@ -13,7 +13,7 @@ static inline void
hns3_vec_tx(volatile struct hns3_desc *desc, struct rte_mbuf *pkt)
{
uint64x2_t val1 = {
- pkt->buf_iova + pkt->data_off,
+ rte_pktmbuf_iova(pkt),
((uint64_t)pkt->data_len) << HNS3_TXD_SEND_SIZE_SHIFT
};
uint64x2_t val2 = {
diff --git a/drivers/net/hns3/hns3_rxtx_vec_sve.c
b/drivers/net/hns3/hns3_rxtx_vec_sve.c
index 6f23ba674d..8bfc3de049 100644
--- a/drivers/net/hns3/hns3_rxtx_vec_sve.c
+++ b/drivers/net/hns3/hns3_rxtx_vec_sve.c
@@ -261,10 +261,10 @@ hns3_rxq_rearm_mbuf_sve(struct hns3_rx_queue *rxq)
for (i = 0; i < HNS3_DEFAULT_RXQ_REARM_THRESH; i += REARM_LOOP_STEP_NUM,
rxep += REARM_LOOP_STEP_NUM, rxdp += REARM_LOOP_STEP_NUM) {
uint64_t iova[REARM_LOOP_STEP_NUM];
- iova[0] = rxep[0].mbuf->buf_iova;
- iova[1] = rxep[1].mbuf->buf_iova;
- iova[2] = rxep[2].mbuf->buf_iova;
- iova[3] = rxep[3].mbuf->buf_iova;
+ iova[0] = rte_mbuf_iova_get(rxep[0].mbuf);
+ iova[1] = rte_mbuf_iova_get(rxep[1].mbuf);
+ iova[2] = rte_mbuf_iova_get(rxep[2].mbuf);
+ iova[3] = rte_mbuf_iova_get(rxep[3].mbuf);
svuint64_t siova = svld1_u64(PG64_256BIT, iova);
siova = svadd_n_u64_z(PG64_256BIT, siova, RTE_PKTMBUF_HEADROOM);
svuint64_t ol_base = svdup_n_u64(0);
@@ -397,8 +397,13 @@ hns3_tx_fill_hw_ring_sve(struct hns3_tx_queue *txq,
pg = svwhilelt_b64_u32(i, nb_pkts);
base_addr = svld1_u64(pg, (uint64_t *)pkts);
/* calc mbuf's field buf_iova address */
+#if RTE_IOVA_IN_MBUF
buf_iova = svadd_n_u64_z(pg, base_addr,
offsetof(struct rte_mbuf, buf_iova));
+#else
+ buf_iova = svadd_n_u64_z(pg, base_addr,
+ offsetof(struct rte_mbuf, buf_addr));
+#endif
/* calc mbuf's field data_off address */
data_off = svadd_n_u64_z(pg, base_addr,
offsetof(struct rte_mbuf, data_off));
diff --git a/drivers/net/hns3/meson.build b/drivers/net/hns3/meson.build
index 2c71105275..97cb85dcc8 100644
--- a/drivers/net/hns3/meson.build
+++ b/drivers/net/hns3/meson.build
@@ -13,10 +13,6 @@ if arch_subdir != 'x86' and arch_subdir != 'arm' or not
dpdk_conf.get('RTE_ARCH_
subdir_done()
endif
-if dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0
- subdir_done()
-endif
-
sources = files(
'hns3_cmd.c',
'hns3_dcb.c',
@@ -37,6 +33,8 @@ sources = files(
'hns3_dump.c',
)
+require_iova_in_mbuf = false
+
deps += ['hash']
if arch_subdir == 'arm' and dpdk_conf.get('RTE_ARCH_64')
--
2.39.1
