From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7F253A2F67 for ; Fri, 4 Oct 2019 19:19:43 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 410231C2A1; Fri, 4 Oct 2019 19:19:43 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 98FCD1C296 for ; Fri, 4 Oct 2019 19:19:41 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Oct 2019 10:19:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,257,1566889200"; d="scan'208";a="217228544" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by fmsmga004.fm.intel.com with ESMTP; 04 Oct 2019 10:19:38 -0700 From: Bruce Richardson To: dev@dpdk.org, Nicolas Chautru Cc: Akhil Goyal , Andrzej Ostruszka , Bruce Richardson Date: Fri, 4 Oct 2019 18:19:10 +0100 Message-Id: <20191004171913.59574-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191004171913.59574-1-bruce.richardson@intel.com> References: <20191004171913.59574-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 2/5] baseband/fpga_lte_fec: align naming to other bbdevs X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" The fpga_lte_fec is the only bbdev driver that does not use bbdev in the name, so modify it to keep consistency with the other bbdev drivers. This will then allow later simplification due to all drivers using the same basic naming format. Signed-off-by: Bruce Richardson --- app/test-bbdev/meson.build | 6 +++--- app/test-bbdev/test_bbdev_perf.c | 6 +++--- config/common_base | 2 +- doc/guides/bbdevs/fpga_lte_fec.rst | 2 +- drivers/baseband/Makefile | 2 +- drivers/baseband/fpga_lte_fec/Makefile | 6 +++--- mk/rte.app.mk | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/test-bbdev/meson.build b/app/test-bbdev/meson.build index d3f2b7701..4f53a2ed8 100644 --- a/app/test-bbdev/meson.build +++ b/app/test-bbdev/meson.build @@ -7,6 +7,6 @@ sources = files('main.c', 'test_bbdev_vector.c') allow_experimental_apis = true deps += ['bbdev', 'bus_vdev'] -if dpdk_conf.has('RTE_LIBRTE_PMD_FPGA_LTE_FEC') - deps += ['bbdev_fpga_lte_fec'] -endif \ No newline at end of file +if dpdk_conf.has('RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC') + deps += ['pmd_bbdev_fpga_lte_fec'] +endif diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c index 7ab61eff8..fb9045fc5 100644 --- a/app/test-bbdev/test_bbdev_perf.c +++ b/app/test-bbdev/test_bbdev_perf.c @@ -18,7 +18,7 @@ #include #include -#ifdef RTE_LIBRTE_PMD_FPGA_LTE_FEC +#ifdef RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC #include #endif @@ -30,7 +30,7 @@ #define MAX_QUEUES RTE_MAX_LCORE #define TEST_REPETITIONS 1000 -#ifdef RTE_LIBRTE_PMD_FPGA_LTE_FEC +#ifdef RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC #define FPGA_PF_DRIVER_NAME ("intel_fpga_lte_fec_pf") #define FPGA_VF_DRIVER_NAME ("intel_fpga_lte_fec_vf") #define VF_UL_QUEUE_VALUE 4 @@ -520,7 +520,7 @@ add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info, * if '-i' flag is set and using fpga device */ #ifndef RTE_BUILD_SHARED_LIB -#ifdef RTE_LIBRTE_PMD_FPGA_LTE_FEC +#ifdef RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC if ((get_init_device() == true) && (!strcmp(info->drv.driver_name, FPGA_PF_DRIVER_NAME))) { struct fpga_lte_fec_conf conf; diff --git a/config/common_base b/config/common_base index 8ef75c203..c102699dd 100644 --- a/config/common_base +++ b/config/common_base @@ -556,7 +556,7 @@ CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW=y # # Compile PMD for Intel FPGA LTE FEC bbdev device # -CONFIG_RTE_LIBRTE_PMD_FPGA_LTE_FEC=y +CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC=y # # Compile generic crypto device library diff --git a/doc/guides/bbdevs/fpga_lte_fec.rst b/doc/guides/bbdevs/fpga_lte_fec.rst index 4a3061a90..206b6f4f9 100644 --- a/doc/guides/bbdevs/fpga_lte_fec.rst +++ b/doc/guides/bbdevs/fpga_lte_fec.rst @@ -52,7 +52,7 @@ Installation Section 3 of the DPDK manual provides instuctions on installing and compiling DPDK. The default set of bbdev compile flags may be found in config/common_base, where for example -the flag to build the FPGA LTE FEC device, ``CONFIG_RTE_LIBRTE_PMD_FPGA_LTE_FEC``, is already +the flag to build the FPGA LTE FEC device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC``, is already set. It is assumed DPDK has been compiled using for instance: .. code-block:: console diff --git a/drivers/baseband/Makefile b/drivers/baseband/Makefile index ceffc7d49..91048beca 100644 --- a/drivers/baseband/Makefile +++ b/drivers/baseband/Makefile @@ -10,7 +10,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL) += null DEPDIRS-null = $(core-libs) DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += turbo_sw DEPDIRS-turbo_sw = $(core-libs) -DIRS-$(CONFIG_RTE_LIBRTE_PMD_FPGA_LTE_FEC) += fpga_lte_fec +DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC) += fpga_lte_fec DEPDIRS-fpga_lte_fec = $(core-libs) include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/baseband/fpga_lte_fec/Makefile b/drivers/baseband/fpga_lte_fec/Makefile index a38a396ae..2369bd27f 100644 --- a/drivers/baseband/fpga_lte_fec/Makefile +++ b/drivers/baseband/fpga_lte_fec/Makefile @@ -4,7 +4,7 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name -LIB = librte_pmd_fpga_lte_fec.a +LIB = librte_pmd_bbdev_fpga_lte_fec.a # build flags CFLAGS += -DALLOW_EXPERIMENTAL_API @@ -21,9 +21,9 @@ EXPORT_MAP := rte_pmd_bbdev_fpga_lte_fec_version.map LIBABIVER := 1 # library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_FPGA_LTE_FEC) += fpga_lte_fec.c +SRCS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC) += fpga_lte_fec.c # export include files -SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_FPGA_LTE_FEC)-include += fpga_lte_fec.h +SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC)-include += fpga_lte_fec.h include $(RTE_SDK)/mk/rte.lib.mk diff --git a/mk/rte.app.mk b/mk/rte.app.mk index ba5c39e01..1806abaf7 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -226,7 +226,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += -lrte_pmd_netvsc ifeq ($(CONFIG_RTE_LIBRTE_BBDEV),y) _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL) += -lrte_pmd_bbdev_null -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_FPGA_LTE_FEC) += -lrte_pmd_fpga_lte_fec +_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC) += -lrte_pmd_bbdev_fpga_lte_fec # TURBO SOFTWARE PMD is dependent on the FLEXRAN library _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -lrte_pmd_bbdev_turbo_sw -- 2.21.0