From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 271D2B3D6 for ; Fri, 12 Jun 2015 13:55:20 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 12 Jun 2015 04:55:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,601,1427785200"; d="scan'208";a="709789298" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga001.jf.intel.com with ESMTP; 12 Jun 2015 04:55:17 -0700 Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com [10.237.217.45]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id t5CBSGfG013685; Fri, 12 Jun 2015 12:28:16 +0100 Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id t5CBSGZk002041; Fri, 12 Jun 2015 12:28:16 +0100 Received: (from bricha3@localhost) by sivswdev01.ir.intel.com with id t5CBSG1q002036; Fri, 12 Jun 2015 12:28:16 +0100 From: Bruce Richardson To: dev@dpdk.org Date: Fri, 12 Jun 2015 12:28:13 +0100 Message-Id: <1434108496-1993-2-git-send-email-bruce.richardson@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1434108496-1993-1-git-send-email-bruce.richardson@intel.com> References: <1434108496-1993-1-git-send-email-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH 1/4] ethdev: rename macros to have RTE_ETH prefix X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Jun 2015 11:55:22 -0000 The macros to check that the function pointers are valid for an ethdev are potentially useful to have in the ethdev.h file. However, since they would then become externally visible, we apply the RTE_ETH prefix to them. Signed-off-by: Bruce Richardson --- lib/librte_ether/rte_ethdev.c | 560 +++++++++++++++++++++--------------------- 1 file changed, 280 insertions(+), 280 deletions(-) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index ae4d86d..89471f1 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -1,7 +1,7 @@ /*- * BSD LICENSE * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. + * Copyright(c) 2010-2015 Intel Corporation. All rights reserved. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -70,37 +70,37 @@ #include "rte_ethdev.h" #ifdef RTE_LIBRTE_ETHDEV_DEBUG -#define PMD_DEBUG_TRACE(fmt, args...) do { \ +#define RTE_PMD_DEBUG_TRACE(fmt, args...) do { \ RTE_LOG(ERR, PMD, "%s: " fmt, __func__, ## args); \ } while (0) #else -#define PMD_DEBUG_TRACE(fmt, args...) +#define RTE_PMD_DEBUG_TRACE(fmt, args...) #endif /* Macros for checking for restricting functions to primary instance only */ #define PROC_PRIMARY_OR_ERR_RET(retval) do { \ if (rte_eal_process_type() != RTE_PROC_PRIMARY) { \ - PMD_DEBUG_TRACE("Cannot run in secondary processes\n"); \ + RTE_PMD_DEBUG_TRACE("Cannot run in secondary processes\n"); \ return (retval); \ } \ } while(0) #define PROC_PRIMARY_OR_RET() do { \ if (rte_eal_process_type() != RTE_PROC_PRIMARY) { \ - PMD_DEBUG_TRACE("Cannot run in secondary processes\n"); \ + RTE_PMD_DEBUG_TRACE("Cannot run in secondary processes\n"); \ return; \ } \ } while(0) /* Macros to check for invlaid function pointers in dev_ops structure */ -#define FUNC_PTR_OR_ERR_RET(func, retval) do { \ +#define RTE_ETH_FPTR_OR_ERR_RET(func, retval) do { \ if ((func) == NULL) { \ - PMD_DEBUG_TRACE("Function not supported\n"); \ + RTE_PMD_DEBUG_TRACE("Function not supported\n"); \ return (retval); \ } \ } while(0) -#define FUNC_PTR_OR_RET(func) do { \ +#define RTE_ETH_FPTR_OR_RET(func) do { \ if ((func) == NULL) { \ - PMD_DEBUG_TRACE("Function not supported\n"); \ + RTE_PMD_DEBUG_TRACE("Function not supported\n"); \ return; \ } \ } while(0) @@ -233,7 +233,7 @@ rte_eth_dev_allocate(const char *name, enum rte_eth_dev_type type) port_id = rte_eth_dev_find_free_port(); if (port_id == RTE_MAX_ETHPORTS) { - PMD_DEBUG_TRACE("Reached maximum number of Ethernet ports\n"); + RTE_PMD_DEBUG_TRACE("Reached maximum number of Ethernet ports\n"); return NULL; } @@ -241,7 +241,7 @@ rte_eth_dev_allocate(const char *name, enum rte_eth_dev_type type) rte_eth_dev_data_alloc(); if (rte_eth_dev_allocated(name) != NULL) { - PMD_DEBUG_TRACE("Ethernet Device with name %s already allocated!\n", name); + RTE_PMD_DEBUG_TRACE("Ethernet Device with name %s already allocated!\n", name); return NULL; } @@ -327,7 +327,7 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv, if (diag == 0) return 0; - PMD_DEBUG_TRACE("driver %s: eth_dev_init(vendor_id=0x%u device_id=0x%x)" + RTE_PMD_DEBUG_TRACE("driver %s: eth_dev_init(vendor_id=0x%u device_id=0x%x)" " failed\n", pci_drv->name, (unsigned) pci_dev->id.vendor_id, (unsigned) pci_dev->id.device_id); @@ -466,12 +466,12 @@ static int rte_eth_dev_get_addr_by_port(uint8_t port_id, struct rte_pci_addr *addr) { if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } if (addr == NULL) { - PMD_DEBUG_TRACE("Null pointer is specified\n"); + RTE_PMD_DEBUG_TRACE("Null pointer is specified\n"); return -EINVAL; } @@ -485,12 +485,12 @@ rte_eth_dev_get_name_by_port(uint8_t port_id, char *name) char *tmp; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } if (name == NULL) { - PMD_DEBUG_TRACE("Null pointer is specified\n"); + RTE_PMD_DEBUG_TRACE("Null pointer is specified\n"); return -EINVAL; } @@ -507,7 +507,7 @@ rte_eth_dev_is_detachable(uint8_t port_id) uint32_t drv_flags; if (port_id >= RTE_MAX_ETHPORTS) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } @@ -742,7 +742,7 @@ rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues) return -(ENOMEM); } } else { /* re-configure */ - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_release, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->rx_queue_release, -ENOTSUP); rxq = dev->data->rx_queues; @@ -775,17 +775,17 @@ rte_eth_dev_rx_queue_start(uint8_t port_id, uint16_t rx_queue_id) PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } dev = &rte_eth_devices[port_id]; if (rx_queue_id >= dev->data->nb_rx_queues) { - PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", rx_queue_id); + RTE_PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", rx_queue_id); return -EINVAL; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_start, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->rx_queue_start, -ENOTSUP); return dev->dev_ops->rx_queue_start(dev, rx_queue_id); @@ -801,17 +801,17 @@ rte_eth_dev_rx_queue_stop(uint8_t port_id, uint16_t rx_queue_id) PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } dev = &rte_eth_devices[port_id]; if (rx_queue_id >= dev->data->nb_rx_queues) { - PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", rx_queue_id); + RTE_PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", rx_queue_id); return -EINVAL; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_stop, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->rx_queue_stop, -ENOTSUP); return dev->dev_ops->rx_queue_stop(dev, rx_queue_id); @@ -827,17 +827,17 @@ rte_eth_dev_tx_queue_start(uint8_t port_id, uint16_t tx_queue_id) PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } dev = &rte_eth_devices[port_id]; if (tx_queue_id >= dev->data->nb_tx_queues) { - PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", tx_queue_id); + RTE_PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", tx_queue_id); return -EINVAL; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_start, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->tx_queue_start, -ENOTSUP); return dev->dev_ops->tx_queue_start(dev, tx_queue_id); @@ -853,17 +853,17 @@ rte_eth_dev_tx_queue_stop(uint8_t port_id, uint16_t tx_queue_id) PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } dev = &rte_eth_devices[port_id]; if (tx_queue_id >= dev->data->nb_tx_queues) { - PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", tx_queue_id); + RTE_PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", tx_queue_id); return -EINVAL; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_stop, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->tx_queue_stop, -ENOTSUP); return dev->dev_ops->tx_queue_stop(dev, tx_queue_id); @@ -885,7 +885,7 @@ rte_eth_dev_tx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues) return -(ENOMEM); } } else { /* re-configure */ - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_release, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->tx_queue_release, -ENOTSUP); txq = dev->data->tx_queues; @@ -945,7 +945,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, (dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB_RSS) || (dev_conf->txmode.mq_mode == ETH_MQ_TX_DCB)) { /* SRIOV only works in VMDq enable mode */ - PMD_DEBUG_TRACE("ethdev port_id=%" PRIu8 + RTE_PMD_DEBUG_TRACE("ethdev port_id=%" PRIu8 " SRIOV active, " "wrong VMDQ mq_mode rx %u tx %u\n", port_id, @@ -958,13 +958,13 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, case ETH_MQ_RX_VMDQ_DCB: case ETH_MQ_RX_VMDQ_DCB_RSS: /* DCB/RSS VMDQ in SRIOV mode, not implement yet */ - PMD_DEBUG_TRACE("ethdev port_id=%" PRIu8 + RTE_PMD_DEBUG_TRACE("ethdev port_id=%" PRIu8 " SRIOV active, " "unsupported VMDQ mq_mode rx %u\n", port_id, dev_conf->rxmode.mq_mode); return -EINVAL; case ETH_MQ_RX_RSS: - PMD_DEBUG_TRACE("ethdev port_id=%" PRIu8 + RTE_PMD_DEBUG_TRACE("ethdev port_id=%" PRIu8 " SRIOV active, " "Rx mq mode is changed from:" "mq_mode %u into VMDQ mq_mode %u\n", @@ -975,7 +975,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, dev->data->dev_conf.rxmode.mq_mode = ETH_MQ_RX_VMDQ_RSS; if (nb_rx_q <= RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool) if (rte_eth_dev_check_vf_rss_rxq_num(port_id, nb_rx_q) != 0) { - PMD_DEBUG_TRACE("ethdev port_id=%d" + RTE_PMD_DEBUG_TRACE("ethdev port_id=%d" " SRIOV active, invalid queue" " number for VMDQ RSS, allowed" " value are 1, 2 or 4\n", @@ -994,7 +994,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, switch (dev_conf->txmode.mq_mode) { case ETH_MQ_TX_VMDQ_DCB: /* DCB VMDQ in SRIOV mode, not implement yet */ - PMD_DEBUG_TRACE("ethdev port_id=%" PRIu8 + RTE_PMD_DEBUG_TRACE("ethdev port_id=%" PRIu8 " SRIOV active, " "unsupported VMDQ mq_mode tx %u\n", port_id, dev_conf->txmode.mq_mode); @@ -1008,7 +1008,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, /* check valid queue number */ if ((nb_rx_q > RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool) || (nb_tx_q > RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool)) { - PMD_DEBUG_TRACE("ethdev port_id=%d SRIOV active, " + RTE_PMD_DEBUG_TRACE("ethdev port_id=%d SRIOV active, " "queue number must less equal to %d\n", port_id, RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool); return -EINVAL; @@ -1019,7 +1019,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, const struct rte_eth_vmdq_dcb_conf *conf; if (nb_rx_q != ETH_VMDQ_DCB_NUM_QUEUES) { - PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB, nb_rx_q " + RTE_PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB, nb_rx_q " "!= %d\n", port_id, ETH_VMDQ_DCB_NUM_QUEUES); return -EINVAL; @@ -1027,7 +1027,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, conf = &(dev_conf->rx_adv_conf.vmdq_dcb_conf); if (! (conf->nb_queue_pools == ETH_16_POOLS || conf->nb_queue_pools == ETH_32_POOLS)) { - PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB selected, " + RTE_PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB selected, " "nb_queue_pools must be %d or %d\n", port_id, ETH_16_POOLS, ETH_32_POOLS); return -EINVAL; @@ -1037,7 +1037,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, const struct rte_eth_vmdq_dcb_tx_conf *conf; if (nb_tx_q != ETH_VMDQ_DCB_NUM_QUEUES) { - PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB, nb_tx_q " + RTE_PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB, nb_tx_q " "!= %d\n", port_id, ETH_VMDQ_DCB_NUM_QUEUES); return -EINVAL; @@ -1045,7 +1045,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, conf = &(dev_conf->tx_adv_conf.vmdq_dcb_tx_conf); if (! (conf->nb_queue_pools == ETH_16_POOLS || conf->nb_queue_pools == ETH_32_POOLS)) { - PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB selected, " + RTE_PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB selected, " "nb_queue_pools != %d or nb_queue_pools " "!= %d\n", port_id, ETH_16_POOLS, ETH_32_POOLS); @@ -1058,7 +1058,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, const struct rte_eth_dcb_rx_conf *conf; if (nb_rx_q != ETH_DCB_NUM_QUEUES) { - PMD_DEBUG_TRACE("ethdev port_id=%d DCB, nb_rx_q " + RTE_PMD_DEBUG_TRACE("ethdev port_id=%d DCB, nb_rx_q " "!= %d\n", port_id, ETH_DCB_NUM_QUEUES); return -EINVAL; @@ -1066,7 +1066,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, conf = &(dev_conf->rx_adv_conf.dcb_rx_conf); if (! (conf->nb_tcs == ETH_4_TCS || conf->nb_tcs == ETH_8_TCS)) { - PMD_DEBUG_TRACE("ethdev port_id=%d DCB selected, " + RTE_PMD_DEBUG_TRACE("ethdev port_id=%d DCB selected, " "nb_tcs != %d or nb_tcs " "!= %d\n", port_id, ETH_4_TCS, ETH_8_TCS); @@ -1078,7 +1078,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, const struct rte_eth_dcb_tx_conf *conf; if (nb_tx_q != ETH_DCB_NUM_QUEUES) { - PMD_DEBUG_TRACE("ethdev port_id=%d DCB, nb_tx_q " + RTE_PMD_DEBUG_TRACE("ethdev port_id=%d DCB, nb_tx_q " "!= %d\n", port_id, ETH_DCB_NUM_QUEUES); return -EINVAL; @@ -1086,7 +1086,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, conf = &(dev_conf->tx_adv_conf.dcb_tx_conf); if (! (conf->nb_tcs == ETH_4_TCS || conf->nb_tcs == ETH_8_TCS)) { - PMD_DEBUG_TRACE("ethdev port_id=%d DCB selected, " + RTE_PMD_DEBUG_TRACE("ethdev port_id=%d DCB selected, " "nb_tcs != %d or nb_tcs " "!= %d\n", port_id, ETH_4_TCS, ETH_8_TCS); @@ -1110,19 +1110,19 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } if (nb_rx_q > RTE_MAX_QUEUES_PER_PORT) { - PMD_DEBUG_TRACE( + RTE_PMD_DEBUG_TRACE( "Number of RX queues requested (%u) is greater than max supported(%d)\n", nb_rx_q, RTE_MAX_QUEUES_PER_PORT); return -EINVAL; } if (nb_tx_q > RTE_MAX_QUEUES_PER_PORT) { - PMD_DEBUG_TRACE( + RTE_PMD_DEBUG_TRACE( "Number of TX queues requested (%u) is greater than max supported(%d)\n", nb_tx_q, RTE_MAX_QUEUES_PER_PORT); return -EINVAL; @@ -1130,11 +1130,11 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_infos_get, -ENOTSUP); - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_configure, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->dev_infos_get, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->dev_configure, -ENOTSUP); if (dev->data->dev_started) { - PMD_DEBUG_TRACE( + RTE_PMD_DEBUG_TRACE( "port %d must be stopped to allow configuration\n", port_id); return -EBUSY; } @@ -1146,22 +1146,22 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, */ (*dev->dev_ops->dev_infos_get)(dev, &dev_info); if (nb_rx_q > dev_info.max_rx_queues) { - PMD_DEBUG_TRACE("ethdev port_id=%d nb_rx_queues=%d > %d\n", + RTE_PMD_DEBUG_TRACE("ethdev port_id=%d nb_rx_queues=%d > %d\n", port_id, nb_rx_q, dev_info.max_rx_queues); return -EINVAL; } if (nb_rx_q == 0) { - PMD_DEBUG_TRACE("ethdev port_id=%d nb_rx_q == 0\n", port_id); + RTE_PMD_DEBUG_TRACE("ethdev port_id=%d nb_rx_q == 0\n", port_id); return -EINVAL; } if (nb_tx_q > dev_info.max_tx_queues) { - PMD_DEBUG_TRACE("ethdev port_id=%d nb_tx_queues=%d > %d\n", + RTE_PMD_DEBUG_TRACE("ethdev port_id=%d nb_tx_queues=%d > %d\n", port_id, nb_tx_q, dev_info.max_tx_queues); return -EINVAL; } if (nb_tx_q == 0) { - PMD_DEBUG_TRACE("ethdev port_id=%d nb_tx_q == 0\n", port_id); + RTE_PMD_DEBUG_TRACE("ethdev port_id=%d nb_tx_q == 0\n", port_id); return -EINVAL; } @@ -1176,7 +1176,7 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, const struct rte_pci_driver *pci_drv = &dev->driver->pci_drv; if (!(pci_drv->drv_flags & RTE_PCI_DRV_INTR_LSC)) { - PMD_DEBUG_TRACE("driver %s does not support lsc\n", + RTE_PMD_DEBUG_TRACE("driver %s does not support lsc\n", pci_drv->name); return -EINVAL; } @@ -1189,7 +1189,7 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, if (dev_conf->rxmode.jumbo_frame == 1) { if (dev_conf->rxmode.max_rx_pkt_len > dev_info.max_rx_pktlen) { - PMD_DEBUG_TRACE("ethdev port_id=%d max_rx_pkt_len %u" + RTE_PMD_DEBUG_TRACE("ethdev port_id=%d max_rx_pkt_len %u" " > max valid value %u\n", port_id, (unsigned)dev_conf->rxmode.max_rx_pkt_len, @@ -1197,7 +1197,7 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, return -EINVAL; } else if (dev_conf->rxmode.max_rx_pkt_len < ETHER_MIN_LEN) { - PMD_DEBUG_TRACE("ethdev port_id=%d max_rx_pkt_len %u" + RTE_PMD_DEBUG_TRACE("ethdev port_id=%d max_rx_pkt_len %u" " < min valid value %u\n", port_id, (unsigned)dev_conf->rxmode.max_rx_pkt_len, @@ -1215,7 +1215,7 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, /* multipe queue mode checking */ diag = rte_eth_dev_check_mq_mode(port_id, nb_rx_q, nb_tx_q, dev_conf); if (diag != 0) { - PMD_DEBUG_TRACE("port%d rte_eth_dev_check_mq_mode = %d\n", + RTE_PMD_DEBUG_TRACE("port%d rte_eth_dev_check_mq_mode = %d\n", port_id, diag); return diag; } @@ -1225,14 +1225,14 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, */ diag = rte_eth_dev_rx_queue_config(dev, nb_rx_q); if (diag != 0) { - PMD_DEBUG_TRACE("port%d rte_eth_dev_rx_queue_config = %d\n", + RTE_PMD_DEBUG_TRACE("port%d rte_eth_dev_rx_queue_config = %d\n", port_id, diag); return diag; } diag = rte_eth_dev_tx_queue_config(dev, nb_tx_q); if (diag != 0) { - PMD_DEBUG_TRACE("port%d rte_eth_dev_tx_queue_config = %d\n", + RTE_PMD_DEBUG_TRACE("port%d rte_eth_dev_tx_queue_config = %d\n", port_id, diag); rte_eth_dev_rx_queue_config(dev, 0); return diag; @@ -1240,7 +1240,7 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, diag = (*dev->dev_ops->dev_configure)(dev); if (diag != 0) { - PMD_DEBUG_TRACE("port%d dev_configure = %d\n", + RTE_PMD_DEBUG_TRACE("port%d dev_configure = %d\n", port_id, diag); rte_eth_dev_rx_queue_config(dev, 0); rte_eth_dev_tx_queue_config(dev, 0); @@ -1279,7 +1279,7 @@ rte_eth_dev_config_restore(uint8_t port_id) (dev->data->mac_pool_sel[i] & (1ULL << pool))) (*dev->dev_ops->mac_addr_add)(dev, &addr, i, pool); else { - PMD_DEBUG_TRACE("port %d: MAC address array not supported\n", + RTE_PMD_DEBUG_TRACE("port %d: MAC address array not supported\n", port_id); /* exit the loop but not return an error */ break; @@ -1310,16 +1310,16 @@ rte_eth_dev_start(uint8_t port_id) PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_start, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->dev_start, -ENOTSUP); if (dev->data->dev_started != 0) { - PMD_DEBUG_TRACE("Device with port_id=%" PRIu8 + RTE_PMD_DEBUG_TRACE("Device with port_id=%" PRIu8 " already started\n", port_id); return 0; @@ -1334,7 +1334,7 @@ rte_eth_dev_start(uint8_t port_id) rte_eth_dev_config_restore(port_id); if (dev->data->dev_conf.intr_conf.lsc != 0) { - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->link_update, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->link_update, -ENOTSUP); (*dev->dev_ops->link_update)(dev, 0); } return 0; @@ -1350,16 +1350,16 @@ rte_eth_dev_stop(uint8_t port_id) PROC_PRIMARY_OR_RET(); if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_RET(*dev->dev_ops->dev_stop); + RTE_ETH_FPTR_OR_RET(*dev->dev_ops->dev_stop); if (dev->data->dev_started == 0) { - PMD_DEBUG_TRACE("Device with port_id=%" PRIu8 + RTE_PMD_DEBUG_TRACE("Device with port_id=%" PRIu8 " already stopped\n", port_id); return; @@ -1379,13 +1379,13 @@ rte_eth_dev_set_link_up(uint8_t port_id) PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_set_link_up, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->dev_set_link_up, -ENOTSUP); return (*dev->dev_ops->dev_set_link_up)(dev); } @@ -1399,13 +1399,13 @@ rte_eth_dev_set_link_down(uint8_t port_id) PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_set_link_down, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->dev_set_link_down, -ENOTSUP); return (*dev->dev_ops->dev_set_link_down)(dev); } @@ -1419,13 +1419,13 @@ rte_eth_dev_close(uint8_t port_id) PROC_PRIMARY_OR_RET(); if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_RET(*dev->dev_ops->dev_close); + RTE_ETH_FPTR_OR_RET(*dev->dev_ops->dev_close); dev->data->dev_started = 0; (*dev->dev_ops->dev_close)(dev); } @@ -1446,24 +1446,24 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id, PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } dev = &rte_eth_devices[port_id]; if (rx_queue_id >= dev->data->nb_rx_queues) { - PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", rx_queue_id); + RTE_PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", rx_queue_id); return -EINVAL; } if (dev->data->dev_started) { - PMD_DEBUG_TRACE( + RTE_PMD_DEBUG_TRACE( "port %d must be stopped to allow configuration\n", port_id); return -EBUSY; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_infos_get, -ENOTSUP); - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_setup, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->dev_infos_get, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->rx_queue_setup, -ENOTSUP); /* * Check the size of the mbuf data buffer. @@ -1472,7 +1472,7 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id, */ rte_eth_dev_info_get(port_id, &dev_info); if (mp->private_data_size < sizeof(struct rte_pktmbuf_pool_private)) { - PMD_DEBUG_TRACE("%s private_data_size %d < %d\n", + RTE_PMD_DEBUG_TRACE("%s private_data_size %d < %d\n", mp->name, (int) mp->private_data_size, (int) sizeof(struct rte_pktmbuf_pool_private)); return -ENOSPC; @@ -1480,7 +1480,7 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id, mbp_buf_size = rte_pktmbuf_data_room_size(mp); if ((mbp_buf_size - RTE_PKTMBUF_HEADROOM) < dev_info.min_rx_bufsize) { - PMD_DEBUG_TRACE("%s mbuf_data_room_size %d < %d " + RTE_PMD_DEBUG_TRACE("%s mbuf_data_room_size %d < %d " "(RTE_PKTMBUF_HEADROOM=%d + min_rx_bufsize(dev)" "=%d)\n", mp->name, @@ -1519,24 +1519,24 @@ rte_eth_tx_queue_setup(uint8_t port_id, uint16_t tx_queue_id, PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } dev = &rte_eth_devices[port_id]; if (tx_queue_id >= dev->data->nb_tx_queues) { - PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", tx_queue_id); + RTE_PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", tx_queue_id); return -EINVAL; } if (dev->data->dev_started) { - PMD_DEBUG_TRACE( + RTE_PMD_DEBUG_TRACE( "port %d must be stopped to allow configuration\n", port_id); return -EBUSY; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_infos_get, -ENOTSUP); - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_setup, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->dev_infos_get, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->tx_queue_setup, -ENOTSUP); rte_eth_dev_info_get(port_id, &dev_info); @@ -1553,13 +1553,13 @@ rte_eth_promiscuous_enable(uint8_t port_id) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_RET(*dev->dev_ops->promiscuous_enable); + RTE_ETH_FPTR_OR_RET(*dev->dev_ops->promiscuous_enable); (*dev->dev_ops->promiscuous_enable)(dev); dev->data->promiscuous = 1; } @@ -1570,13 +1570,13 @@ rte_eth_promiscuous_disable(uint8_t port_id) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_RET(*dev->dev_ops->promiscuous_disable); + RTE_ETH_FPTR_OR_RET(*dev->dev_ops->promiscuous_disable); dev->data->promiscuous = 0; (*dev->dev_ops->promiscuous_disable)(dev); } @@ -1587,7 +1587,7 @@ rte_eth_promiscuous_get(uint8_t port_id) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -1; } @@ -1601,13 +1601,13 @@ rte_eth_allmulticast_enable(uint8_t port_id) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_RET(*dev->dev_ops->allmulticast_enable); + RTE_ETH_FPTR_OR_RET(*dev->dev_ops->allmulticast_enable); (*dev->dev_ops->allmulticast_enable)(dev); dev->data->all_multicast = 1; } @@ -1618,13 +1618,13 @@ rte_eth_allmulticast_disable(uint8_t port_id) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_RET(*dev->dev_ops->allmulticast_disable); + RTE_ETH_FPTR_OR_RET(*dev->dev_ops->allmulticast_disable); dev->data->all_multicast = 0; (*dev->dev_ops->allmulticast_disable)(dev); } @@ -1635,7 +1635,7 @@ rte_eth_allmulticast_get(uint8_t port_id) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -1; } @@ -1663,7 +1663,7 @@ rte_eth_link_get(uint8_t port_id, struct rte_eth_link *eth_link) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } @@ -1672,7 +1672,7 @@ rte_eth_link_get(uint8_t port_id, struct rte_eth_link *eth_link) if (dev->data->dev_conf.intr_conf.lsc != 0) rte_eth_dev_atomic_read_link_status(dev, eth_link); else { - FUNC_PTR_OR_RET(*dev->dev_ops->link_update); + RTE_ETH_FPTR_OR_RET(*dev->dev_ops->link_update); (*dev->dev_ops->link_update)(dev, 1); *eth_link = dev->data->dev_link; } @@ -1684,7 +1684,7 @@ rte_eth_link_get_nowait(uint8_t port_id, struct rte_eth_link *eth_link) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } @@ -1693,7 +1693,7 @@ rte_eth_link_get_nowait(uint8_t port_id, struct rte_eth_link *eth_link) if (dev->data->dev_conf.intr_conf.lsc != 0) rte_eth_dev_atomic_read_link_status(dev, eth_link); else { - FUNC_PTR_OR_RET(*dev->dev_ops->link_update); + RTE_ETH_FPTR_OR_RET(*dev->dev_ops->link_update); (*dev->dev_ops->link_update)(dev, 0); *eth_link = dev->data->dev_link; } @@ -1705,14 +1705,14 @@ rte_eth_stats_get(uint8_t port_id, struct rte_eth_stats *stats) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; memset(stats, 0, sizeof(*stats)); - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->stats_get, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->stats_get, -ENOTSUP); (*dev->dev_ops->stats_get)(dev, stats); stats->rx_nombuf = dev->data->rx_mbuf_alloc_failed; return 0; @@ -1724,13 +1724,13 @@ rte_eth_stats_reset(uint8_t port_id) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_RET(*dev->dev_ops->stats_reset); + RTE_ETH_FPTR_OR_RET(*dev->dev_ops->stats_reset); (*dev->dev_ops->stats_reset)(dev); } @@ -1746,7 +1746,7 @@ rte_eth_xstats_get(uint8_t port_id, struct rte_eth_xstats *xstats, char *stats_ptr; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -1; } @@ -1815,7 +1815,7 @@ rte_eth_xstats_reset(uint8_t port_id) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } @@ -1838,13 +1838,13 @@ set_queue_stats_mapping(uint8_t port_id, uint16_t queue_id, uint8_t stat_idx, struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_stats_mapping_set, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->queue_stats_mapping_set, -ENOTSUP); return (*dev->dev_ops->queue_stats_mapping_set) (dev, queue_id, stat_idx, is_rx); } @@ -1874,7 +1874,7 @@ rte_eth_dev_info_get(uint8_t port_id, struct rte_eth_dev_info *dev_info) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } @@ -1882,7 +1882,7 @@ rte_eth_dev_info_get(uint8_t port_id, struct rte_eth_dev_info *dev_info) memset(dev_info, 0, sizeof(struct rte_eth_dev_info)); - FUNC_PTR_OR_RET(*dev->dev_ops->dev_infos_get); + RTE_ETH_FPTR_OR_RET(*dev->dev_ops->dev_infos_get); (*dev->dev_ops->dev_infos_get)(dev, dev_info); dev_info->pci_dev = dev->pci_dev; if (dev->driver) @@ -1895,7 +1895,7 @@ rte_eth_macaddr_get(uint8_t port_id, struct ether_addr *mac_addr) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } @@ -1910,7 +1910,7 @@ rte_eth_dev_get_mtu(uint8_t port_id, uint16_t *mtu) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -1926,12 +1926,12 @@ rte_eth_dev_set_mtu(uint8_t port_id, uint16_t mtu) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mtu_set, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->mtu_set, -ENOTSUP); ret = (*dev->dev_ops->mtu_set)(dev, mtu); if (!ret) @@ -1946,22 +1946,22 @@ rte_eth_dev_vlan_filter(uint8_t port_id, uint16_t vlan_id, int on) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; if (! (dev->data->dev_conf.rxmode.hw_vlan_filter)) { - PMD_DEBUG_TRACE("port %d: vlan-filtering disabled\n", port_id); + RTE_PMD_DEBUG_TRACE("port %d: vlan-filtering disabled\n", port_id); return -ENOSYS; } if (vlan_id > 4095) { - PMD_DEBUG_TRACE("(port_id=%d) invalid vlan_id=%u > 4095\n", + RTE_PMD_DEBUG_TRACE("(port_id=%d) invalid vlan_id=%u > 4095\n", port_id, (unsigned) vlan_id); return -EINVAL; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_filter_set, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->vlan_filter_set, -ENOTSUP); return (*dev->dev_ops->vlan_filter_set)(dev, vlan_id, on); } @@ -1972,17 +1972,17 @@ rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, int o struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; if (rx_queue_id >= dev->data->nb_rx_queues) { - PMD_DEBUG_TRACE("Invalid rx_queue_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid rx_queue_id=%d\n", port_id); return -EINVAL; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_strip_queue_set, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->vlan_strip_queue_set, -ENOTSUP); (*dev->dev_ops->vlan_strip_queue_set)(dev, rx_queue_id, on); return 0; @@ -1994,12 +1994,12 @@ rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t tpid) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_tpid_set, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->vlan_tpid_set, -ENOTSUP); (*dev->dev_ops->vlan_tpid_set)(dev, tpid); return 0; @@ -2014,7 +2014,7 @@ rte_eth_dev_set_vlan_offload(uint8_t port_id, int offload_mask) int cur, org = 0; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -2046,7 +2046,7 @@ rte_eth_dev_set_vlan_offload(uint8_t port_id, int offload_mask) if(mask == 0) return ret; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_offload_set, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->vlan_offload_set, -ENOTSUP); (*dev->dev_ops->vlan_offload_set)(dev, mask); return ret; @@ -2059,7 +2059,7 @@ rte_eth_dev_get_vlan_offload(uint8_t port_id) int ret = 0; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -2083,12 +2083,12 @@ rte_eth_dev_set_vlan_pvid(uint8_t port_id, uint16_t pvid, int on) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_pvid_set, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->vlan_pvid_set, -ENOTSUP); (*dev->dev_ops->vlan_pvid_set)(dev, pvid, on); return 0; @@ -2102,14 +2102,14 @@ rte_eth_dev_fdir_add_signature_filter(uint8_t port_id, struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_SIGNATURE) { - PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n", + RTE_PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n", port_id, dev->data->dev_conf.fdir_conf.mode); return -ENOSYS; } @@ -2117,13 +2117,13 @@ rte_eth_dev_fdir_add_signature_filter(uint8_t port_id, if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP || fdir_filter->l4type == RTE_FDIR_L4TYPE_NONE) && (fdir_filter->port_src || fdir_filter->port_dst)) { - PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \ + RTE_PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \ "None l4type, source & destinations ports " \ "should be null!\n"); return -EINVAL; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_add_signature_filter, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->fdir_add_signature_filter, -ENOTSUP); return (*dev->dev_ops->fdir_add_signature_filter)(dev, fdir_filter, queue); } @@ -2136,14 +2136,14 @@ rte_eth_dev_fdir_update_signature_filter(uint8_t port_id, struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_SIGNATURE) { - PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n", + RTE_PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n", port_id, dev->data->dev_conf.fdir_conf.mode); return -ENOSYS; } @@ -2151,13 +2151,13 @@ rte_eth_dev_fdir_update_signature_filter(uint8_t port_id, if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP || fdir_filter->l4type == RTE_FDIR_L4TYPE_NONE) && (fdir_filter->port_src || fdir_filter->port_dst)) { - PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \ + RTE_PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \ "None l4type, source & destinations ports " \ "should be null!\n"); return -EINVAL; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_update_signature_filter, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->fdir_update_signature_filter, -ENOTSUP); return (*dev->dev_ops->fdir_update_signature_filter)(dev, fdir_filter, queue); @@ -2170,14 +2170,14 @@ rte_eth_dev_fdir_remove_signature_filter(uint8_t port_id, struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_SIGNATURE) { - PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n", + RTE_PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n", port_id, dev->data->dev_conf.fdir_conf.mode); return -ENOSYS; } @@ -2185,13 +2185,13 @@ rte_eth_dev_fdir_remove_signature_filter(uint8_t port_id, if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP || fdir_filter->l4type == RTE_FDIR_L4TYPE_NONE) && (fdir_filter->port_src || fdir_filter->port_dst)) { - PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \ + RTE_PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \ "None l4type source & destinations ports " \ "should be null!\n"); return -EINVAL; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_remove_signature_filter, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->fdir_remove_signature_filter, -ENOTSUP); return (*dev->dev_ops->fdir_remove_signature_filter)(dev, fdir_filter); } @@ -2201,17 +2201,17 @@ rte_eth_dev_fdir_get_infos(uint8_t port_id, struct rte_eth_fdir *fdir) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; if (! (dev->data->dev_conf.fdir_conf.mode)) { - PMD_DEBUG_TRACE("port %d: pkt-filter disabled\n", port_id); + RTE_PMD_DEBUG_TRACE("port %d: pkt-filter disabled\n", port_id); return -ENOSYS; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_infos_get, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->fdir_infos_get, -ENOTSUP); (*dev->dev_ops->fdir_infos_get)(dev, fdir); return 0; @@ -2226,14 +2226,14 @@ rte_eth_dev_fdir_add_perfect_filter(uint8_t port_id, struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT) { - PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n", + RTE_PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n", port_id, dev->data->dev_conf.fdir_conf.mode); return -ENOSYS; } @@ -2241,7 +2241,7 @@ rte_eth_dev_fdir_add_perfect_filter(uint8_t port_id, if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP || fdir_filter->l4type == RTE_FDIR_L4TYPE_NONE) && (fdir_filter->port_src || fdir_filter->port_dst)) { - PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \ + RTE_PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \ "None l4type, source & destinations ports " \ "should be null!\n"); return -EINVAL; @@ -2251,7 +2251,7 @@ rte_eth_dev_fdir_add_perfect_filter(uint8_t port_id, if (fdir_filter->iptype == RTE_FDIR_IPTYPE_IPV6) return -ENOTSUP; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_add_perfect_filter, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->fdir_add_perfect_filter, -ENOTSUP); return (*dev->dev_ops->fdir_add_perfect_filter)(dev, fdir_filter, soft_id, queue, drop); @@ -2266,14 +2266,14 @@ rte_eth_dev_fdir_update_perfect_filter(uint8_t port_id, struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT) { - PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n", + RTE_PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n", port_id, dev->data->dev_conf.fdir_conf.mode); return -ENOSYS; } @@ -2281,7 +2281,7 @@ rte_eth_dev_fdir_update_perfect_filter(uint8_t port_id, if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP || fdir_filter->l4type == RTE_FDIR_L4TYPE_NONE) && (fdir_filter->port_src || fdir_filter->port_dst)) { - PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \ + RTE_PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \ "None l4type, source & destinations ports " \ "should be null!\n"); return -EINVAL; @@ -2291,7 +2291,7 @@ rte_eth_dev_fdir_update_perfect_filter(uint8_t port_id, if (fdir_filter->iptype == RTE_FDIR_IPTYPE_IPV6) return -ENOTSUP; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_update_perfect_filter, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->fdir_update_perfect_filter, -ENOTSUP); return (*dev->dev_ops->fdir_update_perfect_filter)(dev, fdir_filter, soft_id, queue, drop); } @@ -2304,14 +2304,14 @@ rte_eth_dev_fdir_remove_perfect_filter(uint8_t port_id, struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT) { - PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n", + RTE_PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n", port_id, dev->data->dev_conf.fdir_conf.mode); return -ENOSYS; } @@ -2319,7 +2319,7 @@ rte_eth_dev_fdir_remove_perfect_filter(uint8_t port_id, if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP || fdir_filter->l4type == RTE_FDIR_L4TYPE_NONE) && (fdir_filter->port_src || fdir_filter->port_dst)) { - PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \ + RTE_PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \ "None l4type, source & destinations ports " \ "should be null!\n"); return -EINVAL; @@ -2329,7 +2329,7 @@ rte_eth_dev_fdir_remove_perfect_filter(uint8_t port_id, if (fdir_filter->iptype == RTE_FDIR_IPTYPE_IPV6) return -ENOTSUP; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_remove_perfect_filter, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->fdir_remove_perfect_filter, -ENOTSUP); return (*dev->dev_ops->fdir_remove_perfect_filter)(dev, fdir_filter, soft_id); } @@ -2340,17 +2340,17 @@ rte_eth_dev_fdir_set_masks(uint8_t port_id, struct rte_fdir_masks *fdir_mask) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; if (! (dev->data->dev_conf.fdir_conf.mode)) { - PMD_DEBUG_TRACE("port %d: pkt-filter disabled\n", port_id); + RTE_PMD_DEBUG_TRACE("port %d: pkt-filter disabled\n", port_id); return -ENOSYS; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_set_masks, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->fdir_set_masks, -ENOTSUP); return (*dev->dev_ops->fdir_set_masks)(dev, fdir_mask); } @@ -2360,12 +2360,12 @@ rte_eth_dev_flow_ctrl_get(uint8_t port_id, struct rte_eth_fc_conf *fc_conf) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->flow_ctrl_get, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->flow_ctrl_get, -ENOTSUP); memset(fc_conf, 0, sizeof(*fc_conf)); return (*dev->dev_ops->flow_ctrl_get)(dev, fc_conf); } @@ -2376,17 +2376,17 @@ rte_eth_dev_flow_ctrl_set(uint8_t port_id, struct rte_eth_fc_conf *fc_conf) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } if ((fc_conf->send_xon != 0) && (fc_conf->send_xon != 1)) { - PMD_DEBUG_TRACE("Invalid send_xon, only 0/1 allowed\n"); + RTE_PMD_DEBUG_TRACE("Invalid send_xon, only 0/1 allowed\n"); return -EINVAL; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->flow_ctrl_set, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->flow_ctrl_set, -ENOTSUP); return (*dev->dev_ops->flow_ctrl_set)(dev, fc_conf); } @@ -2396,12 +2396,12 @@ rte_eth_dev_priority_flow_ctrl_set(uint8_t port_id, struct rte_eth_pfc_conf *pfc struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } if (pfc_conf->priority > (ETH_DCB_NUM_USER_PRIORITIES - 1)) { - PMD_DEBUG_TRACE("Invalid priority, only 0-7 allowed\n"); + RTE_PMD_DEBUG_TRACE("Invalid priority, only 0-7 allowed\n"); return -EINVAL; } @@ -2422,7 +2422,7 @@ rte_eth_check_reta_mask(struct rte_eth_rss_reta_entry64 *reta_conf, return -EINVAL; if (reta_size != RTE_ALIGN(reta_size, RTE_RETA_GROUP_SIZE)) { - PMD_DEBUG_TRACE("Invalid reta size, should be %u aligned\n", + RTE_PMD_DEBUG_TRACE("Invalid reta size, should be %u aligned\n", RTE_RETA_GROUP_SIZE); return -EINVAL; } @@ -2447,7 +2447,7 @@ rte_eth_check_reta_entry(struct rte_eth_rss_reta_entry64 *reta_conf, return -EINVAL; if (max_rxq == 0) { - PMD_DEBUG_TRACE("No receive queue is available\n"); + RTE_PMD_DEBUG_TRACE("No receive queue is available\n"); return -EINVAL; } @@ -2456,7 +2456,7 @@ rte_eth_check_reta_entry(struct rte_eth_rss_reta_entry64 *reta_conf, shift = i % RTE_RETA_GROUP_SIZE; if ((reta_conf[idx].mask & (1ULL << shift)) && (reta_conf[idx].reta[shift] >= max_rxq)) { - PMD_DEBUG_TRACE("reta_conf[%u]->reta[%u]: %u exceeds " + RTE_PMD_DEBUG_TRACE("reta_conf[%u]->reta[%u]: %u exceeds " "the maximum rxq index: %u\n", idx, shift, reta_conf[idx].reta[shift], max_rxq); return -EINVAL; @@ -2475,7 +2475,7 @@ rte_eth_dev_rss_reta_update(uint8_t port_id, int ret; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -2492,7 +2492,7 @@ rte_eth_dev_rss_reta_update(uint8_t port_id, if (ret < 0) return ret; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->reta_update, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->reta_update, -ENOTSUP); return (*dev->dev_ops->reta_update)(dev, reta_conf, reta_size); } @@ -2505,7 +2505,7 @@ rte_eth_dev_rss_reta_query(uint8_t port_id, int ret; if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -2515,7 +2515,7 @@ rte_eth_dev_rss_reta_query(uint8_t port_id, return ret; dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->reta_query, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->reta_query, -ENOTSUP); return (*dev->dev_ops->reta_query)(dev, reta_conf, reta_size); } @@ -2526,19 +2526,19 @@ rte_eth_dev_rss_hash_update(uint8_t port_id, struct rte_eth_rss_conf *rss_conf) uint16_t rss_hash_protos; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } rss_hash_protos = rss_conf->rss_hf; if ((rss_hash_protos != 0) && ((rss_hash_protos & ETH_RSS_PROTO_MASK) == 0)) { - PMD_DEBUG_TRACE("Invalid rss_hash_protos=0x%x\n", + RTE_PMD_DEBUG_TRACE("Invalid rss_hash_protos=0x%x\n", rss_hash_protos); return -EINVAL; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rss_hash_update, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->rss_hash_update, -ENOTSUP); return (*dev->dev_ops->rss_hash_update)(dev, rss_conf); } @@ -2549,12 +2549,12 @@ rte_eth_dev_rss_hash_conf_get(uint8_t port_id, struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rss_hash_conf_get, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->rss_hash_conf_get, -ENOTSUP); return (*dev->dev_ops->rss_hash_conf_get)(dev, rss_conf); } @@ -2565,22 +2565,22 @@ rte_eth_dev_udp_tunnel_add(uint8_t port_id, struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } if (udp_tunnel == NULL) { - PMD_DEBUG_TRACE("Invalid udp_tunnel parameter\n"); + RTE_PMD_DEBUG_TRACE("Invalid udp_tunnel parameter\n"); return -EINVAL; } if (udp_tunnel->prot_type >= RTE_TUNNEL_TYPE_MAX) { - PMD_DEBUG_TRACE("Invalid tunnel type\n"); + RTE_PMD_DEBUG_TRACE("Invalid tunnel type\n"); return -EINVAL; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->udp_tunnel_add, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->udp_tunnel_add, -ENOTSUP); return (*dev->dev_ops->udp_tunnel_add)(dev, udp_tunnel); } @@ -2591,23 +2591,23 @@ rte_eth_dev_udp_tunnel_delete(uint8_t port_id, struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; if (udp_tunnel == NULL) { - PMD_DEBUG_TRACE("Invalid udp_tunnel parametr\n"); + RTE_PMD_DEBUG_TRACE("Invalid udp_tunnel parametr\n"); return -EINVAL; } if (udp_tunnel->prot_type >= RTE_TUNNEL_TYPE_MAX) { - PMD_DEBUG_TRACE("Invalid tunnel type\n"); + RTE_PMD_DEBUG_TRACE("Invalid tunnel type\n"); return -EINVAL; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->udp_tunnel_del, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->udp_tunnel_del, -ENOTSUP); return (*dev->dev_ops->udp_tunnel_del)(dev, udp_tunnel); } @@ -2617,12 +2617,12 @@ rte_eth_led_on(uint8_t port_id) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_led_on, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->dev_led_on, -ENOTSUP); return (*dev->dev_ops->dev_led_on)(dev); } @@ -2632,12 +2632,12 @@ rte_eth_led_off(uint8_t port_id) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_led_off, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->dev_led_off, -ENOTSUP); return (*dev->dev_ops->dev_led_off)(dev); } @@ -2672,20 +2672,20 @@ rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr, uint64_t pool_mask; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mac_addr_add, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->mac_addr_add, -ENOTSUP); if (is_zero_ether_addr(addr)) { - PMD_DEBUG_TRACE("port %d: Cannot add NULL MAC address\n", + RTE_PMD_DEBUG_TRACE("port %d: Cannot add NULL MAC address\n", port_id); return -EINVAL; } if (pool >= ETH_64_POOLS) { - PMD_DEBUG_TRACE("pool id must be 0-%d\n",ETH_64_POOLS - 1); + RTE_PMD_DEBUG_TRACE("pool id must be 0-%d\n",ETH_64_POOLS - 1); return -EINVAL; } @@ -2693,7 +2693,7 @@ rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr, if (index < 0) { index = get_mac_addr_index(port_id, &null_mac_addr); if (index < 0) { - PMD_DEBUG_TRACE("port %d: MAC address array full\n", + RTE_PMD_DEBUG_TRACE("port %d: MAC address array full\n", port_id); return -ENOSPC; } @@ -2724,16 +2724,16 @@ rte_eth_dev_mac_addr_remove(uint8_t port_id, struct ether_addr *addr) int index; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mac_addr_remove, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->mac_addr_remove, -ENOTSUP); index = get_mac_addr_index(port_id, addr); if (index == 0) { - PMD_DEBUG_TRACE("port %d: Cannot remove default MAC address\n", port_id); + RTE_PMD_DEBUG_TRACE("port %d: Cannot remove default MAC address\n", port_id); return -EADDRINUSE; } else if (index < 0) return 0; /* Do nothing if address wasn't found */ @@ -2759,7 +2759,7 @@ rte_eth_dev_set_vf_rxmode(uint8_t port_id, uint16_t vf, struct rte_eth_dev_info dev_info; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("set VF RX mode:Invalid port_id=%d\n", + RTE_PMD_DEBUG_TRACE("set VF RX mode:Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -2770,15 +2770,15 @@ rte_eth_dev_set_vf_rxmode(uint8_t port_id, uint16_t vf, num_vfs = dev_info.max_vfs; if (vf > num_vfs) { - PMD_DEBUG_TRACE("set VF RX mode:invalid VF id %d\n", vf); + RTE_PMD_DEBUG_TRACE("set VF RX mode:invalid VF id %d\n", vf); return -EINVAL; } if (rx_mode == 0) { - PMD_DEBUG_TRACE("set VF RX mode:mode mask ca not be zero\n"); + RTE_PMD_DEBUG_TRACE("set VF RX mode:mode mask ca not be zero\n"); return -EINVAL; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_rx_mode, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->set_vf_rx_mode, -ENOTSUP); return (*dev->dev_ops->set_vf_rx_mode)(dev, vf, rx_mode, on); } @@ -2814,14 +2814,14 @@ rte_eth_dev_uc_hash_table_set(uint8_t port_id, struct ether_addr *addr, struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("unicast hash setting:Invalid port_id=%d\n", + RTE_PMD_DEBUG_TRACE("unicast hash setting:Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; if (is_zero_ether_addr(addr)) { - PMD_DEBUG_TRACE("port %d: Cannot add NULL MAC address\n", + RTE_PMD_DEBUG_TRACE("port %d: Cannot add NULL MAC address\n", port_id); return -EINVAL; } @@ -2833,20 +2833,20 @@ rte_eth_dev_uc_hash_table_set(uint8_t port_id, struct ether_addr *addr, if (index < 0) { if (!on) { - PMD_DEBUG_TRACE("port %d: the MAC address was not" + RTE_PMD_DEBUG_TRACE("port %d: the MAC address was not" "set in UTA\n", port_id); return -EINVAL; } index = get_hash_mac_addr_index(port_id, &null_mac_addr); if (index < 0) { - PMD_DEBUG_TRACE("port %d: MAC address array full\n", + RTE_PMD_DEBUG_TRACE("port %d: MAC address array full\n", port_id); return -ENOSPC; } } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->uc_hash_table_set, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->uc_hash_table_set, -ENOTSUP); ret = (*dev->dev_ops->uc_hash_table_set)(dev, addr, on); if (ret == 0) { /* Update address in NIC data structure */ @@ -2867,14 +2867,14 @@ rte_eth_dev_uc_all_hash_table_set(uint8_t port_id, uint8_t on) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("unicast hash setting:Invalid port_id=%d\n", + RTE_PMD_DEBUG_TRACE("unicast hash setting:Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->uc_all_hash_table_set, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->uc_all_hash_table_set, -ENOTSUP); return (*dev->dev_ops->uc_all_hash_table_set)(dev, on); } @@ -2886,7 +2886,7 @@ rte_eth_dev_set_vf_rx(uint8_t port_id,uint16_t vf, uint8_t on) struct rte_eth_dev_info dev_info; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -2896,11 +2896,11 @@ rte_eth_dev_set_vf_rx(uint8_t port_id,uint16_t vf, uint8_t on) num_vfs = dev_info.max_vfs; if (vf > num_vfs) { - PMD_DEBUG_TRACE("port %d: invalid vf id\n", port_id); + RTE_PMD_DEBUG_TRACE("port %d: invalid vf id\n", port_id); return -EINVAL; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_rx, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->set_vf_rx, -ENOTSUP); return (*dev->dev_ops->set_vf_rx)(dev, vf,on); } @@ -2912,7 +2912,7 @@ rte_eth_dev_set_vf_tx(uint8_t port_id,uint16_t vf, uint8_t on) struct rte_eth_dev_info dev_info; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("set pool tx:Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("set pool tx:Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -2922,11 +2922,11 @@ rte_eth_dev_set_vf_tx(uint8_t port_id,uint16_t vf, uint8_t on) num_vfs = dev_info.max_vfs; if (vf > num_vfs) { - PMD_DEBUG_TRACE("set pool tx:invalid pool id=%d\n", vf); + RTE_PMD_DEBUG_TRACE("set pool tx:invalid pool id=%d\n", vf); return -EINVAL; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_tx, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->set_vf_tx, -ENOTSUP); return (*dev->dev_ops->set_vf_tx)(dev, vf,on); } @@ -2937,7 +2937,7 @@ rte_eth_dev_set_vf_vlan_filter(uint8_t port_id, uint16_t vlan_id, struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("VF VLAN filter:invalid port id=%d\n", + RTE_PMD_DEBUG_TRACE("VF VLAN filter:invalid port id=%d\n", port_id); return -ENODEV; } @@ -2945,17 +2945,17 @@ rte_eth_dev_set_vf_vlan_filter(uint8_t port_id, uint16_t vlan_id, if(vlan_id > ETHER_MAX_VLAN_ID) { - PMD_DEBUG_TRACE("VF VLAN filter:invalid VLAN id=%d\n", + RTE_PMD_DEBUG_TRACE("VF VLAN filter:invalid VLAN id=%d\n", vlan_id); return -EINVAL; } if (vf_mask == 0) { - PMD_DEBUG_TRACE("VF VLAN filter:pool_mask can not be 0\n"); + RTE_PMD_DEBUG_TRACE("VF VLAN filter:pool_mask can not be 0\n"); return -EINVAL; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_vlan_filter, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->set_vf_vlan_filter, -ENOTSUP); return (*dev->dev_ops->set_vf_vlan_filter)(dev, vlan_id, vf_mask,vlan_on); } @@ -2968,7 +2968,7 @@ int rte_eth_set_queue_rate_limit(uint8_t port_id, uint16_t queue_idx, struct rte_eth_link link; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("set queue rate limit:invalid port id=%d\n", + RTE_PMD_DEBUG_TRACE("set queue rate limit:invalid port id=%d\n", port_id); return -ENODEV; } @@ -2978,19 +2978,19 @@ int rte_eth_set_queue_rate_limit(uint8_t port_id, uint16_t queue_idx, link = dev->data->dev_link; if (queue_idx > dev_info.max_tx_queues) { - PMD_DEBUG_TRACE("set queue rate limit:port %d: " + RTE_PMD_DEBUG_TRACE("set queue rate limit:port %d: " "invalid queue id=%d\n", port_id, queue_idx); return -EINVAL; } if (tx_rate > link.link_speed) { - PMD_DEBUG_TRACE("set queue rate limit:invalid tx_rate=%d, " + RTE_PMD_DEBUG_TRACE("set queue rate limit:invalid tx_rate=%d, " "bigger than link speed= %d\n", tx_rate, link.link_speed); return -EINVAL; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_queue_rate_limit, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->set_queue_rate_limit, -ENOTSUP); return (*dev->dev_ops->set_queue_rate_limit)(dev, queue_idx, tx_rate); } @@ -3005,7 +3005,7 @@ int rte_eth_set_vf_rate_limit(uint8_t port_id, uint16_t vf, uint16_t tx_rate, return 0; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("set VF rate limit:invalid port id=%d\n", + RTE_PMD_DEBUG_TRACE("set VF rate limit:invalid port id=%d\n", port_id); return -ENODEV; } @@ -3015,19 +3015,19 @@ int rte_eth_set_vf_rate_limit(uint8_t port_id, uint16_t vf, uint16_t tx_rate, link = dev->data->dev_link; if (vf > dev_info.max_vfs) { - PMD_DEBUG_TRACE("set VF rate limit:port %d: " + RTE_PMD_DEBUG_TRACE("set VF rate limit:port %d: " "invalid vf id=%d\n", port_id, vf); return -EINVAL; } if (tx_rate > link.link_speed) { - PMD_DEBUG_TRACE("set VF rate limit:invalid tx_rate=%d, " + RTE_PMD_DEBUG_TRACE("set VF rate limit:invalid tx_rate=%d, " "bigger than link speed= %d\n", tx_rate, link.link_speed); return -EINVAL; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_rate_limit, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->set_vf_rate_limit, -ENOTSUP); return (*dev->dev_ops->set_vf_rate_limit)(dev, vf, tx_rate, q_msk); } @@ -3039,37 +3039,37 @@ rte_eth_mirror_rule_set(uint8_t port_id, struct rte_eth_dev *dev = &rte_eth_devices[port_id]; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } if (mirror_conf->rule_type_mask == 0) { - PMD_DEBUG_TRACE("mirror rule type can not be 0.\n"); + RTE_PMD_DEBUG_TRACE("mirror rule type can not be 0.\n"); return -EINVAL; } if (mirror_conf->dst_pool >= ETH_64_POOLS) { - PMD_DEBUG_TRACE("Invalid dst pool, pool id must" + RTE_PMD_DEBUG_TRACE("Invalid dst pool, pool id must" "be 0-%d\n",ETH_64_POOLS - 1); return -EINVAL; } if ((mirror_conf->rule_type_mask & ETH_VMDQ_POOL_MIRROR) && (mirror_conf->pool_mask == 0)) { - PMD_DEBUG_TRACE("Invalid mirror pool, pool mask can not" + RTE_PMD_DEBUG_TRACE("Invalid mirror pool, pool mask can not" "be 0.\n"); return -EINVAL; } if(rule_id >= ETH_VMDQ_NUM_MIRROR_RULE) { - PMD_DEBUG_TRACE("Invalid rule_id, rule_id must be 0-%d\n", + RTE_PMD_DEBUG_TRACE("Invalid rule_id, rule_id must be 0-%d\n", ETH_VMDQ_NUM_MIRROR_RULE - 1); return -EINVAL; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mirror_rule_set, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->mirror_rule_set, -ENOTSUP); return (*dev->dev_ops->mirror_rule_set)(dev, mirror_conf, rule_id, on); } @@ -3080,19 +3080,19 @@ rte_eth_mirror_rule_reset(uint8_t port_id, uint8_t rule_id) struct rte_eth_dev *dev = &rte_eth_devices[port_id]; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } if(rule_id >= ETH_VMDQ_NUM_MIRROR_RULE) { - PMD_DEBUG_TRACE("Invalid rule_id, rule_id must be 0-%d\n", + RTE_PMD_DEBUG_TRACE("Invalid rule_id, rule_id must be 0-%d\n", ETH_VMDQ_NUM_MIRROR_RULE-1); return -EINVAL; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mirror_rule_reset, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->mirror_rule_reset, -ENOTSUP); return (*dev->dev_ops->mirror_rule_reset)(dev, rule_id); } @@ -3105,14 +3105,14 @@ rte_eth_rx_burst(uint8_t port_id, uint16_t queue_id, struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return 0; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->rx_pkt_burst, 0); + RTE_ETH_FPTR_OR_ERR_RET(*dev->rx_pkt_burst, 0); if (queue_id >= dev->data->nb_rx_queues) { - PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", queue_id); + RTE_PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", queue_id); return 0; } return (*dev->rx_pkt_burst)(dev->data->rx_queues[queue_id], @@ -3126,15 +3126,15 @@ rte_eth_tx_burst(uint8_t port_id, uint16_t queue_id, struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return 0; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->tx_pkt_burst, 0); + RTE_ETH_FPTR_OR_ERR_RET(*dev->tx_pkt_burst, 0); if (queue_id >= dev->data->nb_tx_queues) { - PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", queue_id); + RTE_PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", queue_id); return 0; } return (*dev->tx_pkt_burst)(dev->data->tx_queues[queue_id], @@ -3147,12 +3147,12 @@ rte_eth_rx_queue_count(uint8_t port_id, uint16_t queue_id) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return 0; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_count, 0); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->rx_queue_count, 0); return (*dev->dev_ops->rx_queue_count)(dev, queue_id); } @@ -3162,12 +3162,12 @@ rte_eth_rx_descriptor_done(uint8_t port_id, uint16_t queue_id, uint16_t offset) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_descriptor_done, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->rx_descriptor_done, -ENOTSUP); return (*dev->dev_ops->rx_descriptor_done)( \ dev->data->rx_queues[queue_id], offset); } @@ -3185,7 +3185,7 @@ rte_eth_dev_callback_register(uint8_t port_id, return -EINVAL; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } @@ -3226,7 +3226,7 @@ rte_eth_dev_callback_unregister(uint8_t port_id, return -EINVAL; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } @@ -3286,16 +3286,16 @@ int rte_eth_dev_bypass_init(uint8_t port_id) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } if ((dev= &rte_eth_devices[port_id]) == NULL) { - PMD_DEBUG_TRACE("Invalid port device\n"); + RTE_PMD_DEBUG_TRACE("Invalid port device\n"); return -ENODEV; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_init, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->bypass_init, -ENOTSUP); (*dev->dev_ops->bypass_init)(dev); return 0; } @@ -3306,15 +3306,15 @@ rte_eth_dev_bypass_state_show(uint8_t port_id, uint32_t *state) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } if ((dev= &rte_eth_devices[port_id]) == NULL) { - PMD_DEBUG_TRACE("Invalid port device\n"); + RTE_PMD_DEBUG_TRACE("Invalid port device\n"); return -ENODEV; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_state_show, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->bypass_state_show, -ENOTSUP); (*dev->dev_ops->bypass_state_show)(dev, state); return 0; } @@ -3325,16 +3325,16 @@ rte_eth_dev_bypass_state_set(uint8_t port_id, uint32_t *new_state) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } if ((dev= &rte_eth_devices[port_id]) == NULL) { - PMD_DEBUG_TRACE("Invalid port device\n"); + RTE_PMD_DEBUG_TRACE("Invalid port device\n"); return -ENODEV; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_state_set, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->bypass_state_set, -ENOTSUP); (*dev->dev_ops->bypass_state_set)(dev, new_state); return 0; } @@ -3345,16 +3345,16 @@ rte_eth_dev_bypass_event_show(uint8_t port_id, uint32_t event, uint32_t *state) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } if ((dev= &rte_eth_devices[port_id]) == NULL) { - PMD_DEBUG_TRACE("Invalid port device\n"); + RTE_PMD_DEBUG_TRACE("Invalid port device\n"); return -ENODEV; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_state_show, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->bypass_state_show, -ENOTSUP); (*dev->dev_ops->bypass_event_show)(dev, event, state); return 0; } @@ -3365,16 +3365,16 @@ rte_eth_dev_bypass_event_store(uint8_t port_id, uint32_t event, uint32_t state) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } if ((dev= &rte_eth_devices[port_id]) == NULL) { - PMD_DEBUG_TRACE("Invalid port device\n"); + RTE_PMD_DEBUG_TRACE("Invalid port device\n"); return -ENODEV; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_event_set, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->bypass_event_set, -ENOTSUP); (*dev->dev_ops->bypass_event_set)(dev, event, state); return 0; } @@ -3385,16 +3385,16 @@ rte_eth_dev_wd_timeout_store(uint8_t port_id, uint32_t timeout) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } if ((dev= &rte_eth_devices[port_id]) == NULL) { - PMD_DEBUG_TRACE("Invalid port device\n"); + RTE_PMD_DEBUG_TRACE("Invalid port device\n"); return -ENODEV; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_wd_timeout_set, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->bypass_wd_timeout_set, -ENOTSUP); (*dev->dev_ops->bypass_wd_timeout_set)(dev, timeout); return 0; } @@ -3405,16 +3405,16 @@ rte_eth_dev_bypass_ver_show(uint8_t port_id, uint32_t *ver) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } if ((dev= &rte_eth_devices[port_id]) == NULL) { - PMD_DEBUG_TRACE("Invalid port device\n"); + RTE_PMD_DEBUG_TRACE("Invalid port device\n"); return -ENODEV; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_ver_show, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->bypass_ver_show, -ENOTSUP); (*dev->dev_ops->bypass_ver_show)(dev, ver); return 0; } @@ -3425,16 +3425,16 @@ rte_eth_dev_bypass_wd_timeout_show(uint8_t port_id, uint32_t *wd_timeout) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } if ((dev= &rte_eth_devices[port_id]) == NULL) { - PMD_DEBUG_TRACE("Invalid port device\n"); + RTE_PMD_DEBUG_TRACE("Invalid port device\n"); return -ENODEV; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_wd_timeout_show, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->bypass_wd_timeout_show, -ENOTSUP); (*dev->dev_ops->bypass_wd_timeout_show)(dev, wd_timeout); return 0; } @@ -3445,16 +3445,16 @@ rte_eth_dev_bypass_wd_reset(uint8_t port_id) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } if ((dev= &rte_eth_devices[port_id]) == NULL) { - PMD_DEBUG_TRACE("Invalid port device\n"); + RTE_PMD_DEBUG_TRACE("Invalid port device\n"); return -ENODEV; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_wd_reset, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->bypass_wd_reset, -ENOTSUP); (*dev->dev_ops->bypass_wd_reset)(dev); return 0; } @@ -3466,12 +3466,12 @@ rte_eth_dev_filter_supported(uint8_t port_id, enum rte_filter_type filter_type) struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->filter_ctrl, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->filter_ctrl, -ENOTSUP); return (*dev->dev_ops->filter_ctrl)(dev, filter_type, RTE_ETH_FILTER_NOP, NULL); } @@ -3483,12 +3483,12 @@ rte_eth_dev_filter_ctrl(uint8_t port_id, enum rte_filter_type filter_type, struct rte_eth_dev *dev; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->filter_ctrl, -ENOTSUP); + RTE_ETH_FPTR_OR_ERR_RET(*dev->dev_ops->filter_ctrl, -ENOTSUP); return (*dev->dev_ops->filter_ctrl)(dev, filter_type, filter_op, arg); } -- 2.4.2