From patchwork Fri Jul 16 08:35:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Kuhn X-Patchwork-Id: 95965 X-Patchwork-Delegate: ferruh.yigit@amd.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 D31FCA0C50; Fri, 16 Jul 2021 10:37:48 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9027941372; Fri, 16 Jul 2021 10:37:19 +0200 (CEST) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by mails.dpdk.org (Postfix) with ESMTP id 320DB4136B for ; Fri, 16 Jul 2021 10:37:18 +0200 (CEST) Received: by mail-ed1-f46.google.com with SMTP id ca14so11967207edb.2 for ; Fri, 16 Jul 2021 01:37:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=htJXQf5ubuO5+HmqeXlW9ABTIEOGfGGlHc/OXoSdGzU=; b=Os9pz63asBQoRbH9UkfdQ+6B/k3LR4sf4yn0OUSkV3Jz6ser/1zOM8D9572sVYnxqX 13YmQbjmwVj+dZ6Wq3WMi0d8MZnvyHN+tilr1R7T0LqstMX9itlEbUepcJIOrUvWRWVk nqmZOq10WNKCq6GlpNUqMrTSVADhnpSAqa3T/Dy6w26jpItuTIgZEuM77DeeI+1jLmHR dsNyldKSCt3oZCRsayFXgMwgwfa/8WxMejeb5jwFmRG7UIvT2OxsrZ06kvGjn8wXulle 2gmdA8iuQ8Wbvflxu7oKt80yL9usHBE0lcRP5dT6H5yzVtmrBXmTmxn3iK86uFgUbM/i dCFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=htJXQf5ubuO5+HmqeXlW9ABTIEOGfGGlHc/OXoSdGzU=; b=baMQ7wNql45ShtoJAX0cj8d0WojfT2/SgBUErPwCbT5u/NMDDIOy5D0EpFHjz8maoS 1wuMsN1JCQ6J9WDTo0I4iFl1gj3ApLrirNv009vqSvXOMMQhyrwR/9oz5Tq4qy3+KLbB EoLD4fSUoFyfv6sUrF86SgKrmr40SBRLmNC3WGcevsNSPW1nTM4W3RlxxlRbC2lDAlBo 1GbPCTF68x6R0jf2K1xjfMa4832G/yazzuHHpP6e+RhGWMXusps0273BWXBWvibg1UU1 k28YbMXd6Jwhti+L3u6oZj5am2Af6qPhqwJI5OdiGRQ1Z0PkP6p4xjMR5Me89zjXRQhc 1T8Q== X-Gm-Message-State: AOAM533KtEumhoQWrXvpLtg68z4a5I6GYeKQFUFjQRYXy57r7XZ9MDmS KIt4fJAOS/T5MGVuTaF3mlXoZLl1zekZdykrI1ZMxQRKPGw29UpSaZMg41+HBH3IKnOtB4E4ij3 cZEPMYGuDk+blWGiCrrIV+tAVM3/GoN6UvGLw9sAVw4UYul2FIgti9/eNgdLtH/TT X-Google-Smtp-Source: ABdhPJxzxQl35e/5sQNnS0MFuMw8jTdTPhhLcfLUVAHyx3SfuzDUWIZX3k9NoZzYTFtz1Mv2rhXc0w== X-Received: by 2002:aa7:ca54:: with SMTP id j20mr13124864edt.137.1626424637787; Fri, 16 Jul 2021 01:37:17 -0700 (PDT) Received: from localhost.localdomain ([155.93.216.150]) by smtp.gmail.com with ESMTPSA id e6sm3371650edk.63.2021.07.16.01.37.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Jul 2021 01:37:17 -0700 (PDT) From: Heinrich Kuhn To: dev@dpdk.org Cc: Heinrich Kuhn , Simon Horman Date: Fri, 16 Jul 2021 10:35:46 +0200 Message-Id: <20210716083545.34444-8-heinrich.kuhn@netronome.com> X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: <20210716083545.34444-1-heinrich.kuhn@netronome.com> References: <20210716082314.33865-1-heinrich.kuhn@netronome.com> <20210716083545.34444-1-heinrich.kuhn@netronome.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 7/7] net/nfp: batch file rename for consistency 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 Sender: "dev" Rename the nfp_net.c file to nfp_common as it now contains functions common to VF and PF functionality. Rename the header file too to be consistent. Also remove the "net" naming from the _ctrl and _logs files for consistency across the PMD. Signed-off-by: Heinrich Kuhn Signed-off-by: Simon Horman --- drivers/net/nfp/meson.build | 2 +- drivers/net/nfp/{nfp_net.c => nfp_common.c} | 4 ++-- drivers/net/nfp/{nfp_net_pmd.h => nfp_common.h} | 6 +++--- drivers/net/nfp/nfp_cpp_bridge.c | 2 +- drivers/net/nfp/{nfp_net_ctrl.h => nfp_ctrl.h} | 6 +++--- drivers/net/nfp/nfp_ethdev.c | 6 +++--- drivers/net/nfp/nfp_ethdev_vf.c | 6 +++--- drivers/net/nfp/{nfp_net_logs.h => nfp_logs.h} | 6 +++--- drivers/net/nfp/nfp_rxtx.c | 6 +++--- 9 files changed, 22 insertions(+), 22 deletions(-) rename drivers/net/nfp/{nfp_net.c => nfp_common.c} (99%) rename drivers/net/nfp/{nfp_net_pmd.h => nfp_common.h} (99%) rename drivers/net/nfp/{nfp_net_ctrl.h => nfp_ctrl.h} (99%) rename drivers/net/nfp/{nfp_net_logs.h => nfp_logs.h} (94%) diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build index ab64d0cac3..810f02ae5b 100644 --- a/drivers/net/nfp/meson.build +++ b/drivers/net/nfp/meson.build @@ -18,7 +18,7 @@ sources = files( 'nfpcore/nfp_mutex.c', 'nfpcore/nfp_nsp_eth.c', 'nfpcore/nfp_hwinfo.c', - 'nfp_net.c', + 'nfp_common.c', 'nfp_rxtx.c', 'nfp_cpp_bridge.c', 'nfp_ethdev_vf.c', diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_common.c similarity index 99% rename from drivers/net/nfp/nfp_net.c rename to drivers/net/nfp/nfp_common.c index a6097eaab0..87e8f5f333 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_common.c @@ -8,9 +8,9 @@ /* * vim:shiftwidth=8:noexpandtab * - * @file dpdk/pmd/nfp_net.c + * @file dpdk/pmd/nfp_common.c * - * Netronome vNIC DPDK Poll-Mode Driver: Main entry point + * Netronome vNIC DPDK Poll-Mode Driver: Common files */ #include diff --git a/drivers/net/nfp/nfp_net_pmd.h b/drivers/net/nfp/nfp_common.h similarity index 99% rename from drivers/net/nfp/nfp_net_pmd.h rename to drivers/net/nfp/nfp_common.h index dc05e888df..54ac937bd2 100644 --- a/drivers/net/nfp/nfp_net_pmd.h +++ b/drivers/net/nfp/nfp_common.h @@ -11,8 +11,8 @@ * Netronome NFP_NET PMD driver */ -#ifndef _NFP_NET_PMD_H_ -#define _NFP_NET_PMD_H_ +#ifndef _NFP_COMMON_H_ +#define _NFP_COMMON_H_ #define NFP_NET_PMD_VERSION "0.1" #define PCI_VENDOR_ID_NETRONOME 0x19ee @@ -404,7 +404,7 @@ int nfp_net_rss_config_default(struct rte_eth_dev *dev); #define NFP_NET_DEV_PRIVATE_TO_PF(dev_priv)\ (((struct nfp_net_hw *)dev_priv)->pf_dev) -#endif /* _NFP_NET_PMD_H_ */ +#endif /* _NFP_COMMON_H_ */ /* * Local variables: * c-file-style: "Linux" diff --git a/drivers/net/nfp/nfp_cpp_bridge.c b/drivers/net/nfp/nfp_cpp_bridge.c index d916793338..74a0eacb3f 100644 --- a/drivers/net/nfp/nfp_cpp_bridge.c +++ b/drivers/net/nfp/nfp_cpp_bridge.c @@ -19,7 +19,7 @@ #include "nfpcore/nfp_mip.h" #include "nfpcore/nfp_nsp.h" -#include "nfp_net_logs.h" +#include "nfp_logs.h" #include "nfp_cpp_bridge.h" #include diff --git a/drivers/net/nfp/nfp_net_ctrl.h b/drivers/net/nfp/nfp_ctrl.h similarity index 99% rename from drivers/net/nfp/nfp_net_ctrl.h rename to drivers/net/nfp/nfp_ctrl.h index 4f26ccf483..4dd62ef194 100644 --- a/drivers/net/nfp/nfp_net_ctrl.h +++ b/drivers/net/nfp/nfp_ctrl.h @@ -8,8 +8,8 @@ * * Netronome network device driver: Control BAR layout */ -#ifndef _NFP_NET_CTRL_H_ -#define _NFP_NET_CTRL_H_ +#ifndef _NFP_CTRL_H_ +#define _NFP_CTRL_H_ /* * Configuration BAR size. @@ -317,7 +317,7 @@ /* PF multiport offset */ #define NFP_PF_CSR_SLICE_SIZE (32 * 1024) -#endif /* _NFP_NET_CTRL_H_ */ +#endif /* _NFP_CTRL_H_ */ /* * Local variables: * c-file-style: "Linux" diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index ab08906704..29e6bb128a 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -30,10 +30,10 @@ #include "nfpcore/nfp_rtsym.h" #include "nfpcore/nfp_nsp.h" -#include "nfp_net_pmd.h" +#include "nfp_common.h" #include "nfp_rxtx.h" -#include "nfp_net_logs.h" -#include "nfp_net_ctrl.h" +#include "nfp_logs.h" +#include "nfp_ctrl.h" #include "nfp_cpp_bridge.h" diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index 223142c0ed..b697b55865 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -16,10 +16,10 @@ #include "nfpcore/nfp_mip.h" #include "nfpcore/nfp_rtsym.h" -#include "nfp_net_pmd.h" +#include "nfp_common.h" #include "nfp_rxtx.h" -#include "nfp_net_logs.h" -#include "nfp_net_ctrl.h" +#include "nfp_logs.h" +#include "nfp_ctrl.h" static void nfp_netvf_read_mac(struct nfp_net_hw *hw); static int nfp_netvf_start(struct rte_eth_dev *dev); diff --git a/drivers/net/nfp/nfp_net_logs.h b/drivers/net/nfp/nfp_logs.h similarity index 94% rename from drivers/net/nfp/nfp_net_logs.h rename to drivers/net/nfp/nfp_logs.h index 27dd87611b..bd5a5e1ec5 100644 --- a/drivers/net/nfp/nfp_net_logs.h +++ b/drivers/net/nfp/nfp_logs.h @@ -3,8 +3,8 @@ * All rights reserved. */ -#ifndef _NFP_NET_LOGS_H_ -#define _NFP_NET_LOGS_H_ +#ifndef _NFP_LOGS_H_ +#define _NFP_LOGS_H_ #include @@ -44,4 +44,4 @@ extern int nfp_logtype_driver; rte_log(RTE_LOG_ ## level, nfp_logtype_driver, \ "%s(): " fmt "\n", __func__, ## args) -#endif /* _NFP_NET_LOGS_H_ */ +#endif /* _NFP_LOGS_H_ */ diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index 9ee9e5c9a3..1402c5f84a 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -16,10 +16,10 @@ #include #include -#include "nfp_net_pmd.h" +#include "nfp_common.h" #include "nfp_rxtx.h" -#include "nfp_net_logs.h" -#include "nfp_net_ctrl.h" +#include "nfp_logs.h" +#include "nfp_ctrl.h" /* Prototypes */ static int nfp_net_rx_fill_freelist(struct nfp_net_rxq *rxq);