d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/dpaa2: support dynamic logging

Browse Source 
Signed-off-by: Shreyansh Jain <shreyansh.jain@nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
This commit is contained in:
Shreyansh Jain 2018-04-02 19:35:57 +05:30 committed by Thomas Monjalon
parent 3646ccf0b0
commit a10a988a0b
8 changed files with 258 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/common_base
View File

@ -189,11 +189,7 @@ CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA=y
# Compile burst-oriented NXP DPAA2 PMD driver # Compile burst-oriented NXP DPAA2 PMD driver
# #
CONFIG_RTE_LIBRTE_DPAA2_PMD=n CONFIG_RTE_LIBRTE_DPAA2_PMD=n
CONFIG_RTE_LIBRTE_DPAA2_DEBUG_INIT=n
CONFIG_RTE_LIBRTE_DPAA2_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_DPAA2_DEBUG_DRIVER=n
CONFIG_RTE_LIBRTE_DPAA2_DEBUG_RX=n
CONFIG_RTE_LIBRTE_DPAA2_DEBUG_TX=n
CONFIG_RTE_LIBRTE_DPAA2_DEBUG_TX_FREE=n
# #
# Compile burst-oriented Amazon ENA PMD driver # Compile burst-oriented Amazon ENA PMD driver

8
config/defconfig_arm64-dpaa2-linuxapp-gcc
View File

@ -26,15 +26,7 @@ CONFIG_RTE_LIBRTE_VHOST_NUMA=n
# Compile Support Libraries for DPAA2 # Compile Support Libraries for DPAA2
# #
CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA=n CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA=n
#
# Compile burst-oriented NXP DPAA2 PMD driver
#
CONFIG_RTE_LIBRTE_DPAA2_DEBUG_INIT=n
CONFIG_RTE_LIBRTE_DPAA2_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_DPAA2_DEBUG_DRIVER=n
CONFIG_RTE_LIBRTE_DPAA2_DEBUG_RX=n
CONFIG_RTE_LIBRTE_DPAA2_DEBUG_TX=n
CONFIG_RTE_LIBRTE_DPAA2_DEBUG_TX_FREE=n
# #
# Compile NXP DPAA2 crypto sec driver for CAAM HW # Compile NXP DPAA2 crypto sec driver for CAAM HW

42
doc/guides/nics/dpaa2.rst
View File

@ -494,28 +494,12 @@ Please note that enabling debugging options may affect system performance.
- ``CONFIG_RTE_LIBRTE_DPAA2_DEBUG_DRIVER`` (default ``n``) - ``CONFIG_RTE_LIBRTE_DPAA2_DEBUG_DRIVER`` (default ``n``)
Toggle display of generic debugging messages Toggle display of debugging messages/logic
- ``CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA`` (default ``y``) - ``CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA`` (default ``y``)
Toggle to use physical address vs virtual address for hardware accelerators. Toggle to use physical address vs virtual address for hardware accelerators.
- ``CONFIG_RTE_LIBRTE_DPAA2_DEBUG_INIT`` (default ``n``)
Toggle display of initialization related messages.
- ``CONFIG_RTE_LIBRTE_DPAA2_DEBUG_RX`` (default ``n``)
Toggle display of receive fast path run-time message
- ``CONFIG_RTE_LIBRTE_DPAA2_DEBUG_TX`` (default ``n``)
Toggle display of transmit fast path run-time message
- ``CONFIG_RTE_LIBRTE_DPAA2_DEBUG_TX_FREE`` (default ``n``)
Toggle display of transmit fast path buffer free run-time message
Driver compilation and testing Driver compilation and testing
------------------------------ ------------------------------
@ -532,8 +516,7 @@ for details.
.. code-block:: console .. code-block:: console
./arm64-dpaa2-linuxapp-gcc/testpmd -c 0xff -n 1 \ ./testpmd -c 0xff -n 1 -- -i --portmask=0x3 --nb-cores=1 --no-flush-rx
-- -i --portmask=0x3 --nb-cores=1 --no-flush-rx
..... .....
EAL: Registered [pci] bus. EAL: Registered [pci] bus.
@ -557,6 +540,27 @@ for details.
Done Done
testpmd> testpmd>
Enabling logs
-------------
For enabling logging for DPAA2 PMD, following log-level prefix can be used:
.. code-block:: console
<dpdk app> <EAL args> --log-level=bus.fslmc,<level> -- ...
Using ``bus.fslmc`` as log matching criteria, all FSLMC bus logs can be enabled
which are lower than logging ``level``.
Or
.. code-block:: console
<dpdk app> <EAL args> --log-level=pmd.net.dpaa2,<level> -- ...
Using ``pmd.dpaa2`` as log matching criteria, all PMD logs can be enabled
which are lower than logging ``level``.
Limitations Limitations
----------- -----------

6
drivers/net/dpaa2/Makefile
View File

@ -10,14 +10,8 @@ include $(RTE_SDK)/mk/rte.vars.mk
# #
LIB = librte_pmd_dpaa2.a LIB = librte_pmd_dpaa2.a
ifeq ($(CONFIG_RTE_LIBRTE_DPAA2_DEBUG_INIT),y)
CFLAGS += -O0 -g
CFLAGS += "-Wno-error"
else
CFLAGS += -O3 CFLAGS += -O3
CFLAGS += $(WERROR_FLAGS) CFLAGS += $(WERROR_FLAGS)
endif
CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2 CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2
CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2/mc CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2/mc
CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc

30
drivers/net/dpaa2/base/dpaa2_hw_dpni.c
View File

