The queue stats mapping API is removed in 26.11. Drop the .queue_stats_mapping_set op and the SXE2_DEV_CAPS_OFFLOAD_Q_MAP handling, along with the now-unused mapping init/reset helpers.
Signed-off-by: Stephen Hemminger <[email protected]> --- drivers/net/sxe2/sxe2_cmd_chnl.c | 99 -------------------------------- drivers/net/sxe2/sxe2_cmd_chnl.h | 10 ---- drivers/net/sxe2/sxe2_ethdev.c | 5 -- drivers/net/sxe2/sxe2_stats.c | 76 +----------------------- drivers/net/sxe2/sxe2_stats.h | 5 -- 5 files changed, 3 insertions(+), 192 deletions(-) diff --git a/drivers/net/sxe2/sxe2_cmd_chnl.c b/drivers/net/sxe2/sxe2_cmd_chnl.c index b09989fe50..050488301c 100644 --- a/drivers/net/sxe2/sxe2_cmd_chnl.c +++ b/drivers/net/sxe2/sxe2_cmd_chnl.c @@ -1609,105 +1609,6 @@ int32_t sxe2_drv_queue_info_get_update(struct sxe2_adapter *adapter, struct eth_ return ret; } -int32_t sxe2_drv_rxq_mapping_set(struct rte_eth_dev *eth_dev, uint16_t queue_id, uint8_t pool_idx) -{ - struct sxe2_adapter *adapter = SXE2_DEV_PRIVATE_TO_ADAPTER(eth_dev); - int32_t ret = 0; - struct sxe2_common_device *cdev = adapter->cdev; - struct sxe2_drv_cmd_params param = {0}; - struct sxe2_drv_rx_map_req req = {0}; - struct sxe2_rx_queue *rxq = NULL; - - rxq = eth_dev->data->rx_queues[queue_id]; - if (rxq == NULL) { - PMD_LOG_ERR(DRV, "Rx queue %u is not available or setup", - queue_id); - ret = -EINVAL; - goto l_end; - } - - req.queue_id = rxq->queue_id; - req.pool_idx = pool_idx; - - sxe2_drv_cmd_params_fill(adapter, ¶m, SXE2_DRV_CMD_RX_MAP_SET, - &req, sizeof(req), - NULL, 0); - - ret = sxe2_drv_cmd_exec(cdev, ¶m); - if (ret) - PMD_LOG_ERR(DRV, "get dev caps failed, ret=%d", ret); - -l_end: - return ret; -} - -int32_t sxe2_drv_txq_mapping_set(struct rte_eth_dev *eth_dev, uint16_t queue_id, uint8_t pool_idx) -{ - struct sxe2_adapter *adapter = SXE2_DEV_PRIVATE_TO_ADAPTER(eth_dev); - int32_t ret = 0; - struct sxe2_common_device *cdev = adapter->cdev; - struct sxe2_drv_cmd_params param = {0}; - struct sxe2_drv_tx_map_req req = {0}; - struct sxe2_tx_queue *txq = NULL; - - txq = eth_dev->data->tx_queues[queue_id]; - if (txq == NULL) { - PMD_LOG_ERR(DRV, "Rx queue %u is not available or setup", queue_id); - ret = -EINVAL; - goto l_end; - } - - req.queue_id = txq->queue_id; - req.pool_idx = pool_idx; - - sxe2_drv_cmd_params_fill(adapter, ¶m, SXE2_DRV_CMD_TX_MAP_SET, - &req, sizeof(req), - NULL, 0); - - ret = sxe2_drv_cmd_exec(cdev, ¶m); - if (ret) - PMD_LOG_ERR(DRV, "get dev caps failed, ret=%d", ret); - -l_end: - return ret; -} - -int32_t sxe2_drv_mapping_reset(struct rte_eth_dev *eth_dev) -{ - struct sxe2_adapter *adapter = SXE2_DEV_PRIVATE_TO_ADAPTER(eth_dev); - struct sxe2_drv_cmd_params param = {0}; - struct sxe2_common_device *cdev = adapter->cdev; - int32_t ret; - - sxe2_drv_cmd_params_fill(adapter, ¶m, SXE2_DRV_CMD_TX_RX_MAP_RESET, - NULL, 0, - NULL, 0); - - ret = sxe2_drv_cmd_exec(cdev, ¶m); - if (ret) - PMD_LOG_ERR(DRV, "Reset queue mapping failed, ret=%d", ret); - - return ret; -} - -int32_t sxe2_drv_mapping_stats_info_clear(struct rte_eth_dev *eth_dev) -{ - struct sxe2_adapter *adapter = SXE2_DEV_PRIVATE_TO_ADAPTER(eth_dev); - struct sxe2_drv_cmd_params param = {0}; - struct sxe2_common_device *cdev = adapter->cdev; - int32_t ret; - - sxe2_drv_cmd_params_fill(adapter, ¶m, SXE2_DRV_CMD_TX_RX_MAP_INFO_CLEAR, - NULL, 0, - NULL, 0); - - ret = sxe2_drv_cmd_exec(cdev, ¶m); - if (ret) - PMD_LOG_ERR(DRV, "Clear map stats info failed, ret=%d", ret); - - return ret; -} - int32_t sxe2_drv_flow_filter_add(struct sxe2_adapter *adapter, struct sxe2_flow *flow) { struct sxe2_drv_flow_filter_req req = { 0 }; diff --git a/drivers/net/sxe2/sxe2_cmd_chnl.h b/drivers/net/sxe2/sxe2_cmd_chnl.h index d63caad526..f43dcc8e7a 100644 --- a/drivers/net/sxe2/sxe2_cmd_chnl.h +++ b/drivers/net/sxe2/sxe2_cmd_chnl.h @@ -102,16 +102,6 @@ int32_t sxe2_drv_queue_info_get_update(struct sxe2_adapter *adapter, int32_t sxe2_drv_fc_state_get(struct sxe2_adapter *adapter, struct sxe2_drv_vsi_fc_get_resp *dev_fc_state_resp); -int32_t sxe2_drv_rxq_mapping_set(struct rte_eth_dev *eth_dev, uint16_t queue_id, uint8_t pool_idx); - -int32_t sxe2_drv_txq_mapping_set(struct rte_eth_dev *eth_dev, uint16_t queue_id, uint8_t pool_idx); - -int32_t sxe2_drv_mapping_reset(struct rte_eth_dev *eth_dev); - -int32_t sxe2_drv_mapping_stats_info_clear(struct rte_eth_dev *eth_dev); - -int32_t sxe2_drv_rxq_mapping_set(struct rte_eth_dev *eth_dev, uint16_t queue_id, uint8_t pool_idx); - int32_t sxe2_drv_allmulti_config(struct sxe2_adapter *adapter, bool set); int32_t sxe2_drv_uc_config(struct sxe2_adapter *adapter, struct rte_ether_addr *addr, bool add); diff --git a/drivers/net/sxe2/sxe2_ethdev.c b/drivers/net/sxe2/sxe2_ethdev.c index 8bbfdc3a15..440411a65a 100644 --- a/drivers/net/sxe2/sxe2_ethdev.c +++ b/drivers/net/sxe2/sxe2_ethdev.c @@ -194,8 +194,6 @@ static const struct eth_dev_ops sxe2_eth_dev_ops = { .xstats_get_names = sxe2_xstats_names_get, .xstats_reset = sxe2_stats_info_reset, - .queue_stats_mapping_set = sxe2_queue_stats_mapping_set, - .fw_version_get = sxe2_fw_version_string_get, .get_monitor_addr = sxe2_get_monitor_addr, @@ -1309,9 +1307,6 @@ static void sxe2_drv_dev_caps_set(struct sxe2_adapter *adapter, if (dev_caps->cap_flags & SXE2_DEV_CAPS_OFFLOAD_PTP) adapter->cap_flags |= SXE2_DEV_CAPS_OFFLOAD_PTP; - if (dev_caps->cap_flags & SXE2_DEV_CAPS_OFFLOAD_Q_MAP) - adapter->cap_flags |= SXE2_DEV_CAPS_OFFLOAD_Q_MAP; - if (dev_caps->cap_flags & SXE2_DEV_CAPS_OFFLOAD_FC_STATE) adapter->cap_flags |= SXE2_DEV_CAPS_OFFLOAD_FC_STATE; } diff --git a/drivers/net/sxe2/sxe2_stats.c b/drivers/net/sxe2/sxe2_stats.c index 3ad8fe2fe9..27cd019c1a 100644 --- a/drivers/net/sxe2/sxe2_stats.c +++ b/drivers/net/sxe2/sxe2_stats.c @@ -497,90 +497,20 @@ int32_t sxe2_stats_hw_reset(struct rte_eth_dev *dev) int32_t sxe2_stats_info_reset(struct rte_eth_dev *dev) { - int32_t ret; - struct sxe2_adapter *adapter = SXE2_DEV_PRIVATE_TO_ADAPTER(dev); - if (rte_eal_process_type() == RTE_PROC_SECONDARY) return sxe2_mp_req_reset_stats(dev); - if (adapter->cap_flags & SXE2_DEV_CAPS_OFFLOAD_Q_MAP) { - ret = sxe2_drv_mapping_stats_info_clear(dev); - if (ret) - goto l_end; - } - - ret = sxe2_stats_hw_reset(dev); - if (ret) - goto l_end; - -l_end: - return ret; + return sxe2_stats_hw_reset(dev); } int32_t sxe2_stats_init(struct rte_eth_dev *dev) { PMD_INIT_FUNC_TRACE(); - int32_t ret; if (rte_eal_process_type() != RTE_PROC_PRIMARY) return 0; - ret = sxe2_queue_stats_map_init(dev); - if (ret) - goto l_end; - - ret = sxe2_stats_hw_reset(dev); - if (ret) - goto l_end; - -l_end: - return ret; -} - -int32_t sxe2_queue_stats_mapping_set(struct rte_eth_dev *eth_dev, - uint16_t queue_id, uint8_t pool_idx, uint8_t is_rx) -{ - int32_t ret = -1; - struct sxe2_adapter *adapter = SXE2_DEV_PRIVATE_TO_ADAPTER(eth_dev); + dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS; - if (!(adapter->cap_flags & SXE2_DEV_CAPS_OFFLOAD_Q_MAP)) { - PMD_LOG_ERR(DRV, "VF does not support queue mapping! "); - goto l_end; - } - - if (is_rx) - ret = sxe2_drv_rxq_mapping_set(eth_dev, queue_id, pool_idx); - else - ret = sxe2_drv_txq_mapping_set(eth_dev, queue_id, pool_idx); - - if (ret) { - PMD_LOG_ERR(DRV, "Queue stats mapping failed ! " - "queue_id:%u pool_idx:%u", queue_id, pool_idx); - goto l_end; - } - - PMD_LOG_DEBUG(DRV, "port %u %s queue_id %d stat map to pool[%u] ", - (uint16_t)(eth_dev->data->port_id), is_rx ? "RX" : "TX", - queue_id, pool_idx); -l_end: - return ret; -} - -int32_t sxe2_queue_stats_map_init(struct rte_eth_dev *dev) -{ - int32_t ret = 0; - struct sxe2_adapter *adapter = SXE2_DEV_PRIVATE_TO_ADAPTER(dev); - - if (adapter->cap_flags & SXE2_DEV_CAPS_OFFLOAD_Q_MAP) { - dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS; - - ret = sxe2_drv_mapping_reset(dev); - if (ret) { - PMD_LOG_ERR(DRV, "Queue stats mapping init failed !"); - goto l_end; - } - } - -l_end: - return ret; + return sxe2_stats_hw_reset(dev); } diff --git a/drivers/net/sxe2/sxe2_stats.h b/drivers/net/sxe2/sxe2_stats.h index 64ac2bb11d..f9cb5a8225 100644 --- a/drivers/net/sxe2/sxe2_stats.h +++ b/drivers/net/sxe2/sxe2_stats.h @@ -31,9 +31,4 @@ int32_t sxe2_stats_info_reset(struct rte_eth_dev *dev); int32_t sxe2_stats_init(struct rte_eth_dev *dev); -int32_t sxe2_queue_stats_mapping_set(struct rte_eth_dev *eth_dev, - uint16_t queue_id, uint8_t pool_idx, uint8_t is_rx); - -int32_t sxe2_queue_stats_map_init(struct rte_eth_dev *dev); - #endif -- 2.53.0
