Hi, I'm okay if it's applied in 19.11.
> -----Original Message----- > From: Thomas Monjalon [mailto:tho...@monjalon.net] > Sent: Tuesday, July 30, 2019 21:40 > To: dev@dpdk.org; Mcnamara, John <john.mcnam...@intel.com>; > Kovacevic, Marko <marko.kovace...@intel.com>; Nipun Gupta > <nipun.gu...@nxp.com>; Xu, Rosen <rosen...@intel.com>; Zhang, Tianfei > <tianfei.zh...@intel.com>; Richardson, Bruce > <bruce.richard...@intel.com>; Li, Xiaoyun <xiaoyun...@intel.com>; Wu, > Jingjing <jingjing...@intel.com>; Satha Rao <skotesh...@marvell.com>; > Vamsi Attunuru <vattun...@marvell.com>; Shreyansh Jain > <shreyansh.j...@nxp.com>; Hemant Agrawal <hemant.agra...@nxp.com> > Cc: Neil Horman <nhor...@tuxdriver.com> > Subject: [PATCH v2 2/2] drivers/raw: standardize naming > > From: Bruce Richardson <bruce.richard...@intel.com> > > The driver names for rawdevs were both different in make and meson builds > and were non-standard in the make version in that some included "rawdev" > in the name while others didn't. > > Therefore, for global consistency of naming, we can use "rte_rawdev" rather > than "rte_pmd" for the prefix for the libraries. While most other driver > categories use "rte_pmd" as a prefix, there is precedent for this in the > mempool drivers use "rte_mempool" as a prefix. > > Signed-off-by: Bruce Richardson <bruce.richard...@intel.com> > Signed-off-by: Thomas Monjalon <tho...@monjalon.net> > --- > doc/guides/rel_notes/release_19_08.rst | 3 +++ > drivers/raw/dpaa2_cmdif/Makefile | 4 ++-- > ...sion.map => rte_rawdev_dpaa2_cmdif_version.map} | 0 > drivers/raw/dpaa2_qdma/Makefile | 4 ++-- > ...rsion.map => rte_rawdev_dpaa2_qdma_version.map} | 0 > drivers/raw/ifpga/Makefile | 4 ++-- > ...ga_version.map => rte_rawdev_ifpga_version.map} | 0 > drivers/raw/ioat/Makefile | 4 ++-- > ...oat_version.map => rte_rawdev_ioat_version.map} | 0 > drivers/raw/meson.build | 2 +- > drivers/raw/ntb/Makefile | 4 ++-- > ..._ntb_version.map => rte_rawdev_ntb_version.map} | 0 > drivers/raw/octeontx2_dma/Makefile | 4 ++-- > ...on.map => rte_rawdev_octeontx2_dma_version.map} | 0 > drivers/raw/skeleton/Makefile | 4 ++-- > ...version.map => rte_rawdev_skeleton_version.map} | 0 > mk/rte.app.mk | 14 +++++++------- > 17 files changed, 25 insertions(+), 22 deletions(-) rename > drivers/raw/dpaa2_cmdif/{rte_pmd_dpaa2_cmdif_version.map => > rte_rawdev_dpaa2_cmdif_version.map} (100%) rename > drivers/raw/dpaa2_qdma/{rte_pmd_dpaa2_qdma_version.map => > rte_rawdev_dpaa2_qdma_version.map} (100%) rename > drivers/raw/ifpga/{rte_pmd_ifpga_version.map => > rte_rawdev_ifpga_version.map} (100%) rename > drivers/raw/ioat/{rte_pmd_ioat_version.map => > rte_rawdev_ioat_version.map} (100%) rename > drivers/raw/ntb/{rte_pmd_ntb_version.map => > rte_rawdev_ntb_version.map} (100%) rename > drivers/raw/octeontx2_dma/{rte_pmd_octeontx2_dma_version.map => > rte_rawdev_octeontx2_dma_version.map} (100%) rename > drivers/raw/skeleton/{rte_pmd_skeleton_version.map => > rte_rawdev_skeleton_version.map} (100%) > > diff --git a/doc/guides/rel_notes/release_19_08.rst > b/doc/guides/rel_notes/release_19_08.rst > index fcd1386a5..13a98f520 100644 > --- a/doc/guides/rel_notes/release_19_08.rst > +++ b/doc/guides/rel_notes/release_19_08.rst > @@ -351,6 +351,9 @@ ABI Changes > * bbdev: New operations and parameters added to support new 5GNR > operations. > The bbdev ABI is still kept experimental. > > +* rawdev: The driver names have been changed to ``librte_rawdev_*``. > + Now they all have the same prefix, and same name with make and meson > builds. > + > > Shared Library Versions > ----------------------- > diff --git a/drivers/raw/dpaa2_cmdif/Makefile > b/drivers/raw/dpaa2_cmdif/Makefile > index 9bd5ff229..2b4150c2d 100644 > --- a/drivers/raw/dpaa2_cmdif/Makefile > +++ b/drivers/raw/dpaa2_cmdif/Makefile > @@ -6,7 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk # # library name # - > LIB = librte_pmd_dpaa2_cmdif.a > +LIB = librte_rawdev_dpaa2_cmdif.a > > CFLAGS += -DALLOW_EXPERIMENTAL_API > CFLAGS += -O3 > @@ -23,7 +23,7 @@ LDLIBS += -lrte_mempool_dpaa2 LDLIBS += - > lrte_rawdev LDLIBS += -lrte_common_dpaax > > -EXPORT_MAP := rte_pmd_dpaa2_cmdif_version.map > +EXPORT_MAP := rte_rawdev_dpaa2_cmdif_version.map > > LIBABIVER := 2 > > diff --git a/drivers/raw/dpaa2_cmdif/rte_pmd_dpaa2_cmdif_version.map > b/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map > similarity index 100% > rename from drivers/raw/dpaa2_cmdif/rte_pmd_dpaa2_cmdif_version.map > rename to drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map > diff --git a/drivers/raw/dpaa2_qdma/Makefile > b/drivers/raw/dpaa2_qdma/Makefile index f9a810cc6..0009fd4c6 100644 > --- a/drivers/raw/dpaa2_qdma/Makefile > +++ b/drivers/raw/dpaa2_qdma/Makefile > @@ -6,7 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk # # library name # - > LIB = librte_pmd_dpaa2_qdma.a > +LIB = librte_rawdev_dpaa2_qdma.a > > CFLAGS += -DALLOW_EXPERIMENTAL_API > CFLAGS += -O3 > @@ -24,7 +24,7 @@ LDLIBS += -lrte_kvargs LDLIBS += -lrte_ring LDLIBS += - > lrte_common_dpaax > > -EXPORT_MAP := rte_pmd_dpaa2_qdma_version.map > +EXPORT_MAP := rte_rawdev_dpaa2_qdma_version.map > > LIBABIVER := 3 > > diff --git a/drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma_version.map > b/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map > similarity index 100% > rename from > drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma_version.map > rename to > drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map > diff --git a/drivers/raw/ifpga/Makefile b/drivers/raw/ifpga/Makefile index > 5fa9303d5..655b29288 100644 > --- a/drivers/raw/ifpga/Makefile > +++ b/drivers/raw/ifpga/Makefile > @@ -6,7 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk # # library name # - > LIB = librte_pmd_ifpga_rawdev.a > +LIB = librte_rawdev_ifpga.a > > CFLAGS += -DALLOW_EXPERIMENTAL_API > CFLAGS += -O3 > @@ -21,7 +21,7 @@ LDLIBS += -lrte_kvargs LDLIBS += -lrte_bus_pci LDLIBS > += -lrte_bus_ifpga > > -EXPORT_MAP := rte_pmd_ifpga_version.map > +EXPORT_MAP := rte_rawdev_ifpga_version.map > > LIBABIVER := 1 > > diff --git a/drivers/raw/ifpga/rte_pmd_ifpga_version.map > b/drivers/raw/ifpga/rte_rawdev_ifpga_version.map > similarity index 100% > rename from drivers/raw/ifpga/rte_pmd_ifpga_version.map > rename to drivers/raw/ifpga/rte_rawdev_ifpga_version.map > diff --git a/drivers/raw/ioat/Makefile b/drivers/raw/ioat/Makefile index > 32f079845..e852afb57 100644 > --- a/drivers/raw/ioat/Makefile > +++ b/drivers/raw/ioat/Makefile > @@ -4,7 +4,7 @@ > include $(RTE_SDK)/mk/rte.vars.mk > > # library name > -LIB = librte_pmd_ioat_rawdev.a > +LIB = librte_rawdev_ioat.a > > # build flags > CFLAGS += -O3 > @@ -18,7 +18,7 @@ LDLIBS += -lrte_mbuf -lrte_mempool LIBABIVER := 1 > > # versioning export map > -EXPORT_MAP := rte_pmd_ioat_version.map > +EXPORT_MAP := rte_rawdev_ioat_version.map > > # library source files > SRCS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat_rawdev.c diff -- > git a/drivers/raw/ioat/rte_pmd_ioat_version.map > b/drivers/raw/ioat/rte_rawdev_ioat_version.map > similarity index 100% > rename from drivers/raw/ioat/rte_pmd_ioat_version.map > rename to drivers/raw/ioat/rte_rawdev_ioat_version.map > diff --git a/drivers/raw/meson.build b/drivers/raw/meson.build index > bcd5553e1..d7037cd87 100644 > --- a/drivers/raw/meson.build > +++ b/drivers/raw/meson.build > @@ -7,4 +7,4 @@ drivers = ['dpaa2_cmdif', 'dpaa2_qdma', > 'skeleton'] > std_deps = ['rawdev'] > config_flag_fmt = 'RTE_LIBRTE_PMD_@0@_RAWDEV' > -driver_name_fmt = 'rte_pmd_@0@' > +driver_name_fmt = 'rte_rawdev_@0@' > diff --git a/drivers/raw/ntb/Makefile b/drivers/raw/ntb/Makefile index > edd49fe75..6fe2aaf40 100644 > --- a/drivers/raw/ntb/Makefile > +++ b/drivers/raw/ntb/Makefile > @@ -6,7 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk # # library name # - > LIB = librte_pmd_ntb.a > +LIB = librte_rawdev_ntb.a > > CFLAGS += -DALLOW_EXPERIMENTAL_API > CFLAGS += -O3 > @@ -15,7 +15,7 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool LDLIBS > += -lrte_pci -lrte_bus_pci LDLIBS += -lrte_rawdev > > -EXPORT_MAP := rte_pmd_ntb_version.map > +EXPORT_MAP := rte_rawdev_ntb_version.map > > LIBABIVER := 1 > > diff --git a/drivers/raw/ntb/rte_pmd_ntb_version.map > b/drivers/raw/ntb/rte_rawdev_ntb_version.map > similarity index 100% > rename from drivers/raw/ntb/rte_pmd_ntb_version.map > rename to drivers/raw/ntb/rte_rawdev_ntb_version.map > diff --git a/drivers/raw/octeontx2_dma/Makefile > b/drivers/raw/octeontx2_dma/Makefile > index 96f782eb6..f101e4916 100644 > --- a/drivers/raw/octeontx2_dma/Makefile > +++ b/drivers/raw/octeontx2_dma/Makefile > @@ -5,7 +5,7 @@ > include $(RTE_SDK)/mk/rte.vars.mk > > # library name > -LIB = librte_pmd_octeontx2_dma.a > +LIB = librte_rawdev_octeontx2_dma.a > > CFLAGS += -O3 $(WERROR_FLAGS) > CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2/ > @@ -22,7 +22,7 @@ CFLAGS += -diag-disable 2259 endif endif > > -EXPORT_MAP := rte_pmd_octeontx2_dma_version.map > +EXPORT_MAP := rte_rawdev_octeontx2_dma_version.map > > LIBABIVER := 1 > > diff --git > a/drivers/raw/octeontx2_dma/rte_pmd_octeontx2_dma_version.map > b/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map > similarity index 100% > rename from > drivers/raw/octeontx2_dma/rte_pmd_octeontx2_dma_version.map > rename to > drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map > diff --git a/drivers/raw/skeleton/Makefile b/drivers/raw/skeleton/Makefile > index 9641e6505..783b1e952 100644 > --- a/drivers/raw/skeleton/Makefile > +++ b/drivers/raw/skeleton/Makefile > @@ -6,7 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk # # library name # - > LIB = librte_pmd_skeleton_rawdev.a > +LIB = librte_rawdev_skeleton.a > > CFLAGS += -O3 > CFLAGS += $(WERROR_FLAGS) > @@ -15,7 +15,7 @@ LDLIBS += -lrte_rawdev LDLIBS += -lrte_bus_vdev > LDLIBS += -lrte_kvargs > > -EXPORT_MAP := rte_pmd_skeleton_version.map > +EXPORT_MAP := rte_rawdev_skeleton_version.map > > LIBABIVER := 1 > > diff --git a/drivers/raw/skeleton/rte_pmd_skeleton_version.map > b/drivers/raw/skeleton/rte_rawdev_skeleton_version.map > similarity index 100% > rename from drivers/raw/skeleton/rte_pmd_skeleton_version.map > rename to drivers/raw/skeleton/rte_rawdev_skeleton_version.map > diff --git a/mk/rte.app.mk b/mk/rte.app.mk index a277c808e..ba5c39e01 > 100644 > --- a/mk/rte.app.mk > +++ b/mk/rte.app.mk > @@ -312,19 +312,19 @@ _LDLIBS- > $(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += -lrte_pmd_opdl_event > endif # CONFIG_RTE_LIBRTE_EVENTDEV > > ifeq ($(CONFIG_RTE_LIBRTE_RAWDEV),y) > -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += - > lrte_pmd_skeleton_rawdev > +_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += > +-lrte_rawdev_skeleton > ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy) > -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += - > lrte_pmd_dpaa2_cmdif > -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) += - > lrte_pmd_dpaa2_qdma > +_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += > +-lrte_rawdev_dpaa2_cmdif > +_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) += > +-lrte_rawdev_dpaa2_qdma > endif # CONFIG_RTE_LIBRTE_FSLMC_BUS > _LDLIBS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += -lrte_bus_ifpga > ifeq ($(CONFIG_RTE_LIBRTE_IFPGA_BUS),y) > -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += - > lrte_pmd_ifpga_rawdev > +_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += - > lrte_rawdev_ifpga > _LDLIBS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += -lrte_pmd_ipn3ke > endif # CONFIG_RTE_LIBRTE_IFPGA_BUS > -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += - > lrte_pmd_ioat_rawdev > -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += -lrte_pmd_ntb > -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += - > lrte_pmd_octeontx2_dma > +_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += - > lrte_rawdev_ioat > +_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += -lrte_rawdev_ntb > +_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += > +-lrte_rawdev_octeontx2_dma > endif # CONFIG_RTE_LIBRTE_RAWDEV > > endif # !CONFIG_RTE_BUILD_SHARED_LIBS > -- > 2.21.0 Acked-by: Rosen Xu <rosen...@intel.com>
