From: Jun Yang <[email protected]> Rename the Rx-side device flags to a consistent DPAA2_RX_*_FLAG naming: DPAAX_RX_ERROR_QUEUE_FLAG becomes DPAA2_RX_ERROR_QUEUE_FLAG and DPAA2_DATA_STASHING_OFF becomes DPAA2_RX_DATA_STASHING_OFF_FLAG.
This is a mechanical rename with no functional change; it prepares the flag namespace for the Tx confirmation rework that follows. Signed-off-by: Jun Yang <[email protected]> --- drivers/net/dpaa2/dpaa2_ethdev.c | 10 +++++----- drivers/net/dpaa2/dpaa2_ethdev.h | 4 ++-- drivers/net/dpaa2/dpaa2_rxtx.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index 57c6e8e90b..15a886b3e8 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -547,7 +547,7 @@ dpaa2_alloc_rx_tx_queues(struct rte_eth_dev *dev) goto fail; } - if (priv->flags & DPAAX_RX_ERROR_QUEUE_FLAG) { + if (priv->flags & DPAA2_RX_ERROR_QUEUE_FLAG) { priv->rx_err_vq = rte_zmalloc("dpni_rx_err", sizeof(struct dpaa2_queue), 0); if (!priv->rx_err_vq) { @@ -1041,7 +1041,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev, qopt |= DPNI_QUEUE_OPT_FLC; cfg->flc.stash_control = true; dpaa2_flc_stashing_clear_all(&cfg->flc.value); - if (priv->flags & DPAA2_DATA_STASHING_OFF) { + if (priv->flags & DPAA2_RX_DATA_STASHING_OFF_FLAG) { dpaa2_flc_stashing_set(DPAA2_FLC_DATA_STASHING, 0, &cfg->flc.value); dpaa2_q->data_stashing_off = 1; @@ -1499,7 +1499,7 @@ dpaa2_dev_start(struct rte_eth_dev *dev) dpaa2_q->fqid = qid.fqid; } - if (priv->flags & DPAAX_RX_ERROR_QUEUE_FLAG) { + if (priv->flags & DPAA2_RX_ERROR_QUEUE_FLAG) { ret = dpni_get_queue(dpni, CMD_PRI_LOW, priv->token, DPNI_QUEUE_RX_ERR, 0, 0, &cfg, &qid); if (ret) { @@ -3462,7 +3462,7 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev) if (dpaa2_get_devargs(dev->devargs, DRIVER_NO_DATA_STASHING) || getenv("DPAA2_DATA_STASHING_OFF")) { - priv->flags |= DPAA2_DATA_STASHING_OFF; + priv->flags |= DPAA2_RX_DATA_STASHING_OFF_FLAG; DPAA2_PMD_INFO("Data stashing disabled"); } @@ -3592,7 +3592,7 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev) } if (dpaa2_get_devargs(dev->devargs, DRIVER_ERROR_QUEUE)) { - priv->flags |= DPAAX_RX_ERROR_QUEUE_FLAG; + priv->flags |= DPAA2_RX_ERROR_QUEUE_FLAG; DPAA2_PMD_INFO("Enable error queue"); } diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h index 3c611652b1..28623dc37d 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.h +++ b/drivers/net/dpaa2/dpaa2_ethdev.h @@ -100,9 +100,9 @@ #define DPAA2_TX_DYNAMIC_CONF_ENABLE RTE_BIT32(9) /* Disable data stashing (prefetch of packet data into CPU cache) */ -#define DPAA2_DATA_STASHING_OFF RTE_BIT32(10) +#define DPAA2_RX_DATA_STASHING_OFF_FLAG RTE_BIT32(10) -#define DPAAX_RX_ERROR_QUEUE_FLAG RTE_BIT32(11) +#define DPAA2_RX_ERROR_QUEUE_FLAG RTE_BIT32(11) #define DPAA2_RX_PRINT_PSR_RESULT_FLAG RTE_BIT32(12) /* DPDMUX index for DPMAC */ diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index ccb4bbe7dc..a03e3fd8db 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -870,7 +870,7 @@ dpaa2_dev_prefetch_rx_common(void *queue, struct rte_mbuf **bufs, q_storage = dpaa2_q->q_storage[rte_lcore_id()]; - if (unlikely(priv->flags & DPAAX_RX_ERROR_QUEUE_FLAG)) + if (unlikely(priv->flags & DPAA2_RX_ERROR_QUEUE_FLAG)) dump_err_pkts(priv->rx_err_vq); if (unlikely(!DPAA2_PER_LCORE_ETHRX_DPIO)) { @@ -1142,7 +1142,7 @@ dpaa2_dev_rx_common(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts, struct rte_eth_dev_data *eth_data = dpaa2_q->eth_data; struct dpaa2_dev_priv *priv = eth_data->dev_private; - if (!by_channel && unlikely(priv->flags & DPAAX_RX_ERROR_QUEUE_FLAG)) + if (!by_channel && unlikely(priv->flags & DPAA2_RX_ERROR_QUEUE_FLAG)) dump_err_pkts(priv->rx_err_vq); if (by_channel) { -- 2.43.0
