From patchwork Thu Feb 24 10:13:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nithin Dabilpuram X-Patchwork-Id: 108251 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1B031A0353; Thu, 24 Feb 2022 11:13:57 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A394A41155; Thu, 24 Feb 2022 11:13:56 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 564024114D for ; Thu, 24 Feb 2022 11:13:55 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 21O6TbXh024224; Thu, 24 Feb 2022 02:13:54 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=pfpt0220; bh=lixW7sLPoEcgbWwm/by4alqVmcEbTwn0sMEHm1fyMnk=; b=Sj3GN6nqFUwxVOPopktJt9ehqK1cYyZhSmzoTB9paPngz+CBQ7JAvYdUEFyh/rX0xHRU eL0dwzO0YukCy+DltcoXViBxG296f2JJZkBDT5VAX0r4XJaWb3cUCeB8yDtVptcj+4Y/ r+05jRuURMe0zfXVl1ABt6r5jT6La5o2aL1F4/WZ4AE0K24bj1YeyBrqBcOnyMKQT0xl 094xpILow5hKSmkHeQEzchcL2Bmm7t5ph7i0K+GG4ZoYvP0bU6bv+vvaXtCnhjhq+h8p 01ndk410YheGl7eRJHAHV2UHVQSj0IuW4makwCoQ46y+41AH6U743wTQ1a0bGOMzyJmZ 4Q== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3edjerp03d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 24 Feb 2022 02:13:54 -0800 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 24 Feb 2022 02:13:52 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Thu, 24 Feb 2022 02:13:52 -0800 Received: from hyd1588t430.marvell.com (unknown [10.29.52.204]) by maili.marvell.com (Postfix) with ESMTP id E5D0E5B6927; Thu, 24 Feb 2022 02:13:49 -0800 (PST) From: Nithin Dabilpuram To: , Nithin Dabilpuram , "Kiran Kumar K" , Sunil Kumar Kori , Satha Rao , Anatoly Burakov CC: , Subject: [PATCH] net/cnxk: remove unused files after template rework Date: Thu, 24 Feb 2022 15:43:45 +0530 Message-ID: <20220224101345.18236-1-ndabilpuram@marvell.com> X-Mailer: git-send-email 2.8.4 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: eoYy_H3G_E-G3zZCt2kWO6i7lPWohSM0 X-Proofpoint-GUID: eoYy_H3G_E-G3zZCt2kWO6i7lPWohSM0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-02-24_01,2022-02-24_01,2022-02-23_01 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Remove unused files that were left over after Rx and Tx template function rework. Fixes: 5169508a68fa ("net/cnxk: add cn9k template Rx functions to build") Fixes: dd8c20eee472 ("net/cnxk: add cn9k template Tx functions to build") Fixes: be294749a12a ("net/cnxk: add cn10k template Rx functions to build") Cc: pbhagavatula@marvell.com Signed-off-by: Nithin Dabilpuram Acked-by: Jerin Jacob --- drivers/net/cnxk/cn10k_rx.c | 92 -------------------------------------------- drivers/net/cnxk/cn9k_rx.c | 92 -------------------------------------------- drivers/net/cnxk/cn9k_tx.c | 93 --------------------------------------------- 3 files changed, 277 deletions(-) delete mode 100644 drivers/net/cnxk/cn10k_rx.c delete mode 100644 drivers/net/cnxk/cn9k_rx.c delete mode 100644 drivers/net/cnxk/cn9k_tx.c diff --git a/drivers/net/cnxk/cn10k_rx.c b/drivers/net/cnxk/cn10k_rx.c deleted file mode 100644 index 15f71b1..0000000 --- a/drivers/net/cnxk/cn10k_rx.c +++ /dev/null @@ -1,92 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * Copyright(C) 2021 Marvell. - */ - -#include "cn10k_ethdev.h" -#include "cn10k_rx.h" - -#define R(name, f6, f5, f4, f3, f2, f1, f0, flags) \ - uint16_t __rte_noinline __rte_hot cn10k_nix_recv_pkts_##name( \ - void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts) \ - { \ - return cn10k_nix_recv_pkts(rx_queue, rx_pkts, pkts, (flags)); \ - } \ - -NIX_RX_FASTPATH_MODES -#undef R - -static inline void -pick_rx_func(struct rte_eth_dev *eth_dev, - const eth_rx_burst_t rx_burst[2][2][2][2][2][2][2]) -{ - struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev); - - /* [VLAN] [TSP] [MARK] [CKSUM] [PTYPE] [RSS] */ - eth_dev->rx_pkt_burst = rx_burst - [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_SECURITY_F)] - [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_VLAN_STRIP_F)] - [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_TSTAMP_F)] - [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_MARK_UPDATE_F)] - [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_CHECKSUM_F)] - [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_PTYPE_F)] - [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_RSS_F)]; - - if (eth_dev->data->dev_started) - rte_eth_fp_ops[eth_dev->data->port_id].rx_pkt_burst = - eth_dev->rx_pkt_burst; - - rte_atomic_thread_fence(__ATOMIC_RELEASE); -} - -void -cn10k_eth_set_rx_function(struct rte_eth_dev *eth_dev) -{ - struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev); - - const eth_rx_burst_t nix_eth_rx_burst[2][2][2][2][2][2][2] = { -#define R(name, f6, f5, f4, f3, f2, f1, f0, flags) \ - [f6][f5][f4][f3][f2][f1][f0] = cn10k_nix_recv_pkts_##name, - - NIX_RX_FASTPATH_MODES -#undef R - }; - - const eth_rx_burst_t nix_eth_rx_burst_mseg[2][2][2][2][2][2][2] = { -#define R(name, f6, f5, f4, f3, f2, f1, f0, flags) \ - [f6][f5][f4][f3][f2][f1][f0] = cn10k_nix_recv_pkts_mseg_##name, - - NIX_RX_FASTPATH_MODES -#undef R - }; - - const eth_rx_burst_t nix_eth_rx_vec_burst[2][2][2][2][2][2][2] = { -#define R(name, f6, f5, f4, f3, f2, f1, f0, flags) \ - [f6][f5][f4][f3][f2][f1][f0] = cn10k_nix_recv_pkts_vec_##name, - - NIX_RX_FASTPATH_MODES -#undef R - }; - - const eth_rx_burst_t nix_eth_rx_vec_burst_mseg[2][2][2][2][2][2][2] = { -#define R(name, f6, f5, f4, f3, f2, f1, f0, flags) \ - [f6][f5][f4][f3][f2][f1][f0] = cn10k_nix_recv_pkts_vec_mseg_##name, - - NIX_RX_FASTPATH_MODES -#undef R - }; - - /* Copy multi seg version with no offload for tear down sequence */ - if (rte_eal_process_type() == RTE_PROC_PRIMARY) - dev->rx_pkt_burst_no_offload = - nix_eth_rx_burst_mseg[0][0][0][0][0][0][0]; - - if (dev->scalar_ena) { - if (dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SCATTER) - return pick_rx_func(eth_dev, nix_eth_rx_burst_mseg); - return pick_rx_func(eth_dev, nix_eth_rx_burst); - } - - if (dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SCATTER) - return pick_rx_func(eth_dev, nix_eth_rx_vec_burst_mseg); - return pick_rx_func(eth_dev, nix_eth_rx_vec_burst); -} diff --git a/drivers/net/cnxk/cn9k_rx.c b/drivers/net/cnxk/cn9k_rx.c deleted file mode 100644 index 185b643..0000000 --- a/drivers/net/cnxk/cn9k_rx.c +++ /dev/null @@ -1,92 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * Copyright(C) 2021 Marvell. - */ - -#include "cn9k_ethdev.h" -#include "cn9k_rx.h" - -#define R(name, f6, f5, f4, f3, f2, f1, f0, flags) \ - uint16_t __rte_noinline __rte_hot cn9k_nix_recv_pkts_##name( \ - void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts) \ - { \ - return cn9k_nix_recv_pkts(rx_queue, rx_pkts, pkts, (flags)); \ - } - -NIX_RX_FASTPATH_MODES -#undef R - -static inline void -pick_rx_func(struct rte_eth_dev *eth_dev, - const eth_rx_burst_t rx_burst[2][2][2][2][2][2][2]) -{ - struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev); - - /* [TSP] [MARK] [VLAN] [CKSUM] [PTYPE] [RSS] */ - eth_dev->rx_pkt_burst = rx_burst - [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_SECURITY_F)] - [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_VLAN_STRIP_F)] - [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_TSTAMP_F)] - [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_MARK_UPDATE_F)] - [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_CHECKSUM_F)] - [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_PTYPE_F)] - [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_RSS_F)]; - - if (eth_dev->data->dev_started) - rte_eth_fp_ops[eth_dev->data->port_id].rx_pkt_burst = - eth_dev->rx_pkt_burst; - - rte_atomic_thread_fence(__ATOMIC_RELEASE); -} - -void -cn9k_eth_set_rx_function(struct rte_eth_dev *eth_dev) -{ - struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev); - - const eth_rx_burst_t nix_eth_rx_burst[2][2][2][2][2][2][2] = { -#define R(name, f6, f5, f4, f3, f2, f1, f0, flags) \ - [f6][f5][f4][f3][f2][f1][f0] = cn9k_nix_recv_pkts_##name, - - NIX_RX_FASTPATH_MODES -#undef R - }; - - const eth_rx_burst_t nix_eth_rx_burst_mseg[2][2][2][2][2][2][2] = { -#define R(name, f6, f5, f4, f3, f2, f1, f0, flags) \ - [f6][f5][f4][f3][f2][f1][f0] = cn9k_nix_recv_pkts_mseg_##name, - - NIX_RX_FASTPATH_MODES -#undef R - }; - - const eth_rx_burst_t nix_eth_rx_vec_burst[2][2][2][2][2][2][2] = { -#define R(name, f6, f5, f4, f3, f2, f1, f0, flags) \ - [f6][f5][f4][f3][f2][f1][f0] = cn9k_nix_recv_pkts_vec_##name, - - NIX_RX_FASTPATH_MODES -#undef R - }; - - const eth_rx_burst_t nix_eth_rx_vec_burst_mseg[2][2][2][2][2][2][2] = { -#define R(name, f6, f5, f4, f3, f2, f1, f0, flags) \ - [f6][f5][f4][f3][f2][f1][f0] = cn9k_nix_recv_pkts_vec_mseg_##name, - - NIX_RX_FASTPATH_MODES -#undef R - }; - - /* Copy multi seg version with no offload for tear down sequence */ - if (rte_eal_process_type() == RTE_PROC_PRIMARY) - dev->rx_pkt_burst_no_offload = - nix_eth_rx_burst_mseg[0][0][0][0][0][0][0]; - - if (dev->scalar_ena) { - if (dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SCATTER) - return pick_rx_func(eth_dev, nix_eth_rx_burst_mseg); - return pick_rx_func(eth_dev, nix_eth_rx_burst); - } - - if (dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SCATTER) - return pick_rx_func(eth_dev, nix_eth_rx_vec_burst_mseg); - return pick_rx_func(eth_dev, nix_eth_rx_vec_burst); -} diff --git a/drivers/net/cnxk/cn9k_tx.c b/drivers/net/cnxk/cn9k_tx.c deleted file mode 100644 index f99e5d3..0000000 --- a/drivers/net/cnxk/cn9k_tx.c +++ /dev/null @@ -1,93 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * Copyright(C) 2021 Marvell. - */ - -#include "cn9k_ethdev.h" -#include "cn9k_tx.h" - -#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags) \ - uint16_t __rte_noinline __rte_hot cn9k_nix_xmit_pkts_##name( \ - void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts) \ - { \ - uint64_t cmd[sz]; \ - \ - /* For TSO inner checksum is a must */ \ - if (((flags) & NIX_TX_OFFLOAD_TSO_F) && \ - !((flags) & NIX_TX_OFFLOAD_L3_L4_CSUM_F)) \ - return 0; \ - return cn9k_nix_xmit_pkts(tx_queue, tx_pkts, pkts, cmd, flags);\ - } - -NIX_TX_FASTPATH_MODES -#undef T - -static inline void -pick_tx_func(struct rte_eth_dev *eth_dev, - const eth_tx_burst_t tx_burst[2][2][2][2][2][2][2]) -{ - struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev); - - /* [TS] [TSO] [NOFF] [VLAN] [OL3_OL4_CSUM] [IL3_IL4_CSUM] */ - eth_dev->tx_pkt_burst = tx_burst - [!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_SECURITY_F)] - [!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_TSTAMP_F)] - [!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_TSO_F)] - [!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_MBUF_NOFF_F)] - [!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_VLAN_QINQ_F)] - [!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F)] - [!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_L3_L4_CSUM_F)]; - - if (eth_dev->data->dev_started) - rte_eth_fp_ops[eth_dev->data->port_id].tx_pkt_burst = - eth_dev->tx_pkt_burst; -} - -void -cn9k_eth_set_tx_function(struct rte_eth_dev *eth_dev) -{ - struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev); - - const eth_tx_burst_t nix_eth_tx_burst[2][2][2][2][2][2][2] = { -#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags) \ - [f6][f5][f4][f3][f2][f1][f0] = cn9k_nix_xmit_pkts_##name, - - NIX_TX_FASTPATH_MODES -#undef T - }; - - const eth_tx_burst_t nix_eth_tx_burst_mseg[2][2][2][2][2][2][2] = { -#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags) \ - [f6][f5][f4][f3][f2][f1][f0] = cn9k_nix_xmit_pkts_mseg_##name, - - NIX_TX_FASTPATH_MODES -#undef T - }; - - const eth_tx_burst_t nix_eth_tx_vec_burst[2][2][2][2][2][2][2] = { -#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags) \ - [f6][f5][f4][f3][f2][f1][f0] = cn9k_nix_xmit_pkts_vec_##name, - - NIX_TX_FASTPATH_MODES -#undef T - }; - - const eth_tx_burst_t nix_eth_tx_vec_burst_mseg[2][2][2][2][2][2][2] = { -#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags) \ - [f6][f5][f4][f3][f2][f1][f0] = cn9k_nix_xmit_pkts_vec_mseg_##name, - - NIX_TX_FASTPATH_MODES -#undef T - }; - - if (dev->scalar_ena) { - pick_tx_func(eth_dev, nix_eth_tx_burst); - if (dev->tx_offloads & RTE_ETH_TX_OFFLOAD_MULTI_SEGS) - pick_tx_func(eth_dev, nix_eth_tx_burst_mseg); - } else { - pick_tx_func(eth_dev, nix_eth_tx_vec_burst); - if (dev->tx_offloads & RTE_ETH_TX_OFFLOAD_MULTI_SEGS) - pick_tx_func(eth_dev, nix_eth_tx_vec_burst_mseg); - } - - rte_mb(); -}