drivers/raw: standardize naming

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.richardson@intel.com>
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>

diff --git a/doc/guides/rel_notes/release_19_08.rst b/doc/guides/rel_notes/release_19_08.rst
index fcd1386a5d83373825d0a50644e930a860fa8084..13a98f520f277590fa5c728278a8afa2299c6e53 100644 (file)
--- 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 9bd5ff2290fd3246a3ce65e9e811fd08d0787ec5..2b4150c2d4beb93ae371af1c7aa301cab8e0a10b 100644 (file)
--- 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_pmd_dpaa2_cmdif_version.map
deleted file mode 100644 (file)
index 9b9ab1a..0000000
--- a/drivers/raw/dpaa2_cmdif/rte_pmd_dpaa2_cmdif_version.map
+++ /dev/null
@@ -1,4 +0,0 @@
-DPDK_18.05 {
-
-       local: *;
-};

diff --git a/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map b/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map
new file mode 100644 (file)
index 0000000..9b9ab1a
--- /dev/null
+++ b/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map
@@ -0,0 +1,4 @@
+DPDK_18.05 {
+
+       local: *;
+};

diff --git a/drivers/raw/dpaa2_qdma/Makefile b/drivers/raw/dpaa2_qdma/Makefile
index f9a810cc61d36d7c4e45030e33aa4bc8f8c15be2..0009fd4c67b7160508f55956ad8f8baf24eb9861 100644 (file)
--- 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_pmd_dpaa2_qdma_version.map
deleted file mode 100644 (file)
index d16a136..0000000
--- a/drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma_version.map
+++ /dev/null
@@ -1,20 +0,0 @@
-DPDK_19.05 {
-       global:
-
-       rte_qdma_attr_get;
-       rte_qdma_configure;
-       rte_qdma_destroy;
-       rte_qdma_init;
-       rte_qdma_reset;
-       rte_qdma_start;
-       rte_qdma_stop;
-       rte_qdma_vq_create;
-       rte_qdma_vq_destroy;
-       rte_qdma_vq_dequeue;
-       rte_qdma_vq_dequeue_multi;
-       rte_qdma_vq_enqueue;
-       rte_qdma_vq_enqueue_multi;
-       rte_qdma_vq_stats;
-
-       local: *;
-};

diff --git a/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map b/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map
new file mode 100644 (file)
index 0000000..d16a136
--- /dev/null
+++ b/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map
@@ -0,0 +1,20 @@
+DPDK_19.05 {
+       global:
+
+       rte_qdma_attr_get;
+       rte_qdma_configure;
+       rte_qdma_destroy;
+       rte_qdma_init;
+       rte_qdma_reset;
+       rte_qdma_start;
+       rte_qdma_stop;
+       rte_qdma_vq_create;
+       rte_qdma_vq_destroy;
+       rte_qdma_vq_dequeue;
+       rte_qdma_vq_dequeue_multi;
+       rte_qdma_vq_enqueue;
+       rte_qdma_vq_enqueue_multi;
+       rte_qdma_vq_stats;
+
+       local: *;
+};

diff --git a/drivers/raw/ifpga/Makefile b/drivers/raw/ifpga/Makefile
index 5fa9303d594586544c252fc282ccd2ce945044a1..655b292883a92af08b01d994d49f3571f3e65f73 100644 (file)
--- 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_pmd_ifpga_version.map
deleted file mode 100644 (file)
index 9b9ab1a..0000000
--- a/drivers/raw/ifpga/rte_pmd_ifpga_version.map
+++ /dev/null
@@ -1,4 +0,0 @@
-DPDK_18.05 {
-
-       local: *;
-};

diff --git a/drivers/raw/ifpga/rte_rawdev_ifpga_version.map b/drivers/raw/ifpga/rte_rawdev_ifpga_version.map
new file mode 100644 (file)
index 0000000..9b9ab1a
--- /dev/null
+++ b/drivers/raw/ifpga/rte_rawdev_ifpga_version.map
@@ -0,0 +1,4 @@
+DPDK_18.05 {
+
+       local: *;
+};