@ -17,7 +17,7 @@
#include <rte_kvargs.h> #include <rte_kvargs.h>
#include <rte_dev.h> #include <rte_dev.h>
#include <fslmc_logs.h> #include <dpaa2_pmd_logs.h>
#include <dpaa2_hw_pvt.h> #include <dpaa2_hw_pvt.h>
#include <dpaa2_hw_mempool.h> #include <dpaa2_hw_mempool.h>
@ -42,7 +42,7 @@ dpaa2_setup_flow_dist(struct rte_eth_dev *eth_dev,
p_params = rte_malloc( p_params = rte_malloc(
NULL, DIST_PARAM_IOVA_SIZE, RTE_CACHE_LINE_SIZE); NULL, DIST_PARAM_IOVA_SIZE, RTE_CACHE_LINE_SIZE);
if (!p_params) { if (!p_params) {
PMD_INIT_LOG(ERR, "Memory unavailable"); DPAA2_PMD_ERR("Unable to allocate flow-dist parameters");
return -ENOMEM; return -ENOMEM;
} }
memset(p_params, 0, DIST_PARAM_IOVA_SIZE); memset(p_params, 0, DIST_PARAM_IOVA_SIZE);
@ -50,8 +50,8 @@ dpaa2_setup_flow_dist(struct rte_eth_dev *eth_dev,
ret = dpaa2_distset_to_dpkg_profile_cfg(req_dist_set, &kg_cfg); ret = dpaa2_distset_to_dpkg_profile_cfg(req_dist_set, &kg_cfg);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "given rss_hf (%" PRIx64 ") not supported", DPAA2_PMD_ERR("Given RSS Hash (%" PRIx64 ") not supported",
req_dist_set); req_dist_set);
rte_free(p_params); rte_free(p_params);
return ret; return ret;
} }
@ -61,7 +61,7 @@ dpaa2_setup_flow_dist(struct rte_eth_dev *eth_dev,
ret = dpkg_prepare_key_cfg(&kg_cfg, p_params); ret = dpkg_prepare_key_cfg(&kg_cfg, p_params);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "Unable to prepare extract parameters"); DPAA2_PMD_ERR("Unable to prepare extract parameters");
rte_free(p_params); rte_free(p_params);
return ret; return ret;
} }
@ -70,7 +70,7 @@ dpaa2_setup_flow_dist(struct rte_eth_dev *eth_dev,
&tc_cfg); &tc_cfg);
rte_free(p_params); rte_free(p_params);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, DPAA2_PMD_ERR(
"Setting distribution for Rx failed with err: %d", "Setting distribution for Rx failed with err: %d",
ret); ret);
return ret; return ret;
@ -93,7 +93,7 @@ int dpaa2_remove_flow_dist(
p_params = rte_malloc( p_params = rte_malloc(
NULL, DIST_PARAM_IOVA_SIZE, RTE_CACHE_LINE_SIZE); NULL, DIST_PARAM_IOVA_SIZE, RTE_CACHE_LINE_SIZE);
if (!p_params) { if (!p_params) {
PMD_INIT_LOG(ERR, "Memory unavailable"); DPAA2_PMD_ERR("Unable to allocate flow-dist parameters");
return -ENOMEM; return -ENOMEM;
} }
memset(p_params, 0, DIST_PARAM_IOVA_SIZE); memset(p_params, 0, DIST_PARAM_IOVA_SIZE);
@ -105,7 +105,7 @@ int dpaa2_remove_flow_dist(
ret = dpkg_prepare_key_cfg(&kg_cfg, p_params); ret = dpkg_prepare_key_cfg(&kg_cfg, p_params);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "Unable to prepare extract parameters"); DPAA2_PMD_ERR("Unable to prepare extract parameters");
rte_free(p_params); rte_free(p_params);
return ret; return ret;
} }
@ -114,8 +114,8 @@ int dpaa2_remove_flow_dist(
&tc_cfg); &tc_cfg);
rte_free(p_params); rte_free(p_params);
if (ret) if (ret)
PMD_INIT_LOG(ERR, DPAA2_PMD_ERR(
"Setting distribution for Rx failed with err:%d", "Setting distribution for Rx failed with err: %d",
ret); ret);
return ret; return ret;
} }
@ -256,7 +256,7 @@ dpaa2_distset_to_dpkg_profile_cfg(
break; break;
default: default:
PMD_INIT_LOG(WARNING, DPAA2_PMD_WARN(
"Unsupported flow dist option %x", "Unsupported flow dist option %x",
dist_field); dist_field);
return -EINVAL; return -EINVAL;
@ -307,7 +307,7 @@ dpaa2_attach_bp_list(struct dpaa2_dev_priv *priv,
retcode = dpni_set_buffer_layout(dpni, CMD_PRI_LOW, priv->token, retcode = dpni_set_buffer_layout(dpni, CMD_PRI_LOW, priv->token,
DPNI_QUEUE_RX, &layout); DPNI_QUEUE_RX, &layout);
if (retcode) { if (retcode) {
PMD_INIT_LOG(ERR, "Err(%d) in setting rx buffer layout\n", DPAA2_PMD_ERR("Error configuring buffer pool Rx layout (%d)",
retcode); retcode);
return retcode; return retcode;
} }
@ -322,9 +322,9 @@ dpaa2_attach_bp_list(struct dpaa2_dev_priv *priv,
retcode = dpni_set_pools(dpni, CMD_PRI_LOW, priv->token, &bpool_cfg); retcode = dpni_set_pools(dpni, CMD_PRI_LOW, priv->token, &bpool_cfg);
if (retcode != 0) { if (retcode != 0) {
PMD_INIT_LOG(ERR, "Error in attaching the buffer pool list" DPAA2_PMD_ERR("Error configuring buffer pool on interface."
" bpid = %d Error code = %d\n", " bpid = %d error code = %d",
bpool_cfg.pools[0].dpbp_id, retcode); bpool_cfg.pools[0].dpbp_id, retcode);
return retcode; return retcode;
} }

294
drivers/net/dpaa2/dpaa2_ethdev.c
View File

@ -18,7 +18,7 @@
#include <rte_dev.h> #include <rte_dev.h>
#include <rte_fslmc.h> #include <rte_fslmc.h>
#include <fslmc_logs.h> #include "dpaa2_pmd_logs.h"
#include <fslmc_vfio.h> #include <fslmc_vfio.h>
#include <dpaa2_hw_pvt.h> #include <dpaa2_hw_pvt.h>
#include <dpaa2_hw_mempool.h> #include <dpaa2_hw_mempool.h>
@ -57,6 +57,8 @@ static int dpaa2_dev_set_link_up(struct rte_eth_dev *dev);
static int dpaa2_dev_set_link_down(struct rte_eth_dev *dev); static int dpaa2_dev_set_link_down(struct rte_eth_dev *dev);
static int dpaa2_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu); static int dpaa2_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu);
int dpaa2_logtype_pmd;
static int static int
dpaa2_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) dpaa2_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
{ {
@ -67,7 +69,7 @@ dpaa2_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
PMD_INIT_FUNC_TRACE(); PMD_INIT_FUNC_TRACE();
if (dpni == NULL) { if (dpni == NULL) {
RTE_LOG(ERR, PMD, "dpni is NULL\n"); DPAA2_PMD_ERR("dpni is NULL");
return -1; return -1;
} }
@ -79,8 +81,8 @@ dpaa2_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
priv->token, vlan_id); priv->token, vlan_id);
if (ret < 0) if (ret < 0)
PMD_DRV_LOG(ERR, "ret = %d Unable to add/rem vlan %d hwid =%d", DPAA2_PMD_ERR("ret = %d Unable to add/rem vlan %d hwid =%d",
ret, vlan_id, priv->hw_id); ret, vlan_id, priv->hw_id);
return ret; return ret;
} }
@ -97,7 +99,7 @@ dpaa2_vlan_offload_set(struct rte_eth_dev *dev, int mask)
if (mask & ETH_VLAN_FILTER_MASK) { if (mask & ETH_VLAN_FILTER_MASK) {
/* VLAN Filter not avaialble */ /* VLAN Filter not avaialble */
if (!priv->max_vlan_filters) { if (!priv->max_vlan_filters) {
RTE_LOG(INFO, PMD, "VLAN filter not available\n"); DPAA2_PMD_INFO("VLAN filter not available");
goto next_mask; goto next_mask;
} }
@ -108,14 +110,12 @@ dpaa2_vlan_offload_set(struct rte_eth_dev *dev, int mask)
ret = dpni_enable_vlan_filter(dpni, CMD_PRI_LOW, ret = dpni_enable_vlan_filter(dpni, CMD_PRI_LOW,
priv->token, false); priv->token, false);
if (ret < 0) if (ret < 0)
RTE_LOG(ERR, PMD, "Unable to set vlan filter = %d\n", DPAA2_PMD_INFO("Unable to set vlan filter = %d", ret);
ret);
} }
next_mask: next_mask:
if (mask & ETH_VLAN_EXTEND_MASK) { if (mask & ETH_VLAN_EXTEND_MASK) {
if (dev->data->dev_conf.rxmode.hw_vlan_extend) if (dev->data->dev_conf.rxmode.hw_vlan_extend)
RTE_LOG(INFO, PMD, DPAA2_PMD_INFO("VLAN extend offload not supported");
"VLAN extend offload not supported\n");
} }
return 0; return 0;
@ -135,10 +135,10 @@ dpaa2_fw_version_get(struct rte_eth_dev *dev,
PMD_INIT_FUNC_TRACE(); PMD_INIT_FUNC_TRACE();
if (mc_get_soc_version(dpni, CMD_PRI_LOW, &mc_plat_info)) if (mc_get_soc_version(dpni, CMD_PRI_LOW, &mc_plat_info))
RTE_LOG(WARNING, PMD, "\tmc_get_soc_version failed\n"); DPAA2_PMD_WARN("\tmc_get_soc_version failed");
if (mc_get_version(dpni, CMD_PRI_LOW, &mc_ver_info)) if (mc_get_version(dpni, CMD_PRI_LOW, &mc_ver_info))
RTE_LOG(WARNING, PMD, "\tmc_get_version failed\n"); DPAA2_PMD_WARN("\tmc_get_version failed");
ret = snprintf(fw_version, fw_size, ret = snprintf(fw_version, fw_size,
"%x-%d.%d.%d", "%x-%d.%d.%d",
@ -201,7 +201,7 @@ dpaa2_alloc_rx_tx_queues(struct rte_eth_dev *dev)
mc_q = rte_malloc(NULL, sizeof(struct dpaa2_queue) * tot_queues, mc_q = rte_malloc(NULL, sizeof(struct dpaa2_queue) * tot_queues,
RTE_CACHE_LINE_SIZE); RTE_CACHE_LINE_SIZE);
if (!mc_q) { if (!mc_q) {
PMD_INIT_LOG(ERR, "malloc failed for rx/tx queues\n"); DPAA2_PMD_ERR("Memory allocation failed for rx/tx queues");
return -1; return -1;
} }
@ -278,8 +278,8 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev)
ret = dpni_set_max_frame_length(dpni, CMD_PRI_LOW, ret = dpni_set_max_frame_length(dpni, CMD_PRI_LOW,
priv->token, eth_conf->rxmode.max_rx_pkt_len); priv->token, eth_conf->rxmode.max_rx_pkt_len);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, DPAA2_PMD_ERR(
"unable to set mtu. check config\n"); "Unable to set mtu. check config");
return ret; return ret;
} }
} else { } else {
@ -291,8 +291,8 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev)
ret = dpaa2_setup_flow_dist(dev, ret = dpaa2_setup_flow_dist(dev,
eth_conf->rx_adv_conf.rss_conf.rss_hf); eth_conf->rx_adv_conf.rss_conf.rss_hf);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "unable to set flow distribution." DPAA2_PMD_ERR("Unable to set flow distribution."
"please check queue config\n"); "Check queue config");
return ret; return ret;
} }
} }
@ -303,28 +303,28 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev)
ret = dpni_set_offload(dpni, CMD_PRI_LOW, priv->token, ret = dpni_set_offload(dpni, CMD_PRI_LOW, priv->token,
DPNI_OFF_RX_L3_CSUM, rx_ip_csum_offload); DPNI_OFF_RX_L3_CSUM, rx_ip_csum_offload);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "Error to set RX l3 csum:Error = %d\n", ret); DPAA2_PMD_ERR("Error to set RX l3 csum:Error = %d", ret);
return ret; return ret;
} }
ret = dpni_set_offload(dpni, CMD_PRI_LOW, priv->token, ret = dpni_set_offload(dpni, CMD_PRI_LOW, priv->token,
DPNI_OFF_RX_L4_CSUM, rx_ip_csum_offload); DPNI_OFF_RX_L4_CSUM, rx_ip_csum_offload);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "Error to get RX l4 csum:Error = %d\n", ret); DPAA2_PMD_ERR("Error to get RX l4 csum:Error = %d", ret);
return ret; return ret;
} }
ret = dpni_set_offload(dpni, CMD_PRI_LOW, priv->token, ret = dpni_set_offload(dpni, CMD_PRI_LOW, priv->token,
DPNI_OFF_TX_L3_CSUM, true); DPNI_OFF_TX_L3_CSUM, true);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "Error to set TX l3 csum:Error = %d\n", ret); DPAA2_PMD_ERR("Error to set TX l3 csum:Error = %d", ret);
return ret; return ret;
} }
ret = dpni_set_offload(dpni, CMD_PRI_LOW, priv->token, ret = dpni_set_offload(dpni, CMD_PRI_LOW, priv->token,
DPNI_OFF_TX_L4_CSUM, true); DPNI_OFF_TX_L4_CSUM, true);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "Error to get TX l4 csum:Error = %d\n", ret); DPAA2_PMD_ERR("Error to get TX l4 csum:Error = %d", ret);
return ret; return ret;
} }
@ -338,8 +338,7 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev)
ret = dpni_set_offload(dpni, CMD_PRI_LOW, priv->token, ret = dpni_set_offload(dpni, CMD_PRI_LOW, priv->token,
DPNI_FLCTYPE_HASH, true); DPNI_FLCTYPE_HASH, true);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "Error setting FLCTYPE: Err = %d\n", DPAA2_PMD_ERR("Error setting FLCTYPE: Err = %d", ret);
ret);
return ret; return ret;
} }
} }
@ -375,8 +374,8 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
PMD_INIT_FUNC_TRACE(); PMD_INIT_FUNC_TRACE();
PMD_DRV_LOG(DEBUG, "dev =%p, queue =%d, pool = %p, conf =%p", DPAA2_PMD_DEBUG("dev =%p, queue =%d, pool = %p, conf =%p",
dev, rx_queue_id, mb_pool, rx_conf); dev, rx_queue_id, mb_pool, rx_conf);
if (!priv->bp_list || priv->bp_list->mp != mb_pool) { if (!priv->bp_list || priv->bp_list->mp != mb_pool) {
bpid = mempool_to_bpid(mb_pool); bpid = mempool_to_bpid(mb_pool);
@ -415,7 +414,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
ret = dpni_set_queue(dpni, CMD_PRI_LOW, priv->token, DPNI_QUEUE_RX, ret = dpni_set_queue(dpni, CMD_PRI_LOW, priv->token, DPNI_QUEUE_RX,
dpaa2_q->tc_index, flow_id, options, &cfg); dpaa2_q->tc_index, flow_id, options, &cfg);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "Error in setting the rx flow: = %d\n", ret); DPAA2_PMD_ERR("Error in setting the rx flow: = %d", ret);
return -1; return -1;
} }
@ -427,14 +426,14 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
taildrop.threshold = CONG_THRESHOLD_RX_Q; taildrop.threshold = CONG_THRESHOLD_RX_Q;
taildrop.units = DPNI_CONGESTION_UNIT_BYTES; taildrop.units = DPNI_CONGESTION_UNIT_BYTES;
taildrop.oal = CONG_RX_OAL; taildrop.oal = CONG_RX_OAL;
PMD_DRV_LOG(DEBUG, "Enabling Early Drop on queue = %d", DPAA2_PMD_DEBUG("Enabling Early Drop on queue = %d",
rx_queue_id); rx_queue_id);
ret = dpni_set_taildrop(dpni, CMD_PRI_LOW, priv->token, ret = dpni_set_taildrop(dpni, CMD_PRI_LOW, priv->token,
DPNI_CP_QUEUE, DPNI_QUEUE_RX, DPNI_CP_QUEUE, DPNI_QUEUE_RX,
dpaa2_q->tc_index, flow_id, &taildrop); dpaa2_q->tc_index, flow_id, &taildrop);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "Error in setting the rx flow" DPAA2_PMD_ERR("Error in setting taildrop. err=(%d)",
" err : = %d\n", ret); ret);
return -1; return -1;
} }
} }
@ -477,9 +476,9 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
ret = dpni_set_queue(dpni, CMD_PRI_LOW, priv->token, DPNI_QUEUE_TX, ret = dpni_set_queue(dpni, CMD_PRI_LOW, priv->token, DPNI_QUEUE_TX,
tc_id, flow_id, options, &tx_flow_cfg); tc_id, flow_id, options, &tx_flow_cfg);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "Error in setting the tx flow: " DPAA2_PMD_ERR("Error in setting the tx flow: "
"tc_id=%d, flow =%d ErrorCode = %x\n", "tc_id=%d, flow=%d err=%d",
tc_id, flow_id, -ret); tc_id, flow_id, ret);
return -1; return -1;
} }
@ -491,8 +490,8 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
priv->token, priv->token,
DPNI_CONF_DISABLE); DPNI_CONF_DISABLE);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "Error in set tx conf mode settings" DPAA2_PMD_ERR("Error in set tx conf mode settings: "
" ErrorCode = %x", ret); "err=%d", ret);
return -1; return -1;
} }
} }
@ -521,9 +520,9 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
tc_id, tc_id,
&cong_notif_cfg); &cong_notif_cfg);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, DPAA2_PMD_ERR(
"Error in setting tx congestion notification: = %d", "Error in setting tx congestion notification: "
-ret); "err=%d", ret);
return -ret; return -ret;
} }
} }
@ -558,7 +557,7 @@ dpaa2_dev_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id)
if (unlikely(!DPAA2_PER_LCORE_DPIO)) { if (unlikely(!DPAA2_PER_LCORE_DPIO)) {
ret = dpaa2_affine_qbman_swp(); ret = dpaa2_affine_qbman_swp();
if (ret) { if (ret) {
RTE_LOG(ERR, PMD, "Failure in affining portal\n"); DPAA2_PMD_ERR("Failure in affining portal");
return -EINVAL; return -EINVAL;
} }
} }
@ -568,8 +567,8 @@ dpaa2_dev_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id)
if (qbman_fq_query_state(swp, dpaa2_q->fqid, &state) == 0) { if (qbman_fq_query_state(swp, dpaa2_q->fqid, &state) == 0) {
frame_cnt = qbman_fq_state_frame_count(&state); frame_cnt = qbman_fq_state_frame_count(&state);
RTE_LOG(DEBUG, PMD, "RX frame count for q(%d) is %u\n", DPAA2_PMD_DEBUG("RX frame count for q(%d) is %u",
rx_queue_id, frame_cnt); rx_queue_id, frame_cnt);
} }
return frame_cnt; return frame_cnt;
} }
@ -618,14 +617,14 @@ dpaa2_interrupt_handler(void *param)
PMD_INIT_FUNC_TRACE(); PMD_INIT_FUNC_TRACE();
if (dpni == NULL) { if (dpni == NULL) {
RTE_LOG(ERR, PMD, "dpni is NULL"); DPAA2_PMD_ERR("dpni is NULL");
return; return;
} }
ret = dpni_get_irq_status(dpni, CMD_PRI_LOW, priv->token, ret = dpni_get_irq_status(dpni, CMD_PRI_LOW, priv->token,
irq_index, &status); irq_index, &status);
if (unlikely(ret)) { if (unlikely(ret)) {
RTE_LOG(ERR, PMD, "Can't get irq status (err %d)", ret); DPAA2_PMD_ERR("Can't get irq status (err %d)", ret);
clear = 0xffffffff; clear = 0xffffffff;
goto out; goto out;
} }
@ -641,7 +640,7 @@ dpaa2_interrupt_handler(void *param)
ret = dpni_clear_irq_status(dpni, CMD_PRI_LOW, priv->token, ret = dpni_clear_irq_status(dpni, CMD_PRI_LOW, priv->token,
irq_index, clear); irq_index, clear);
if (unlikely(ret)) if (unlikely(ret))
RTE_LOG(ERR, PMD, "Can't clear irq status (err %d)", ret); DPAA2_PMD_ERR("Can't clear irq status (err %d)", ret);
} }
static int static int
@ -658,16 +657,16 @@ dpaa2_eth_setup_irqs(struct rte_eth_dev *dev, int enable)
err = dpni_set_irq_mask(dpni, CMD_PRI_LOW, priv->token, err = dpni_set_irq_mask(dpni, CMD_PRI_LOW, priv->token,
irq_index, mask); irq_index, mask);
if (err < 0) { if (err < 0) {
PMD_INIT_LOG(ERR, "Error: dpni_set_irq_mask():%d (%s)", err, DPAA2_PMD_ERR("Error: dpni_set_irq_mask():%d (%s)", err,
strerror(-err)); strerror(-err));
return err; return err;
} }
err = dpni_set_irq_enable(dpni, CMD_PRI_LOW, priv->token, err = dpni_set_irq_enable(dpni, CMD_PRI_LOW, priv->token,
irq_index, enable); irq_index, enable);
if (err < 0) if (err < 0)
PMD_INIT_LOG(ERR, "Error: dpni_set_irq_enable():%d (%s)", err, DPAA2_PMD_ERR("Error: dpni_set_irq_enable():%d (%s)", err,
strerror(-err)); strerror(-err));
return err; return err;
} }
@ -695,8 +694,8 @@ dpaa2_dev_start(struct rte_eth_dev *dev)
ret = dpni_enable(dpni, CMD_PRI_LOW, priv->token); ret = dpni_enable(dpni, CMD_PRI_LOW, priv->token);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "Failure %d in enabling dpni %d device\n", DPAA2_PMD_ERR("Failure in enabling dpni %d device: err=%d",
ret, priv->hw_id); priv->hw_id, ret);
return ret; return ret;
} }
@ -706,7 +705,7 @@ dpaa2_dev_start(struct rte_eth_dev *dev)
ret = dpni_get_qdid(dpni, CMD_PRI_LOW, priv->token, ret = dpni_get_qdid(dpni, CMD_PRI_LOW, priv->token,
DPNI_QUEUE_TX, &qdid); DPNI_QUEUE_TX, &qdid);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "Error to get qdid:ErrorCode = %d\n", ret); DPAA2_PMD_ERR("Error in getting qdid: err=%d", ret);
return ret; return ret;
} }
priv->qdid = qdid; priv->qdid = qdid;
@ -717,8 +716,8 @@ dpaa2_dev_start(struct rte_eth_dev *dev)
DPNI_QUEUE_RX, dpaa2_q->tc_index, DPNI_QUEUE_RX, dpaa2_q->tc_index,
dpaa2_q->flow_id, &cfg, &qid); dpaa2_q->flow_id, &cfg, &qid);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "Error to get flow " DPAA2_PMD_ERR("Error in getting flow information: "
"information Error code = %d\n", ret); "err=%d", ret);
return ret; return ret;
} }
dpaa2_q->fqid = qid.fqid; dpaa2_q->fqid = qid.fqid;
@ -733,8 +732,8 @@ dpaa2_dev_start(struct rte_eth_dev *dev)
ret = dpni_set_errors_behavior(dpni, CMD_PRI_LOW, ret = dpni_set_errors_behavior(dpni, CMD_PRI_LOW,
priv->token, &err_cfg); priv->token, &err_cfg);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "Error to dpni_set_errors_behavior:" DPAA2_PMD_ERR("Error to dpni_set_errors_behavior: code = %d",
"code = %d\n", ret); ret);
return ret; return ret;
} }
@ -793,8 +792,8 @@ dpaa2_dev_stop(struct rte_eth_dev *dev)
ret = dpni_disable(dpni, CMD_PRI_LOW, priv->token); ret = dpni_disable(dpni, CMD_PRI_LOW, priv->token);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "Failure (ret %d) in disabling dpni %d dev\n", DPAA2_PMD_ERR("Failure (ret %d) in disabling dpni %d dev",
ret, priv->hw_id); ret, priv->hw_id);
return; return;
} }
@ -826,8 +825,7 @@ dpaa2_dev_close(struct rte_eth_dev *dev)
/* Clean the device first */ /* Clean the device first */
ret = dpni_reset(dpni, CMD_PRI_LOW, priv->token); ret = dpni_reset(dpni, CMD_PRI_LOW, priv->token);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "Failure cleaning dpni device with" DPAA2_PMD_ERR("Failure cleaning dpni device: err=%d", ret);
" error code %d\n", ret);
return; return;
} }
@ -846,17 +844,17 @@ dpaa2_dev_promiscuous_enable(
PMD_INIT_FUNC_TRACE(); PMD_INIT_FUNC_TRACE();
if (dpni == NULL) { if (dpni == NULL) {
RTE_LOG(ERR, PMD, "dpni is NULL\n"); DPAA2_PMD_ERR("dpni is NULL");
return; return;
} }
ret = dpni_set_unicast_promisc(dpni, CMD_PRI_LOW, priv->token, true); ret = dpni_set_unicast_promisc(dpni, CMD_PRI_LOW, priv->token, true);
if (ret < 0) if (ret < 0)
RTE_LOG(ERR, PMD, "Unable to enable U promisc mode %d\n", ret); DPAA2_PMD_ERR("Unable to enable U promisc mode %d", ret);
ret = dpni_set_multicast_promisc(dpni, CMD_PRI_LOW, priv->token, true); ret = dpni_set_multicast_promisc(dpni, CMD_PRI_LOW, priv->token, true);
if (ret < 0) if (ret < 0)
RTE_LOG(ERR, PMD, "Unable to enable M promisc mode %d\n", ret); DPAA2_PMD_ERR("Unable to enable M promisc mode %d", ret);
} }
static void static void
@ -870,21 +868,20 @@ dpaa2_dev_promiscuous_disable(
PMD_INIT_FUNC_TRACE(); PMD_INIT_FUNC_TRACE();
if (dpni == NULL) { if (dpni == NULL) {
RTE_LOG(ERR, PMD, "dpni is NULL\n"); DPAA2_PMD_ERR("dpni is NULL");
return; return;
} }
ret = dpni_set_unicast_promisc(dpni, CMD_PRI_LOW, priv->token, false); ret = dpni_set_unicast_promisc(dpni, CMD_PRI_LOW, priv->token, false);
if (ret < 0) if (ret < 0)
RTE_LOG(ERR, PMD, "Unable to disable U promisc mode %d\n", ret); DPAA2_PMD_ERR("Unable to disable U promisc mode %d", ret);
if (dev->data->all_multicast == 0) { if (dev->data->all_multicast == 0) {
ret = dpni_set_multicast_promisc(dpni, CMD_PRI_LOW, ret = dpni_set_multicast_promisc(dpni, CMD_PRI_LOW,
priv->token, false); priv->token, false);
if (ret < 0) if (ret < 0)
RTE_LOG(ERR, PMD, DPAA2_PMD_ERR("Unable to disable M promisc mode %d",
"Unable to disable M promisc mode %d\n", ret);
ret);
} }
} }
@ -899,13 +896,13 @@ dpaa2_dev_allmulticast_enable(
PMD_INIT_FUNC_TRACE(); PMD_INIT_FUNC_TRACE();
if (dpni == NULL) { if (dpni == NULL) {
RTE_LOG(ERR, PMD, "dpni is NULL\n"); DPAA2_PMD_ERR("dpni is NULL");
return; return;
} }
ret = dpni_set_multicast_promisc(dpni, CMD_PRI_LOW, priv->token, true); ret = dpni_set_multicast_promisc(dpni, CMD_PRI_LOW, priv->token, true);
if (ret < 0) if (ret < 0)
RTE_LOG(ERR, PMD, "Unable to enable multicast mode %d\n", ret); DPAA2_PMD_ERR("Unable to enable multicast mode %d", ret);
} }
static void static void
@ -918,7 +915,7 @@ dpaa2_dev_allmulticast_disable(struct rte_eth_dev *dev)
PMD_INIT_FUNC_TRACE(); PMD_INIT_FUNC_TRACE();
if (dpni == NULL) { if (dpni == NULL) {
RTE_LOG(ERR, PMD, "dpni is NULL\n"); DPAA2_PMD_ERR("dpni is NULL");
return; return;
} }
@ -928,7 +925,7 @@ dpaa2_dev_allmulticast_disable(struct rte_eth_dev *dev)
ret = dpni_set_multicast_promisc(dpni, CMD_PRI_LOW, priv->token, false); ret = dpni_set_multicast_promisc(dpni, CMD_PRI_LOW, priv->token, false);
if (ret < 0) if (ret < 0)
RTE_LOG(ERR, PMD, "Unable to disable multicast mode %d\n", ret); DPAA2_PMD_ERR("Unable to disable multicast mode %d", ret);
} }
static int static int
@ -943,7 +940,7 @@ dpaa2_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
PMD_INIT_FUNC_TRACE(); PMD_INIT_FUNC_TRACE();
if (dpni == NULL) { if (dpni == NULL) {
RTE_LOG(ERR, PMD, "dpni is NULL\n"); DPAA2_PMD_ERR("dpni is NULL");
return -EINVAL; return -EINVAL;
} }
@ -964,10 +961,10 @@ dpaa2_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
ret = dpni_set_max_frame_length(dpni, CMD_PRI_LOW, priv->token, ret = dpni_set_max_frame_length(dpni, CMD_PRI_LOW, priv->token,
frame_size); frame_size);
if (ret) { if (ret) {
PMD_DRV_LOG(ERR, "setting the max frame length failed"); DPAA2_PMD_ERR("Setting the max frame length failed");
return -1; return -1;
} }
PMD_DRV_LOG(INFO, "MTU is configured %d for the device", mtu); DPAA2_PMD_INFO("MTU configured for the device: %d", mtu);
return 0; return 0;
} }
@ -984,15 +981,15 @@ dpaa2_dev_add_mac_addr(struct rte_eth_dev *dev,
PMD_INIT_FUNC_TRACE(); PMD_INIT_FUNC_TRACE();
if (dpni == NULL) { if (dpni == NULL) {
RTE_LOG(ERR, PMD, "dpni is NULL\n"); DPAA2_PMD_ERR("dpni is NULL");
return -1; return -1;
} }
ret = dpni_add_mac_addr(dpni, CMD_PRI_LOW, ret = dpni_add_mac_addr(dpni, CMD_PRI_LOW,
priv->token, addr->addr_bytes); priv->token, addr->addr_bytes);
if (ret) if (ret)
RTE_LOG(ERR, PMD, DPAA2_PMD_ERR(
"error: Adding the MAC ADDR failed: err = %d\n", ret); "error: Adding the MAC ADDR failed: err = %d", ret);
return 0; return 0;
} }
@ -1011,15 +1008,15 @@ dpaa2_dev_remove_mac_addr(struct rte_eth_dev *dev,
macaddr = &data->mac_addrs[index]; macaddr = &data->mac_addrs[index];
if (dpni == NULL) { if (dpni == NULL) {
RTE_LOG(ERR, PMD, "dpni is NULL\n"); DPAA2_PMD_ERR("dpni is NULL");
return; return;
} }
ret = dpni_remove_mac_addr(dpni, CMD_PRI_LOW, ret = dpni_remove_mac_addr(dpni, CMD_PRI_LOW,
priv->token, macaddr->addr_bytes); priv->token, macaddr->addr_bytes);
if (ret) if (ret)
RTE_LOG(ERR, PMD, DPAA2_PMD_ERR(
"error: Removing the MAC ADDR failed: err = %d\n", ret); "error: Removing the MAC ADDR failed: err = %d", ret);
} }
static void static void
@ -1033,7 +1030,7 @@ dpaa2_dev_set_mac_addr(struct rte_eth_dev *dev,
PMD_INIT_FUNC_TRACE(); PMD_INIT_FUNC_TRACE();
if (dpni == NULL) { if (dpni == NULL) {
RTE_LOG(ERR, PMD, "dpni is NULL\n"); DPAA2_PMD_ERR("dpni is NULL");
return; return;
} }
@ -1041,9 +1038,10 @@ dpaa2_dev_set_mac_addr(struct rte_eth_dev *dev,
priv->token, addr->addr_bytes); priv->token, addr->addr_bytes);
if (ret) if (ret)
RTE_LOG(ERR, PMD, DPAA2_PMD_ERR(
"error: Setting the MAC ADDR failed %d\n", ret); "error: Setting the MAC ADDR failed %d", ret);
} }
static static
int dpaa2_dev_stats_get(struct rte_eth_dev *dev, int dpaa2_dev_stats_get(struct rte_eth_dev *dev,
struct rte_eth_stats *stats) struct rte_eth_stats *stats)
@ -1059,12 +1057,12 @@ int dpaa2_dev_stats_get(struct rte_eth_dev *dev,
PMD_INIT_FUNC_TRACE(); PMD_INIT_FUNC_TRACE();
if (!dpni) { if (!dpni) {
RTE_LOG(ERR, PMD, "dpni is NULL\n"); DPAA2_PMD_ERR("dpni is NULL");
return -EINVAL; return -EINVAL;
} }
if (!stats) { if (!stats) {
RTE_LOG(ERR, PMD, "stats is NULL\n"); DPAA2_PMD_ERR("stats is NULL");
return -EINVAL; return -EINVAL;
} }
@ -1103,7 +1101,7 @@ int dpaa2_dev_stats_get(struct rte_eth_dev *dev,
return 0; return 0;
err: err:
RTE_LOG(ERR, PMD, "Operation not completed:Error Code = %d\n", retcode); DPAA2_PMD_ERR("Operation not completed:Error Code = %d", retcode);
return retcode; return retcode;
}; };
@ -1148,7 +1146,7 @@ dpaa2_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,
} }
return i; return i;
err: err:
RTE_LOG(ERR, PMD, "Error in obtaining extended stats (%d)\n", retcode); DPAA2_PMD_ERR("Error in obtaining extended stats (%d)", retcode);
return retcode; return retcode;
} }
@ -1217,7 +1215,7 @@ dpaa2_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids,
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if (ids[i] >= stat_cnt) { if (ids[i] >= stat_cnt) {
PMD_INIT_LOG(ERR, "id value isn't valid"); DPAA2_PMD_ERR("xstats id value isn't valid");
return -1; return -1;
} }
values[i] = values_copy[ids[i]]; values[i] = values_copy[ids[i]];
@ -1242,7 +1240,7 @@ dpaa2_xstats_get_names_by_id(
for (i = 0; i < limit; i++) { for (i = 0; i < limit; i++) {
if (ids[i] >= stat_cnt) { if (ids[i] >= stat_cnt) {
PMD_INIT_LOG(ERR, "id value isn't valid"); DPAA2_PMD_ERR("xstats id value isn't valid");
return -1; return -1;
} }
strcpy(xstats_names[i].name, xstats_names_copy[ids[i]].name); strcpy(xstats_names[i].name, xstats_names_copy[ids[i]].name);
@ -1260,7 +1258,7 @@ dpaa2_dev_stats_reset(struct rte_eth_dev *dev)
PMD_INIT_FUNC_TRACE(); PMD_INIT_FUNC_TRACE();
if (dpni == NULL) { if (dpni == NULL) {
RTE_LOG(ERR, PMD, "dpni is NULL\n"); DPAA2_PMD_ERR("dpni is NULL");
return; return;
} }
@ -1271,7 +1269,7 @@ dpaa2_dev_stats_reset(struct rte_eth_dev *dev)
return; return;
error: error:
RTE_LOG(ERR, PMD, "Operation not completed:Error Code = %d\n", retcode); DPAA2_PMD_ERR("Operation not completed:Error Code = %d", retcode);
return; return;
}; };
@ -1287,13 +1285,13 @@ dpaa2_dev_link_update(struct rte_eth_dev *dev,
struct dpni_link_state state = {0}; struct dpni_link_state state = {0};
if (dpni == NULL) { if (dpni == NULL) {
RTE_LOG(ERR, PMD, "dpni is NULL\n"); DPAA2_PMD_ERR("dpni is NULL");
return 0; return 0;
} }
ret = dpni_get_link_state(dpni, CMD_PRI_LOW, priv->token, &state); ret = dpni_get_link_state(dpni, CMD_PRI_LOW, priv->token, &state);
if (ret < 0) { if (ret < 0) {
RTE_LOG(ERR, PMD, "error: dpni_get_link_state %d\n", ret); DPAA2_PMD_ERR("error: dpni_get_link_state %d", ret);
return -1; return -1;
} }
@ -1308,10 +1306,10 @@ dpaa2_dev_link_update(struct rte_eth_dev *dev,
ret = rte_eth_linkstatus_set(dev, &link); ret = rte_eth_linkstatus_set(dev, &link);
if (ret == -1) if (ret == -1)
RTE_LOG(DEBUG, PMD, "No change in status\n"); DPAA2_PMD_DEBUG("No change in status");
else else
PMD_DRV_LOG(INFO, "Port %d Link is %s\n", dev->data->port_id, DPAA2_PMD_INFO("Port %d Link is %s\n", dev->data->port_id,
link.link_status ? "Up" : "Down"); link.link_status ? "Up" : "Down");
return ret; return ret;
} }
@ -1333,7 +1331,7 @@ dpaa2_dev_set_link_up(struct rte_eth_dev *dev)
dpni = (struct fsl_mc_io *)priv->hw; dpni = (struct fsl_mc_io *)priv->hw;
if (dpni == NULL) { if (dpni == NULL) {
RTE_LOG(ERR, PMD, "DPNI is NULL\n"); DPAA2_PMD_ERR("dpni is NULL");
return ret; return ret;
} }
@ -1341,7 +1339,7 @@ dpaa2_dev_set_link_up(struct rte_eth_dev *dev)
ret = dpni_is_enabled(dpni, CMD_PRI_LOW, priv->token, &en); ret = dpni_is_enabled(dpni, CMD_PRI_LOW, priv->token, &en);
if (ret) { if (ret) {
/* Unable to obtain dpni status; Not continuing */ /* Unable to obtain dpni status; Not continuing */
PMD_DRV_LOG(ERR, "Interface Link UP failed (%d)", ret); DPAA2_PMD_ERR("Interface Link UP failed (%d)", ret);
return -EINVAL; return -EINVAL;
} }
@ -1349,13 +1347,13 @@ dpaa2_dev_set_link_up(struct rte_eth_dev *dev)
if (!en) { if (!en) {
ret = dpni_enable(dpni, CMD_PRI_LOW, priv->token); ret = dpni_enable(dpni, CMD_PRI_LOW, priv->token);
if (ret) { if (ret) {
PMD_DRV_LOG(ERR, "Interface Link UP failed (%d)", ret); DPAA2_PMD_ERR("Interface Link UP failed (%d)", ret);
return -EINVAL; return -EINVAL;
} }
} }
ret = dpni_get_link_state(dpni, CMD_PRI_LOW, priv->token, &state); ret = dpni_get_link_state(dpni, CMD_PRI_LOW, priv->token, &state);
if (ret < 0) { if (ret < 0) {
RTE_LOG(ERR, PMD, "error: dpni_get_link_state %d\n", ret); DPAA2_PMD_ERR("Unable to get link state (%d)", ret);
return -1; return -1;
} }
@ -1364,10 +1362,9 @@ dpaa2_dev_set_link_up(struct rte_eth_dev *dev)
dev->data->dev_link.link_status = state.up; dev->data->dev_link.link_status = state.up;
if (state.up) if (state.up)
PMD_DRV_LOG(INFO, "Port %d Link is set as UP", DPAA2_PMD_INFO("Port %d Link is Up", dev->data->port_id);
dev->data->port_id);
else else
PMD_DRV_LOG(INFO, "Port %d Link is DOWN", dev->data->port_id); DPAA2_PMD_INFO("Port %d Link is Down", dev->data->port_id);
return ret; return ret;
} }
@ -1390,7 +1387,7 @@ dpaa2_dev_set_link_down(struct rte_eth_dev *dev)
dpni = (struct fsl_mc_io *)priv->hw; dpni = (struct fsl_mc_io *)priv->hw;
if (dpni == NULL) { if (dpni == NULL) {
RTE_LOG(ERR, PMD, "Device has not yet been configured\n"); DPAA2_PMD_ERR("Device has not yet been configured");
return ret; return ret;
} }
@ -1403,12 +1400,12 @@ dpaa2_dev_set_link_down(struct rte_eth_dev *dev)
do { do {
ret = dpni_disable(dpni, 0, priv->token); ret = dpni_disable(dpni, 0, priv->token);
if (ret) { if (ret) {
PMD_DRV_LOG(ERR, "dpni disable failed (%d)", ret); DPAA2_PMD_ERR("dpni disable failed (%d)", ret);
return ret; return ret;
} }
ret = dpni_is_enabled(dpni, 0, priv->token, &dpni_enabled); ret = dpni_is_enabled(dpni, 0, priv->token, &dpni_enabled);
if (ret) { if (ret) {
PMD_DRV_LOG(ERR, "dpni_is_enabled failed (%d)", ret); DPAA2_PMD_ERR("dpni enable check failed (%d)", ret);
return ret; return ret;
} }
if (dpni_enabled) if (dpni_enabled)
@ -1417,12 +1414,12 @@ dpaa2_dev_set_link_down(struct rte_eth_dev *dev)
} while (dpni_enabled && --retries); } while (dpni_enabled && --retries);
if (!retries) { if (!retries) {
PMD_DRV_LOG(WARNING, "Retry count exceeded disabling DPNI\n"); DPAA2_PMD_WARN("Retry count exceeded disabling dpni");
/* todo- we may have to manually cleanup queues. /* todo- we may have to manually cleanup queues.
*/ */
} else { } else {
PMD_DRV_LOG(INFO, "Port %d Link DOWN successful", DPAA2_PMD_INFO("Port %d Link DOWN successful",
dev->data->port_id); dev->data->port_id);
} }
dev->data->dev_link.link_status = 0; dev->data->dev_link.link_status = 0;
@ -1444,13 +1441,13 @@ dpaa2_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
dpni = (struct fsl_mc_io *)priv->hw; dpni = (struct fsl_mc_io *)priv->hw;
if (dpni == NULL || fc_conf == NULL) { if (dpni == NULL || fc_conf == NULL) {
RTE_LOG(ERR, PMD, "device not configured\n"); DPAA2_PMD_ERR("device not configured");
return ret; return ret;
} }
ret = dpni_get_link_state(dpni, CMD_PRI_LOW, priv->token, &state); ret = dpni_get_link_state(dpni, CMD_PRI_LOW, priv->token, &state);
if (ret) { if (ret) {
RTE_LOG(ERR, PMD, "error: dpni_get_link_state %d\n", ret); DPAA2_PMD_ERR("error: dpni_get_link_state %d", ret);
return ret; return ret;
} }
@ -1500,7 +1497,7 @@ dpaa2_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
dpni = (struct fsl_mc_io *)priv->hw; dpni = (struct fsl_mc_io *)priv->hw;
if (dpni == NULL) { if (dpni == NULL) {
RTE_LOG(ERR, PMD, "dpni is NULL\n"); DPAA2_PMD_ERR("dpni is NULL");
return ret; return ret;
} }
@ -1510,7 +1507,7 @@ dpaa2_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
*/ */
ret = dpni_get_link_state(dpni, CMD_PRI_LOW, priv->token, &state); ret = dpni_get_link_state(dpni, CMD_PRI_LOW, priv->token, &state);
if (ret) { if (ret) {
RTE_LOG(ERR, PMD, "Unable to get link state (err=%d)\n", ret); DPAA2_PMD_ERR("Unable to get link state (err=%d)", ret);
return -1; return -1;
} }
@ -1555,16 +1552,15 @@ dpaa2_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
cfg.options &= ~DPNI_LINK_OPT_ASYM_PAUSE; cfg.options &= ~DPNI_LINK_OPT_ASYM_PAUSE;
break; break;
default: default:
RTE_LOG(ERR, PMD, "Incorrect Flow control flag (%d)\n", DPAA2_PMD_ERR("Incorrect Flow control flag (%d)",
fc_conf->mode); fc_conf->mode);
return -1; return -1;
} }
ret = dpni_set_link_cfg(dpni, CMD_PRI_LOW, priv->token, &cfg); ret = dpni_set_link_cfg(dpni, CMD_PRI_LOW, priv->token, &cfg);
if (ret) if (ret)
RTE_LOG(ERR, PMD, DPAA2_PMD_ERR("Unable to set Link configuration (err=%d)",
"Unable to set Link configuration (err=%d)\n", ret);
ret);
/* Enable link */ /* Enable link */
dpaa2_dev_set_link_up(dev); dpaa2_dev_set_link_up(dev);
@ -1585,13 +1581,13 @@ dpaa2_dev_rss_hash_update(struct rte_eth_dev *dev,
if (rss_conf->rss_hf) { if (rss_conf->rss_hf) {
ret = dpaa2_setup_flow_dist(dev, rss_conf->rss_hf); ret = dpaa2_setup_flow_dist(dev, rss_conf->rss_hf);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "unable to set flow dist"); DPAA2_PMD_ERR("Unable to set flow dist");
return ret; return ret;
} }
} else { } else {
ret = dpaa2_remove_flow_dist(dev, 0); ret = dpaa2_remove_flow_dist(dev, 0);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "unable to remove flow dist"); DPAA2_PMD_ERR("Unable to remove flow dist");
return ret; return ret;
} }
} }
@ -1649,7 +1645,7 @@ int dpaa2_eth_eventq_attach(const struct rte_eth_dev *dev,
ret = dpni_set_queue(dpni, CMD_PRI_LOW, eth_priv->token, DPNI_QUEUE_RX, ret = dpni_set_queue(dpni, CMD_PRI_LOW, eth_priv->token, DPNI_QUEUE_RX,
dpaa2_ethq->tc_index, flow_id, options, &cfg); dpaa2_ethq->tc_index, flow_id, options, &cfg);
if (ret) { if (ret) {
RTE_LOG(ERR, PMD, "Error in dpni_set_queue: ret: %d\n", ret); DPAA2_PMD_ERR("Error in dpni_set_queue: ret: %d", ret);
return ret; return ret;
} }
@ -1676,7 +1672,7 @@ int dpaa2_eth_eventq_detach(const struct rte_eth_dev *dev,
ret = dpni_set_queue(dpni, CMD_PRI_LOW, eth_priv->token, DPNI_QUEUE_RX, ret = dpni_set_queue(dpni, CMD_PRI_LOW, eth_priv->token, DPNI_QUEUE_RX,
dpaa2_ethq->tc_index, flow_id, options, &cfg); dpaa2_ethq->tc_index, flow_id, options, &cfg);
if (ret) if (ret)
RTE_LOG(ERR, PMD, "Error in dpni_set_queue: ret: %d\n", ret); DPAA2_PMD_ERR("Error in dpni_set_queue: ret: %d", ret);
return ret; return ret;
} }
@ -1743,15 +1739,15 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
dpni_dev = rte_malloc(NULL, sizeof(struct fsl_mc_io), 0); dpni_dev = rte_malloc(NULL, sizeof(struct fsl_mc_io), 0);
if (!dpni_dev) { if (!dpni_dev) {
PMD_INIT_LOG(ERR, "malloc failed for dpni device\n"); DPAA2_PMD_ERR("Memory allocation failed for dpni device");
return -1; return -1;
} }
dpni_dev->regs = rte_mcp_ptr_list[0]; dpni_dev->regs = rte_mcp_ptr_list[0];
ret = dpni_open(dpni_dev, CMD_PRI_LOW, hw_id, &priv->token); ret = dpni_open(dpni_dev, CMD_PRI_LOW, hw_id, &priv->token);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, DPAA2_PMD_ERR(
"Failure in opening dpni@%d with err code %d\n", "Failure in opening dpni@%d with err code %d",
hw_id, ret); hw_id, ret);
rte_free(dpni_dev); rte_free(dpni_dev);
return -1; return -1;
@ -1760,16 +1756,15 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
/* Clean the device first */ /* Clean the device first */
ret = dpni_reset(dpni_dev, CMD_PRI_LOW, priv->token); ret = dpni_reset(dpni_dev, CMD_PRI_LOW, priv->token);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, DPAA2_PMD_ERR("Failure cleaning dpni@%d with err code %d",
"Failure cleaning dpni@%d with err code %d\n", hw_id, ret);
hw_id, ret);
goto init_err; goto init_err;
} }
ret = dpni_get_attributes(dpni_dev, CMD_PRI_LOW, priv->token, &attr); ret = dpni_get_attributes(dpni_dev, CMD_PRI_LOW, priv->token, &attr);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, DPAA2_PMD_ERR(
"Failure in get dpni@%d attribute, err code %d\n", "Failure in get dpni@%d attribute, err code %d",
hw_id, ret); hw_id, ret);
goto init_err; goto init_err;
} }
@ -1785,8 +1780,9 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
/* Using number of TX queues as number of TX TCs */ /* Using number of TX queues as number of TX TCs */
priv->nb_tx_queues = attr.num_tx_tcs; priv->nb_tx_queues = attr.num_tx_tcs;
PMD_DRV_LOG(DEBUG, "RX-TC= %d, nb_rx_queues= %d, nb_tx_queues=%d", DPAA2_PMD_DEBUG("RX-TC= %d, nb_rx_queues= %d, nb_tx_queues=%d",
priv->num_rx_tc, priv->nb_rx_queues, priv->nb_tx_queues); priv->num_rx_tc, priv->nb_rx_queues,
priv->nb_tx_queues);
priv->hw = dpni_dev; priv->hw = dpni_dev;
priv->hw_id = hw_id; priv->hw_id = hw_id;
@ -1798,7 +1794,7 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
/* Allocate memory for hardware structure for queues */ /* Allocate memory for hardware structure for queues */
ret = dpaa2_alloc_rx_tx_queues(eth_dev); ret = dpaa2_alloc_rx_tx_queues(eth_dev);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "dpaa2_alloc_rx_tx_queuesFailed\n"); DPAA2_PMD_ERR("Queue allocation Failed");
goto init_err; goto init_err;
} }
@ -1806,9 +1802,9 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
eth_dev->data->mac_addrs = rte_zmalloc("dpni", eth_dev->data->mac_addrs = rte_zmalloc("dpni",
ETHER_ADDR_LEN * attr.mac_filter_entries, 0); ETHER_ADDR_LEN * attr.mac_filter_entries, 0);
if (eth_dev->data->mac_addrs == NULL) { if (eth_dev->data->mac_addrs == NULL) {
PMD_INIT_LOG(ERR, DPAA2_PMD_ERR(
"Failed to allocate %d bytes needed to store MAC addresses", "Failed to allocate %d bytes needed to store MAC addresses",
ETHER_ADDR_LEN * attr.mac_filter_entries); ETHER_ADDR_LEN * attr.mac_filter_entries);
ret = -ENOMEM; ret = -ENOMEM;
goto init_err; goto init_err;
} }
@ -1817,7 +1813,7 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
priv->token, priv->token,
(uint8_t *)(eth_dev->data->mac_addrs[0].addr_bytes)); (uint8_t *)(eth_dev->data->mac_addrs[0].addr_bytes));
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "DPNI get mac address failed:Err Code = %d\n", DPAA2_PMD_ERR("DPNI get mac address failed:Err Code = %d",
ret); ret);
goto init_err; goto init_err;
} }
@ -1829,8 +1825,7 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
ret = dpni_set_buffer_layout(dpni_dev, CMD_PRI_LOW, priv->token, ret = dpni_set_buffer_layout(dpni_dev, CMD_PRI_LOW, priv->token,
DPNI_QUEUE_TX, &layout); DPNI_QUEUE_TX, &layout);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "Error (%d) in setting tx buffer layout", DPAA2_PMD_ERR("Error (%d) in setting tx buffer layout", ret);
ret);
goto init_err; goto init_err;
} }
@ -1841,7 +1836,7 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
ret = dpni_set_buffer_layout(dpni_dev, CMD_PRI_LOW, priv->token, ret = dpni_set_buffer_layout(dpni_dev, CMD_PRI_LOW, priv->token,
DPNI_QUEUE_TX_CONFIRM, &layout); DPNI_QUEUE_TX_CONFIRM, &layout);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, "Error (%d) in setting tx-conf buffer layout", DPAA2_PMD_ERR("Error (%d) in setting tx-conf buffer layout",
ret); ret);
goto init_err; goto init_err;
} }
@ -1852,7 +1847,7 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
eth_dev->tx_pkt_burst = dpaa2_dev_tx; eth_dev->tx_pkt_burst = dpaa2_dev_tx;
rte_fslmc_vfio_dmamap(); rte_fslmc_vfio_dmamap();
RTE_LOG(INFO, PMD, "%s: netdev created\n", eth_dev->data->name); DPAA2_PMD_INFO("%s: netdev created", eth_dev->data->name);
return 0; return 0;
init_err: init_err:
dpaa2_dev_uninit(eth_dev); dpaa2_dev_uninit(eth_dev);
@ -1873,7 +1868,7 @@ dpaa2_dev_uninit(struct rte_eth_dev *eth_dev)
return 0; return 0;
if (!dpni) { if (!dpni) {
PMD_INIT_LOG(WARNING, "Already closed or not started"); DPAA2_PMD_WARN("Already closed or not started");
return -1; return -1;
} }
@ -1900,8 +1895,8 @@ dpaa2_dev_uninit(struct rte_eth_dev *eth_dev)
/* Close the device at underlying layer*/ /* Close the device at underlying layer*/
ret = dpni_close(dpni, CMD_PRI_LOW, priv->token); ret = dpni_close(dpni, CMD_PRI_LOW, priv->token);
if (ret) { if (ret) {
PMD_INIT_LOG(ERR, DPAA2_PMD_ERR(
"Failure closing dpni device with err code %d\n", "Failure closing dpni device with err code %d",
ret); ret);
} }
@ -1913,7 +1908,7 @@ dpaa2_dev_uninit(struct rte_eth_dev *eth_dev)
eth_dev->rx_pkt_burst = NULL; eth_dev->rx_pkt_burst = NULL;
eth_dev->tx_pkt_burst = NULL; eth_dev->tx_pkt_burst = NULL;
RTE_LOG(INFO, PMD, "%s: netdev created\n", eth_dev->data->name); DPAA2_PMD_INFO("%s: netdev deleted", eth_dev->data->name);
return 0; return 0;
} }
@ -1933,8 +1928,8 @@ rte_dpaa2_probe(struct rte_dpaa2_driver *dpaa2_drv,
sizeof(struct dpaa2_dev_priv), sizeof(struct dpaa2_dev_priv),
RTE_CACHE_LINE_SIZE); RTE_CACHE_LINE_SIZE);
if (eth_dev->data->dev_private == NULL) { if (eth_dev->data->dev_private == NULL) {
PMD_INIT_LOG(CRIT, "Cannot allocate memzone for" DPAA2_PMD_CRIT(
" private port data\n"); "Unable to allocate memory for private data");
rte_eth_dev_release_port(eth_dev); rte_eth_dev_release_port(eth_dev);
return -ENOMEM; return -ENOMEM;
} }
@ -1987,3 +1982,12 @@ static struct rte_dpaa2_driver rte_dpaa2_pmd = {
}; };
RTE_PMD_REGISTER_DPAA2(net_dpaa2, rte_dpaa2_pmd); RTE_PMD_REGISTER_DPAA2(net_dpaa2, rte_dpaa2_pmd);
RTE_INIT(dpaa2_pmd_init_log);
static void
dpaa2_pmd_init_log(void)
{
dpaa2_logtype_pmd = rte_log_register("pmd.net.dpaa2");
if (dpaa2_logtype_pmd >= 0)
rte_log_set_level(dpaa2_logtype_pmd, RTE_LOG_NOTICE);
}

