From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5E7D4A034E; Thu, 24 Feb 2022 15:13:10 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3C5CE41156; Thu, 24 Feb 2022 15:13:10 +0100 (CET) Received: from mail-io1-f45.google.com (mail-io1-f45.google.com [209.85.166.45]) by mails.dpdk.org (Postfix) with ESMTP id 27FF44114D for ; Thu, 24 Feb 2022 15:13:09 +0100 (CET) Received: by mail-io1-f45.google.com with SMTP id c23so2818298ioi.4 for ; Thu, 24 Feb 2022 06:13:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=6UU8eIFZHG4eHR7Oz2m4XKHoX7lKihPjZGsdUV2IR0g=; b=F+gTLu5cO7kqvdPSI2f0hPuLhm7gwtCxzUbr0zqaRP2yOz45iGXg28JOscT4jjNmYC gm5zNmEGBeQicw72gstBGypCWd2OnpUJS7Zdf8R0lqUidWW7zzyiVY/kS6VoZumUu+cW ca2afC9DZ5Rf2aaFSNx5i/ngj+jK35UTj8w/a4FVjX/fs0aLbQF09pluojekUSG57rc1 ZGvIvSsvwUJkYMCdImOZ0gU8Ga6TifYeF1+h3vH1FhWenY4JteHqJhYZwN+lozh+UX+2 Hf08wcNsHcifv5gGGAcHDLro2gFNf34c5EaXUEIqVJX4mxj2yc11jwnEoTPq+8vboaT7 rHDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=6UU8eIFZHG4eHR7Oz2m4XKHoX7lKihPjZGsdUV2IR0g=; b=GV/xSOcGQur8RxUEnYliTX5UVJai095CCBBLMYsvs9nvxJD6QNsbMGbhRt+yzXSbuT qGDP/uodTyyfds2/FNBHYIhFwfF9Mmg4LD4qD7rFfd+xH7Q8oiVIM3cI50PNghy37RPa p9e3KIPRqx2YvlFMzrZEp+EPAO39v51X+aqBDMdyj0X8/seWtqPb/d8MQXZh3tNBXn2K Y4jqeg+wZx7Ngw1K+aVJ3+idFZpq3OAiNoFFmVvqQq7x7ZH4P1bsrBY+a7acn8NO6WlR RfTlkTtAFBlIl2PzOUXMzzcZEkO3BNq0SDI/QnV6W/FP+1lncf2k6G+1H6DkGI533eKt qBew== X-Gm-Message-State: AOAM530hFLAcLMaC5J58ArIt4XHyj8BiUo1bmoPFbhF5tWhbAwN0Llr1 qjbXx28CSdwDJrp5rwLNm8nT1QCu24PzboDXbHs= X-Google-Smtp-Source: ABdhPJzQXiXNTRB7CWkUq9ictJxGNh654+WxnmhWTxnCCvsvci6HHV1EaUGQFQ+PxNQfz//oVp1AWH5BNqf81ghhZSE= X-Received: by 2002:a02:aca:0:b0:314:9da8:7be0 with SMTP id 193-20020a020aca000000b003149da87be0mr2330921jaw.280.1645711988393; Thu, 24 Feb 2022 06:13:08 -0800 (PST) MIME-Version: 1.0 References: <20220224101345.18236-1-ndabilpuram@marvell.com> In-Reply-To: <20220224101345.18236-1-ndabilpuram@marvell.com> From: Jerin Jacob Date: Thu, 24 Feb 2022 19:42:41 +0530 Message-ID: Subject: Re: [PATCH] net/cnxk: remove unused files after template rework To: Nithin Dabilpuram Cc: Jerin Jacob , Kiran Kumar K , Sunil Kumar Kori , Satha Rao , Anatoly Burakov , dpdk-dev , Pavan Nikhilesh Content-Type: text/plain; charset="UTF-8" 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 On Thu, Feb 24, 2022 at 3:44 PM Nithin Dabilpuram wrote: > > 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 Cc: stable@dpdk.org > > Signed-off-by: Nithin Dabilpuram Acked-by: Jerin Jacob Applied to dpdk-next-net-mrvl/for-next-net. Thanks > --- > 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(); > -} > -- > 2.8.4 >