diff --git a/drivers/raw/ioat/Makefile b/drivers/raw/ioat/Makefile
index 32f0798454ce5ab4b8216f053e98a79d53ad75c7..e852afb57c9f34ec086f2dad375e534ed8b74908 100644 (file)
--- 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_pmd_ioat_version.map
deleted file mode 100644 (file)
index 9a61188..0000000
--- a/drivers/raw/ioat/rte_pmd_ioat_version.map
+++ /dev/null
@@ -1,4 +0,0 @@
-DPDK_19.08 {
-
-       local: *;
-};

diff --git a/drivers/raw/ioat/rte_rawdev_ioat_version.map b/drivers/raw/ioat/rte_rawdev_ioat_version.map
new file mode 100644 (file)
index 0000000..9a61188
--- /dev/null
+++ b/drivers/raw/ioat/rte_rawdev_ioat_version.map
@@ -0,0 +1,4 @@
+DPDK_19.08 {
+
+       local: *;
+};

diff --git a/drivers/raw/meson.build b/drivers/raw/meson.build
index bcd5553e15366eadd5ed99b89575c73e6cacb53e..d7037cd87cb2471af5bc03c392481ad05edcc50a 100644 (file)
--- 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 edd49fe7546662936f3ed37de207f9f43b1f35ad..6fe2aaf403022a67a5439d5611dbfa506efe4e05 100644 (file)
--- 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_pmd_ntb_version.map
deleted file mode 100644 (file)
index 8861484..0000000
--- a/drivers/raw/ntb/rte_pmd_ntb_version.map
+++ /dev/null
@@ -1,4 +0,0 @@
-DPDK_19.08 {
-
-        local: *;
-};

diff --git a/drivers/raw/ntb/rte_rawdev_ntb_version.map b/drivers/raw/ntb/rte_rawdev_ntb_version.map
new file mode 100644 (file)
index 0000000..8861484
--- /dev/null
+++ b/drivers/raw/ntb/rte_rawdev_ntb_version.map
@@ -0,0 +1,4 @@
+DPDK_19.08 {
+
+        local: *;
+};

diff --git a/drivers/raw/octeontx2_dma/Makefile b/drivers/raw/octeontx2_dma/Makefile
index 96f782eb68b6f747dbbec0b492c60fa82435f2e9..f101e4916e6e516c1d8fe74fe6378ca27321a6c5 100644 (file)
--- 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_pmd_octeontx2_dma_version.map
deleted file mode 100644 (file)
index 9a61188..0000000
--- a/drivers/raw/octeontx2_dma/rte_pmd_octeontx2_dma_version.map
+++ /dev/null
@@ -1,4 +0,0 @@
-DPDK_19.08 {
-
-       local: *;
-};

diff --git a/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map b/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map
new file mode 100644 (file)
index 0000000..9a61188
--- /dev/null
+++ b/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map
@@ -0,0 +1,4 @@
+DPDK_19.08 {
+
+       local: *;
+};

diff --git a/drivers/raw/skeleton/Makefile b/drivers/raw/skeleton/Makefile
index 9641e650595f093c7ab427ea1ad33d1c23bfe147..783b1e9522c21d0df88d8213adae37a48bfee47f 100644 (file)
--- 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_pmd_skeleton_version.map
deleted file mode 100644 (file)
index 179140f..0000000
--- a/drivers/raw/skeleton/rte_pmd_skeleton_version.map
+++ /dev/null
@@ -1,4 +0,0 @@
-DPDK_18.02 {
-
-       local: *;
-};

diff --git a/drivers/raw/skeleton/rte_rawdev_skeleton_version.map b/drivers/raw/skeleton/rte_rawdev_skeleton_version.map
new file mode 100644 (file)
index 0000000..179140f
--- /dev/null
+++ b/drivers/raw/skeleton/rte_rawdev_skeleton_version.map
@@ -0,0 +1,4 @@
+DPDK_18.02 {
+
+       local: *;
+};

diff --git a/mk/rte.app.mk b/mk/rte.app.mk
index a277c808ed8eea5f755d48c17e7cce9455dc1a0e..ba5c39e01957c6f10ce1231e12786b160f637aa2 100644 (file)
--- 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