41
drivers/net/dpaa2/dpaa2_pmd_logs.h Normal file
View File

@ -0,0 +1,41 @@
/*-
* SPDX-License-Identifier: BSD-3-Clause
* Copyright 2017 NXP
*/
#ifndef _DPAA2_PMD_LOGS_H_
#define _DPAA2_PMD_LOGS_H_
extern int dpaa2_logtype_pmd;
#define DPAA2_PMD_LOG(level, fmt, args...) \
rte_log(RTE_LOG_ ## level, dpaa2_logtype_pmd, "dpaa2_net: " \
fmt "\n", ##args)
#define DPAA2_PMD_DEBUG(fmt, args...) \
rte_log(RTE_LOG_DEBUG, dpaa2_logtype_pmd, "dpaa2_net: %s(): "\
fmt "\n", __func__, ##args)
#define PMD_INIT_FUNC_TRACE() DPAA2_PMD_LOG(DEBUG, " >>")
#define DPAA2_PMD_CRIT(fmt, args...) \
DPAA2_PMD_LOG(CRIT, fmt, ## args)
#define DPAA2_PMD_INFO(fmt, args...) \
DPAA2_PMD_LOG(INFO, fmt, ## args)
#define DPAA2_PMD_ERR(fmt, args...) \
DPAA2_PMD_LOG(ERR, fmt, ## args)
#define DPAA2_PMD_WARN(fmt, args...) \
DPAA2_PMD_LOG(WARNING, fmt, ## args)
/* DP Logs, toggled out at compile time if level lower than current level */
#define DPAA2_PMD_DP_LOG(level, fmt, args...) \
RTE_LOG_DP(level, PMD, fmt, ## args)
#define DPAA2_PMD_DP_DEBUG(fmt, args...) \
DPAA2_PMD_DP_LOG(DEBUG, fmt, ## args)
#define DPAA2_PMD_DP_INFO(fmt, args...) \
DPAA2_PMD_DP_LOG(INFO, fmt, ## args)
#define DPAA2_PMD_DP_WARN(fmt, args...) \
DPAA2_PMD_DP_LOG(WARNING, fmt, ## args)
#endif /* _DPAA2_PMD_LOGS_H_ */

59
drivers/net/dpaa2/dpaa2_rxtx.c
View File

@ -16,12 +16,12 @@
#include <rte_dev.h> #include <rte_dev.h>
#include <rte_fslmc.h> #include <rte_fslmc.h>
#include <fslmc_logs.h>
#include <fslmc_vfio.h> #include <fslmc_vfio.h>
#include <dpaa2_hw_pvt.h> #include <dpaa2_hw_pvt.h>
#include <dpaa2_hw_dpio.h> #include <dpaa2_hw_dpio.h>
#include <dpaa2_hw_mempool.h> #include <dpaa2_hw_mempool.h>
#include "dpaa2_pmd_logs.h"
#include "dpaa2_ethdev.h" #include "dpaa2_ethdev.h"
#include "base/dpaa2_hw_dpni_annot.h" #include "base/dpaa2_hw_dpni_annot.h"
@ -36,7 +36,7 @@
static inline void __attribute__((hot)) static inline void __attribute__((hot))
dpaa2_dev_rx_parse_frc(struct rte_mbuf *m, uint16_t frc) dpaa2_dev_rx_parse_frc(struct rte_mbuf *m, uint16_t frc)
{ {
PMD_RX_LOG(DEBUG, "frc = 0x%x ", frc); DPAA2_PMD_DP_DEBUG("frc = 0x%x\t", frc);
m->packet_type = RTE_PTYPE_UNKNOWN; m->packet_type = RTE_PTYPE_UNKNOWN;
switch (frc) { switch (frc) {
@ -107,7 +107,8 @@ dpaa2_dev_rx_parse_slow(struct dpaa2_annot_hdr *annotation)
{ {
uint32_t pkt_type = RTE_PTYPE_UNKNOWN; uint32_t pkt_type = RTE_PTYPE_UNKNOWN;
PMD_RX_LOG(DEBUG, "annotation = 0x%" PRIx64, annotation->word4); DPAA2_PMD_DP_DEBUG("(slow parse) Annotation = 0x%" PRIx64 "\t",
annotation->word4);
if (BIT_ISSET_AT_POS(annotation->word3, L2_ARP_PRESENT)) { if (BIT_ISSET_AT_POS(annotation->word3, L2_ARP_PRESENT)) {
pkt_type = RTE_PTYPE_L2_ETHER_ARP; pkt_type = RTE_PTYPE_L2_ETHER_ARP;
goto parse_done; goto parse_done;
@ -169,7 +170,8 @@ dpaa2_dev_rx_parse(struct rte_mbuf *mbuf, void *hw_annot_addr)
struct dpaa2_annot_hdr *annotation = struct dpaa2_annot_hdr *annotation =
(struct dpaa2_annot_hdr *)hw_annot_addr; (struct dpaa2_annot_hdr *)hw_annot_addr;
PMD_RX_LOG(DEBUG, "annotation = 0x%" PRIx64, annotation->word4); DPAA2_PMD_DP_DEBUG("(fast parse) Annotation = 0x%" PRIx64 "\t",
annotation->word4);
/* Check offloads first */ /* Check offloads first */
if (BIT_ISSET_AT_POS(annotation->word3, if (BIT_ISSET_AT_POS(annotation->word3,
@ -200,7 +202,6 @@ dpaa2_dev_rx_parse(struct rte_mbuf *mbuf, void *hw_annot_addr)
return RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6 | return RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6 |
RTE_PTYPE_L4_UDP; RTE_PTYPE_L4_UDP;
default: default:
PMD_RX_LOG(DEBUG, "Slow parse the parsing results\n");
break; break;
} }
@ -298,9 +299,9 @@ eth_fd_to_mbuf(const struct qbman_fd *fd)
(void *)((size_t)DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd)) (void *)((size_t)DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd))
+ DPAA2_FD_PTA_SIZE)); + DPAA2_FD_PTA_SIZE));
PMD_RX_LOG(DEBUG, "to mbuf - mbuf =%p, mbuf->buf_addr =%p, off = %d," DPAA2_PMD_DP_DEBUG("to mbuf - mbuf =%p, mbuf->buf_addr =%p, off = %d,"
"fd_off=%d fd =%" PRIx64 ", meta = %d bpid =%d, len=%d\n", "fd_off=%d fd =%" PRIx64 ", meta = %d bpid =%d, len=%d\n",
(void *)mbuf, (void *)mbuf->buf_addr, mbuf->data_off, mbuf, mbuf->buf_addr, mbuf->data_off,
DPAA2_GET_FD_OFFSET(fd), DPAA2_GET_FD_ADDR(fd), DPAA2_GET_FD_OFFSET(fd), DPAA2_GET_FD_ADDR(fd),
rte_dpaa2_bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size, rte_dpaa2_bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size,
DPAA2_GET_FD_BPID(fd), DPAA2_GET_FD_LEN(fd)); DPAA2_GET_FD_BPID(fd), DPAA2_GET_FD_LEN(fd));
@ -324,7 +325,7 @@ eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf,
temp = rte_pktmbuf_alloc(mbuf->pool); temp = rte_pktmbuf_alloc(mbuf->pool);
if (temp == NULL) { if (temp == NULL) {
PMD_TX_LOG(ERR, "No memory to allocate S/G table"); DPAA2_PMD_DP_DEBUG("No memory to allocate S/G table\n");
return -ENOMEM; return -ENOMEM;
} }
@ -397,9 +398,9 @@ eth_mbuf_to_fd(struct rte_mbuf *mbuf,
DPAA2_MBUF_TO_CONTIG_FD(mbuf, fd, bpid); DPAA2_MBUF_TO_CONTIG_FD(mbuf, fd, bpid);
PMD_TX_LOG(DEBUG, "mbuf =%p, mbuf->buf_addr =%p, off = %d," DPAA2_PMD_DP_DEBUG("mbuf =%p, mbuf->buf_addr =%p, off = %d,"
"fd_off=%d fd =%" PRIx64 ", meta = %d bpid =%d, len=%d\n", "fd_off=%d fd =%" PRIx64 ", meta = %d bpid =%d, len=%d\n",
(void *)mbuf, mbuf->buf_addr, mbuf->data_off, mbuf, mbuf->buf_addr, mbuf->data_off,
DPAA2_GET_FD_OFFSET(fd), DPAA2_GET_FD_ADDR(fd), DPAA2_GET_FD_OFFSET(fd), DPAA2_GET_FD_ADDR(fd),
rte_dpaa2_bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size, rte_dpaa2_bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size,
DPAA2_GET_FD_BPID(fd), DPAA2_GET_FD_LEN(fd)); DPAA2_GET_FD_BPID(fd), DPAA2_GET_FD_LEN(fd));
@ -435,7 +436,7 @@ eth_copy_mbuf_to_fd(struct rte_mbuf *mbuf,
if (rte_dpaa2_mbuf_alloc_bulk( if (rte_dpaa2_mbuf_alloc_bulk(
rte_dpaa2_bpid_info[bpid].bp_list->mp, &mb, 1)) { rte_dpaa2_bpid_info[bpid].bp_list->mp, &mb, 1)) {
PMD_TX_LOG(WARNING, "Unable to allocated DPAA2 buffer"); DPAA2_PMD_DP_DEBUG("Unable to allocated DPAA2 buffer\n");
return -1; return -1;
} }
m = (struct rte_mbuf *)mb; m = (struct rte_mbuf *)mb;
@ -451,18 +452,18 @@ eth_copy_mbuf_to_fd(struct rte_mbuf *mbuf,
DPAA2_MBUF_TO_CONTIG_FD(m, fd, bpid); DPAA2_MBUF_TO_CONTIG_FD(m, fd, bpid);
PMD_TX_LOG(DEBUG, " mbuf %p BMAN buf addr %p", DPAA2_PMD_DP_DEBUG(
(void *)mbuf, mbuf->buf_addr); "mbuf: %p, BMAN buf addr: %p, fdaddr: %" PRIx64 ", bpid: %d,"
" meta: %d, off: %d, len: %d\n",
PMD_TX_LOG(DEBUG, (void *)mbuf,
"fd_off=%d fd =%" PRIx64 ", meta = %d bpid =%d, len=%d\n", mbuf->buf_addr,
DPAA2_GET_FD_OFFSET(fd),
DPAA2_GET_FD_ADDR(fd), DPAA2_GET_FD_ADDR(fd),
rte_dpaa2_bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size,
DPAA2_GET_FD_BPID(fd), DPAA2_GET_FD_BPID(fd),
rte_dpaa2_bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size,
DPAA2_GET_FD_OFFSET(fd),
DPAA2_GET_FD_LEN(fd)); DPAA2_GET_FD_LEN(fd));
return 0; return 0;
} }
uint16_t uint16_t
@ -483,7 +484,7 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
if (unlikely(!DPAA2_PER_LCORE_DPIO)) { if (unlikely(!DPAA2_PER_LCORE_DPIO)) {
ret = dpaa2_affine_qbman_swp(); ret = dpaa2_affine_qbman_swp();
if (ret) { if (ret) {
RTE_LOG(ERR, PMD, "Failure in affining portal\n"); DPAA2_PMD_ERR("Failure in affining portal");
return 0; return 0;
} }
} }
@ -507,8 +508,8 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
} }
while (1) { while (1) {
if (qbman_swp_pull(swp, &pulldesc)) { if (qbman_swp_pull(swp, &pulldesc)) {
PMD_RX_LOG(WARNING, "VDQ command is not issued." DPAA2_PMD_DP_DEBUG("VDQ command is not issued."
"QBMAN is busy\n"); " QBMAN is busy (1)\n");
/* Portal was busy, try again */ /* Portal was busy, try again */
continue; continue;
} }
@ -591,8 +592,8 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
/* issue a volatile dequeue command for next pull */ /* issue a volatile dequeue command for next pull */
while (1) { while (1) {
if (qbman_swp_pull(swp, &pulldesc)) { if (qbman_swp_pull(swp, &pulldesc)) {
PMD_RX_LOG(WARNING, "VDQ command is not issued." DPAA2_PMD_DP_DEBUG("VDQ command is not issued."
"QBMAN is busy\n"); "QBMAN is busy (2)\n");
continue; continue;
} }
break; break;
@ -683,13 +684,13 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
if (unlikely(!DPAA2_PER_LCORE_DPIO)) { if (unlikely(!DPAA2_PER_LCORE_DPIO)) {
ret = dpaa2_affine_qbman_swp(); ret = dpaa2_affine_qbman_swp();
if (ret) { if (ret) {
RTE_LOG(ERR, PMD, "Failure in affining portal\n"); DPAA2_PMD_ERR("Failure in affining portal");
return 0; return 0;
} }
} }
swp = DPAA2_PER_LCORE_PORTAL; swp = DPAA2_PER_LCORE_PORTAL;
PMD_TX_LOG(DEBUG, "===> dev =%p, fqid =%d", dev, dpaa2_q->fqid); DPAA2_PMD_DP_DEBUG("===> dev =%p, fqid =%d\n", dev, dpaa2_q->fqid);
/*Prepare enqueue descriptor*/ /*Prepare enqueue descriptor*/
qbman_eq_desc_clear(&eqdesc); qbman_eq_desc_clear(&eqdesc);
@ -750,19 +751,19 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
} }
/* Not a hw_pkt pool allocated frame */ /* Not a hw_pkt pool allocated frame */
if (unlikely(!mp || !priv->bp_list)) { if (unlikely(!mp || !priv->bp_list)) {
PMD_TX_LOG(ERR, "err: no bpool attached"); DPAA2_PMD_ERR("Err: No buffer pool attached");
goto send_n_return; goto send_n_return;
} }
if (mp->ops_index != priv->bp_list->dpaa2_ops_index) { if (mp->ops_index != priv->bp_list->dpaa2_ops_index) {
PMD_TX_LOG(ERR, "non hw offload bufffer "); DPAA2_PMD_WARN("Non DPAA2 buffer pool");
/* alloc should be from the default buffer pool /* alloc should be from the default buffer pool
* attached to this interface * attached to this interface
*/ */
bpid = priv->bp_list->buf_pool.bpid; bpid = priv->bp_list->buf_pool.bpid;
if (unlikely((*bufs)->nb_segs > 1)) { if (unlikely((*bufs)->nb_segs > 1)) {
PMD_TX_LOG(ERR, "S/G support not added" DPAA2_PMD_ERR("S/G support not added"
" for non hw offload buffer"); " for non hw offload buffer");
goto send_n_return; goto send_n_return;
} }