* [dpdk-dev] [RFC PATCH 0/2] standardize rawdev names
@ 2019-07-05 9:33 Bruce Richardson
2019-07-05 9:34 ` [dpdk-dev] [RFC PATCH 1/2] drivers/raw: remove rawdev from driver directory names Bruce Richardson
` (3 more replies)
0 siblings, 4 replies; 17+ messages in thread
From: Bruce Richardson @ 2019-07-05 9:33 UTC (permalink / raw)
To: dev; +Cc: thomas, shreyansh.jain, hemant.agrawal, Bruce Richardson
The names of the rawdev drivers and the resultant libraries they built
were pretty inconsistent. In terms of directory names, some had "rawdev"
in the name, e.g. skeleton_rawdev, ifpga_rawdev, while others didn't.
Also, for the built .so/.a libraries, the names were not always
consistent between make and meson, as, while meson enforced a consistent
naming scheme, make did not, leading to differences - especially for
those drivers with "rawdev" in the directory name.
This patchset attempts to make things more standardized by removing
"rawdev" from all directory names - the drivers are in the "drivers/raw"
directory after all - and then standardizing the library names to
"librte_rawdev_<name>" for both make and meson.
Bruce Richardson (2):
drivers/raw: remove rawdev from driver directory names
drivers/raw: standardize name format of rawdev drivers
drivers/raw/Makefile | 4 ++--
drivers/raw/dpaa2_cmdif/Makefile | 4 ++--
..._version.map => rte_rawdev_dpaa2_cmdif_version.map} | 0
drivers/raw/dpaa2_qdma/Makefile | 4 ++--
...a_version.map => rte_rawdev_dpaa2_qdma_version.map} | 0
drivers/raw/{ifpga_rawdev => ifpga}/Makefile | 6 +++---
drivers/raw/{ifpga_rawdev => ifpga}/base/Makefile | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/README | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_api.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_api.h | 0
.../raw/{ifpga_rawdev => ifpga}/base/ifpga_compat.h | 0
.../raw/{ifpga_rawdev => ifpga}/base/ifpga_defines.h | 0
.../raw/{ifpga_rawdev => ifpga}/base/ifpga_enumerate.c | 0
.../raw/{ifpga_rawdev => ifpga}/base/ifpga_enumerate.h | 0
.../{ifpga_rawdev => ifpga}/base/ifpga_feature_dev.c | 0
.../{ifpga_rawdev => ifpga}/base/ifpga_feature_dev.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme.c | 0
.../raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_dperf.c | 0
.../raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_error.c | 0
.../raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_iperf.c | 0
.../raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_pr.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_hw.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_port.c | 0
.../{ifpga_rawdev => ifpga}/base/ifpga_port_error.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/meson.build | 0
.../{ifpga_rawdev => ifpga}/base/opae_at24_eeprom.c | 0
.../{ifpga_rawdev => ifpga}/base/opae_at24_eeprom.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_debug.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_debug.h | 0
.../raw/{ifpga_rawdev => ifpga}/base/opae_eth_group.c | 0
.../raw/{ifpga_rawdev => ifpga}/base/opae_eth_group.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_i2c.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_i2c.h | 0
.../{ifpga_rawdev => ifpga}/base/opae_ifpga_hw_api.c | 0
.../{ifpga_rawdev => ifpga}/base/opae_ifpga_hw_api.h | 0
.../{ifpga_rawdev => ifpga}/base/opae_intel_max10.c | 0
.../{ifpga_rawdev => ifpga}/base/opae_intel_max10.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_osdep.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi.h | 0
.../base/opae_spi_transaction.c | 0
.../base/osdep_raw/osdep_generic.h | 0
.../base/osdep_rte/osdep_generic.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/meson.build | 0
.../rte_rawdev_ifpga_version.map} | 0
drivers/raw/ioat/Makefile | 4 ++--
...md_ioat_version.map => rte_rawdev_ioat_version.map} | 0
drivers/raw/meson.build | 6 +++---
drivers/raw/{skeleton_rawdev => skeleton}/Makefile | 4 ++--
drivers/raw/{skeleton_rawdev => skeleton}/meson.build | 0
.../rte_rawdev_skeleton_version.map} | 0
.../{skeleton_rawdev => skeleton}/skeleton_rawdev.c | 0
.../{skeleton_rawdev => skeleton}/skeleton_rawdev.h | 0
.../skeleton_rawdev_test.c | 0
mk/rte.app.mk | 10 +++++-----
59 files changed, 21 insertions(+), 21 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_rawdev => ifpga}/Makefile (82%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/Makefile (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/README (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_api.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_api.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_compat.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_defines.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_enumerate.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_enumerate.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_feature_dev.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_feature_dev.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_dperf.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_error.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_iperf.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_pr.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_hw.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_port.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_port_error.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/meson.build (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_at24_eeprom.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_at24_eeprom.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_debug.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_debug.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_eth_group.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_eth_group.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_i2c.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_i2c.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_ifpga_hw_api.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_ifpga_hw_api.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_intel_max10.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_intel_max10.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_osdep.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi_transaction.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/osdep_raw/osdep_generic.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/osdep_rte/osdep_generic.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/meson.build (100%)
rename drivers/raw/{ifpga_rawdev/rte_pmd_ifpga_rawdev_version.map => ifpga/rte_rawdev_ifpga_version.map} (100%)
rename drivers/raw/ioat/{rte_pmd_ioat_version.map => rte_rawdev_ioat_version.map} (100%)
rename drivers/raw/{skeleton_rawdev => skeleton}/Makefile (84%)
rename drivers/raw/{skeleton_rawdev => skeleton}/meson.build (100%)
rename drivers/raw/{skeleton_rawdev/rte_pmd_skeleton_rawdev_version.map => skeleton/rte_rawdev_skeleton_version.map} (100%)
rename drivers/raw/{skeleton_rawdev => skeleton}/skeleton_rawdev.c (100%)
rename drivers/raw/{skeleton_rawdev => skeleton}/skeleton_rawdev.h (100%)
rename drivers/raw/{skeleton_rawdev => skeleton}/skeleton_rawdev_test.c (100%)
--
2.21.0
^ permalink raw reply [flat|nested] 17+ messages in thread
* [dpdk-dev] [RFC PATCH 1/2] drivers/raw: remove rawdev from driver directory names
2019-07-05 9:33 [dpdk-dev] [RFC PATCH 0/2] standardize rawdev names Bruce Richardson
@ 2019-07-05 9:34 ` Bruce Richardson
2019-07-05 9:34 ` [dpdk-dev] [RFC PATCH 2/2] drivers/raw: standardize name format of rawdev drivers Bruce Richardson
` (2 subsequent siblings)
3 siblings, 0 replies; 17+ messages in thread
From: Bruce Richardson @ 2019-07-05 9:34 UTC (permalink / raw)
To: dev; +Cc: thomas, shreyansh.jain, hemant.agrawal, Bruce Richardson
The ifpga and skeleton rawdev drivers included "rawdev" in their directory
names, which was superfluous given that they were in the drivers/raw
directory. Shorten the names via this patch.
For meson builds, this will rename the final library .so/.a files
produced, but those will be renamed again later via a patch to
standardize rawdev names.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/raw/Makefile | 4 ++--
drivers/raw/{ifpga_rawdev => ifpga}/Makefile | 4 ++--
drivers/raw/{ifpga_rawdev => ifpga}/base/Makefile | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/README | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_api.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_api.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_compat.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_defines.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_enumerate.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_enumerate.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_feature_dev.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_feature_dev.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_dperf.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_error.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_iperf.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_pr.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_hw.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_port.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_port_error.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/meson.build | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_at24_eeprom.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_at24_eeprom.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_debug.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_debug.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_eth_group.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_eth_group.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_i2c.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_i2c.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_ifpga_hw_api.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_ifpga_hw_api.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_intel_max10.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_intel_max10.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_osdep.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi.h | 0
.../raw/{ifpga_rawdev => ifpga}/base/opae_spi_transaction.c | 0
.../{ifpga_rawdev => ifpga}/base/osdep_raw/osdep_generic.h | 0
.../{ifpga_rawdev => ifpga}/base/osdep_rte/osdep_generic.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/meson.build | 0
.../rte_pmd_ifpga_version.map} | 0
drivers/raw/meson.build | 4 ++--
drivers/raw/{skeleton_rawdev => skeleton}/Makefile | 2 +-
drivers/raw/{skeleton_rawdev => skeleton}/meson.build | 0
.../rte_pmd_skeleton_version.map} | 0
drivers/raw/{skeleton_rawdev => skeleton}/skeleton_rawdev.c | 0
drivers/raw/{skeleton_rawdev => skeleton}/skeleton_rawdev.h | 0
.../raw/{skeleton_rawdev => skeleton}/skeleton_rawdev_test.c | 0
52 files changed, 7 insertions(+), 7 deletions(-)
rename drivers/raw/{ifpga_rawdev => ifpga}/Makefile (86%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/Makefile (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/README (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_api.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_api.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_compat.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_defines.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_enumerate.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_enumerate.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_feature_dev.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_feature_dev.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_dperf.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_error.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_iperf.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_pr.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_hw.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_port.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_port_error.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/meson.build (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_at24_eeprom.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_at24_eeprom.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_debug.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_debug.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_eth_group.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_eth_group.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_i2c.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_i2c.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_ifpga_hw_api.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_ifpga_hw_api.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_intel_max10.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_intel_max10.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_osdep.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi_transaction.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/osdep_raw/osdep_generic.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/osdep_rte/osdep_generic.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/meson.build (100%)
rename drivers/raw/{ifpga_rawdev/rte_pmd_ifpga_rawdev_version.map => ifpga/rte_pmd_ifpga_version.map} (100%)
rename drivers/raw/{skeleton_rawdev => skeleton}/Makefile (91%)
rename drivers/raw/{skeleton_rawdev => skeleton}/meson.build (100%)
rename drivers/raw/{skeleton_rawdev/rte_pmd_skeleton_rawdev_version.map => skeleton/rte_pmd_skeleton_version.map} (100%)
rename drivers/raw/{skeleton_rawdev => skeleton}/skeleton_rawdev.c (100%)
rename drivers/raw/{skeleton_rawdev => skeleton}/skeleton_rawdev.h (100%)
rename drivers/raw/{skeleton_rawdev => skeleton}/skeleton_rawdev_test.c (100%)
diff --git a/drivers/raw/Makefile b/drivers/raw/Makefile
index c1b85c8c7..fd1352a9d 100644
--- a/drivers/raw/Makefile
+++ b/drivers/raw/Makefile
@@ -4,12 +4,12 @@
include $(RTE_SDK)/mk/rte.vars.mk
# DIRS-$(<configuration>) += <directory>
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton_rawdev
+DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton
ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy)
DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += dpaa2_cmdif
DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) += dpaa2_qdma
endif
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += ifpga_rawdev
+DIRS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += ifpga
DIRS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat
include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/drivers/raw/ifpga_rawdev/Makefile b/drivers/raw/ifpga/Makefile
similarity index 86%
rename from drivers/raw/ifpga_rawdev/Makefile
rename to drivers/raw/ifpga/Makefile
index f60b547d8..5fa9303d5 100644
--- a/drivers/raw/ifpga_rawdev/Makefile
+++ b/drivers/raw/ifpga/Makefile
@@ -21,13 +21,13 @@ LDLIBS += -lrte_kvargs
LDLIBS += -lrte_bus_pci
LDLIBS += -lrte_bus_ifpga
-EXPORT_MAP := rte_pmd_ifpga_rawdev_version.map
+EXPORT_MAP := rte_pmd_ifpga_version.map
LIBABIVER := 1
VPATH += $(SRCDIR)/base
-include $(RTE_SDK)/drivers/raw/ifpga_rawdev/base/Makefile
+include $(RTE_SDK)/drivers/raw/ifpga/base/Makefile
#
# all source are stored in SRCS-y
diff --git a/drivers/raw/ifpga_rawdev/base/Makefile b/drivers/raw/ifpga/base/Makefile
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/Makefile
rename to drivers/raw/ifpga/base/Makefile
diff --git a/drivers/raw/ifpga_rawdev/base/README b/drivers/raw/ifpga/base/README
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/README
rename to drivers/raw/ifpga/base/README
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_api.c b/drivers/raw/ifpga/base/ifpga_api.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_api.c
rename to drivers/raw/ifpga/base/ifpga_api.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_api.h b/drivers/raw/ifpga/base/ifpga_api.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_api.h
rename to drivers/raw/ifpga/base/ifpga_api.h
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_compat.h b/drivers/raw/ifpga/base/ifpga_compat.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_compat.h
rename to drivers/raw/ifpga/base/ifpga_compat.h
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_defines.h b/drivers/raw/ifpga/base/ifpga_defines.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_defines.h
rename to drivers/raw/ifpga/base/ifpga_defines.h
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c b/drivers/raw/ifpga/base/ifpga_enumerate.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c
rename to drivers/raw/ifpga/base/ifpga_enumerate.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_enumerate.h b/drivers/raw/ifpga/base/ifpga_enumerate.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_enumerate.h
rename to drivers/raw/ifpga/base/ifpga_enumerate.h
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.c b/drivers/raw/ifpga/base/ifpga_feature_dev.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.c
rename to drivers/raw/ifpga/base/ifpga_feature_dev.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h b/drivers/raw/ifpga/base/ifpga_feature_dev.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h
rename to drivers/raw/ifpga/base/ifpga_feature_dev.h
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme.c b/drivers/raw/ifpga/base/ifpga_fme.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_fme.c
rename to drivers/raw/ifpga/base/ifpga_fme.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme_dperf.c b/drivers/raw/ifpga/base/ifpga_fme_dperf.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_fme_dperf.c
rename to drivers/raw/ifpga/base/ifpga_fme_dperf.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme_error.c b/drivers/raw/ifpga/base/ifpga_fme_error.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_fme_error.c
rename to drivers/raw/ifpga/base/ifpga_fme_error.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme_iperf.c b/drivers/raw/ifpga/base/ifpga_fme_iperf.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_fme_iperf.c
rename to drivers/raw/ifpga/base/ifpga_fme_iperf.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c b/drivers/raw/ifpga/base/ifpga_fme_pr.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c
rename to drivers/raw/ifpga/base/ifpga_fme_pr.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_hw.h b/drivers/raw/ifpga/base/ifpga_hw.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_hw.h
rename to drivers/raw/ifpga/base/ifpga_hw.h
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_port.c b/drivers/raw/ifpga/base/ifpga_port.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_port.c
rename to drivers/raw/ifpga/base/ifpga_port.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_port_error.c b/drivers/raw/ifpga/base/ifpga_port_error.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_port_error.c
rename to drivers/raw/ifpga/base/ifpga_port_error.c
diff --git a/drivers/raw/ifpga_rawdev/base/meson.build b/drivers/raw/ifpga/base/meson.build
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/meson.build
rename to drivers/raw/ifpga/base/meson.build
diff --git a/drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.c b/drivers/raw/ifpga/base/opae_at24_eeprom.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.c
rename to drivers/raw/ifpga/base/opae_at24_eeprom.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.h b/drivers/raw/ifpga/base/opae_at24_eeprom.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.h
rename to drivers/raw/ifpga/base/opae_at24_eeprom.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_debug.c b/drivers/raw/ifpga/base/opae_debug.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_debug.c
rename to drivers/raw/ifpga/base/opae_debug.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_debug.h b/drivers/raw/ifpga/base/opae_debug.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_debug.h
rename to drivers/raw/ifpga/base/opae_debug.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_eth_group.c b/drivers/raw/ifpga/base/opae_eth_group.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_eth_group.c
rename to drivers/raw/ifpga/base/opae_eth_group.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_eth_group.h b/drivers/raw/ifpga/base/opae_eth_group.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_eth_group.h
rename to drivers/raw/ifpga/base/opae_eth_group.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_hw_api.c b/drivers/raw/ifpga/base/opae_hw_api.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_hw_api.c
rename to drivers/raw/ifpga/base/opae_hw_api.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_hw_api.h b/drivers/raw/ifpga/base/opae_hw_api.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_hw_api.h
rename to drivers/raw/ifpga/base/opae_hw_api.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_i2c.c b/drivers/raw/ifpga/base/opae_i2c.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_i2c.c
rename to drivers/raw/ifpga/base/opae_i2c.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_i2c.h b/drivers/raw/ifpga/base/opae_i2c.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_i2c.h
rename to drivers/raw/ifpga/base/opae_i2c.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.c b/drivers/raw/ifpga/base/opae_ifpga_hw_api.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.c
rename to drivers/raw/ifpga/base/opae_ifpga_hw_api.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.h b/drivers/raw/ifpga/base/opae_ifpga_hw_api.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.h
rename to drivers/raw/ifpga/base/opae_ifpga_hw_api.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c b/drivers/raw/ifpga/base/opae_intel_max10.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_intel_max10.c
rename to drivers/raw/ifpga/base/opae_intel_max10.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_intel_max10.h b/drivers/raw/ifpga/base/opae_intel_max10.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_intel_max10.h
rename to drivers/raw/ifpga/base/opae_intel_max10.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_osdep.h b/drivers/raw/ifpga/base/opae_osdep.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_osdep.h
rename to drivers/raw/ifpga/base/opae_osdep.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_spi.c b/drivers/raw/ifpga/base/opae_spi.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_spi.c
rename to drivers/raw/ifpga/base/opae_spi.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_spi.h b/drivers/raw/ifpga/base/opae_spi.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_spi.h
rename to drivers/raw/ifpga/base/opae_spi.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_spi_transaction.c b/drivers/raw/ifpga/base/opae_spi_transaction.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_spi_transaction.c
rename to drivers/raw/ifpga/base/opae_spi_transaction.c
diff --git a/drivers/raw/ifpga_rawdev/base/osdep_raw/osdep_generic.h b/drivers/raw/ifpga/base/osdep_raw/osdep_generic.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/osdep_raw/osdep_generic.h
rename to drivers/raw/ifpga/base/osdep_raw/osdep_generic.h
diff --git a/drivers/raw/ifpga_rawdev/base/osdep_rte/osdep_generic.h b/drivers/raw/ifpga/base/osdep_rte/osdep_generic.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/osdep_rte/osdep_generic.h
rename to drivers/raw/ifpga/base/osdep_rte/osdep_generic.h
diff --git a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/ifpga_rawdev.c
rename to drivers/raw/ifpga/ifpga_rawdev.c
diff --git a/drivers/raw/ifpga_rawdev/ifpga_rawdev.h b/drivers/raw/ifpga/ifpga_rawdev.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/ifpga_rawdev.h
rename to drivers/raw/ifpga/ifpga_rawdev.h
diff --git a/drivers/raw/ifpga_rawdev/meson.build b/drivers/raw/ifpga/meson.build
similarity index 100%
rename from drivers/raw/ifpga_rawdev/meson.build
rename to drivers/raw/ifpga/meson.build
diff --git a/drivers/raw/ifpga_rawdev/rte_pmd_ifpga_rawdev_version.map b/drivers/raw/ifpga/rte_pmd_ifpga_version.map
similarity index 100%
rename from drivers/raw/ifpga_rawdev/rte_pmd_ifpga_rawdev_version.map
rename to drivers/raw/ifpga/rte_pmd_ifpga_version.map
diff --git a/drivers/raw/meson.build b/drivers/raw/meson.build
index 2af8a70d4..23dd3ccff 100644
--- a/drivers/raw/meson.build
+++ b/drivers/raw/meson.build
@@ -2,8 +2,8 @@
# Copyright 2018 NXP
drivers = ['dpaa2_cmdif', 'dpaa2_qdma',
- 'ifpga_rawdev', 'ioat',
- 'skeleton_rawdev']
+ 'ifpga', 'ioat',
+ 'skeleton']
std_deps = ['rawdev']
config_flag_fmt = 'RTE_LIBRTE_PMD_@0@_RAWDEV'
driver_name_fmt = 'rte_pmd_@0@'
diff --git a/drivers/raw/skeleton_rawdev/Makefile b/drivers/raw/skeleton/Makefile
similarity index 91%
rename from drivers/raw/skeleton_rawdev/Makefile
rename to drivers/raw/skeleton/Makefile
index 3f97c2ee0..9641e6505 100644
--- a/drivers/raw/skeleton_rawdev/Makefile
+++ b/drivers/raw/skeleton/Makefile
@@ -15,7 +15,7 @@ LDLIBS += -lrte_rawdev
LDLIBS += -lrte_bus_vdev
LDLIBS += -lrte_kvargs
-EXPORT_MAP := rte_pmd_skeleton_rawdev_version.map
+EXPORT_MAP := rte_pmd_skeleton_version.map
LIBABIVER := 1
diff --git a/drivers/raw/skeleton_rawdev/meson.build b/drivers/raw/skeleton/meson.build
similarity index 100%
rename from drivers/raw/skeleton_rawdev/meson.build
rename to drivers/raw/skeleton/meson.build
diff --git a/drivers/raw/skeleton_rawdev/rte_pmd_skeleton_rawdev_version.map b/drivers/raw/skeleton/rte_pmd_skeleton_version.map
similarity index 100%
rename from drivers/raw/skeleton_rawdev/rte_pmd_skeleton_rawdev_version.map
rename to drivers/raw/skeleton/rte_pmd_skeleton_version.map
diff --git a/drivers/raw/skeleton_rawdev/skeleton_rawdev.c b/drivers/raw/skeleton/skeleton_rawdev.c
similarity index 100%
rename from drivers/raw/skeleton_rawdev/skeleton_rawdev.c
rename to drivers/raw/skeleton/skeleton_rawdev.c
diff --git a/drivers/raw/skeleton_rawdev/skeleton_rawdev.h b/drivers/raw/skeleton/skeleton_rawdev.h
similarity index 100%
rename from drivers/raw/skeleton_rawdev/skeleton_rawdev.h
rename to drivers/raw/skeleton/skeleton_rawdev.h
diff --git a/drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c b/drivers/raw/skeleton/skeleton_rawdev_test.c
similarity index 100%
rename from drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c
rename to drivers/raw/skeleton/skeleton_rawdev_test.c
--
2.21.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [dpdk-dev] [RFC PATCH 2/2] drivers/raw: standardize name format of rawdev drivers
2019-07-05 9:33 [dpdk-dev] [RFC PATCH 0/2] standardize rawdev names Bruce Richardson
2019-07-05 9:34 ` [dpdk-dev] [RFC PATCH 1/2] drivers/raw: remove rawdev from driver directory names Bruce Richardson
@ 2019-07-05 9:34 ` Bruce Richardson
2019-07-05 9:35 ` [dpdk-dev] [RFC PATCH 0/2] standardize rawdev names Bruce Richardson
2019-07-30 13:39 ` [dpdk-dev] [PATCH v2 " Thomas Monjalon
3 siblings, 0 replies; 17+ messages in thread
From: Bruce Richardson @ 2019-07-05 9:34 UTC (permalink / raw)
To: dev; +Cc: thomas, shreyansh.jain, hemant.agrawal, Bruce Richardson
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>
---
drivers/raw/dpaa2_cmdif/Makefile | 4 ++--
..._version.map => rte_rawdev_dpaa2_cmdif_version.map} | 0
drivers/raw/dpaa2_qdma/Makefile | 4 ++--
...a_version.map => rte_rawdev_dpaa2_qdma_version.map} | 0
drivers/raw/ifpga/Makefile | 4 ++--
..._ifpga_version.map => rte_rawdev_ifpga_version.map} | 0
drivers/raw/ioat/Makefile | 4 ++--
...md_ioat_version.map => rte_rawdev_ioat_version.map} | 0
drivers/raw/meson.build | 2 +-
drivers/raw/skeleton/Makefile | 4 ++--
...ton_version.map => rte_rawdev_skeleton_version.map} | 0
mk/rte.app.mk | 10 +++++-----
12 files changed, 16 insertions(+), 16 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/skeleton/{rte_pmd_skeleton_version.map => rte_rawdev_skeleton_version.map} (100%)
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 23dd3ccff..289017989 100644
--- a/drivers/raw/meson.build
+++ b/drivers/raw/meson.build
@@ -6,4 +6,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/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 30f9a12da..c7c590bea 100644
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk
@@ -299,17 +299,17 @@ _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_IOAT_RAWDEV) += -lrte_rawdev_ioat
endif # CONFIG_RTE_LIBRTE_RAWDEV
endif # !CONFIG_RTE_BUILD_SHARED_LIBS
--
2.21.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [dpdk-dev] [RFC PATCH 0/2] standardize rawdev names
2019-07-05 9:33 [dpdk-dev] [RFC PATCH 0/2] standardize rawdev names Bruce Richardson
2019-07-05 9:34 ` [dpdk-dev] [RFC PATCH 1/2] drivers/raw: remove rawdev from driver directory names Bruce Richardson
2019-07-05 9:34 ` [dpdk-dev] [RFC PATCH 2/2] drivers/raw: standardize name format of rawdev drivers Bruce Richardson
@ 2019-07-05 9:35 ` Bruce Richardson
2019-07-05 9:38 ` Thomas Monjalon
2019-07-30 13:39 ` [dpdk-dev] [PATCH v2 " Thomas Monjalon
3 siblings, 1 reply; 17+ messages in thread
From: Bruce Richardson @ 2019-07-05 9:35 UTC (permalink / raw)
To: dev; +Cc: thomas, shreyansh.jain, hemant.agrawal
On Fri, Jul 05, 2019 at 10:33:59AM +0100, Bruce Richardson wrote:
> The names of the rawdev drivers and the resultant libraries they built
> were pretty inconsistent. In terms of directory names, some had "rawdev"
> in the name, e.g. skeleton_rawdev, ifpga_rawdev, while others didn't.
> Also, for the built .so/.a libraries, the names were not always
> consistent between make and meson, as, while meson enforced a consistent
> naming scheme, make did not, leading to differences - especially for
> those drivers with "rawdev" in the directory name.
>
> This patchset attempts to make things more standardized by removing
> "rawdev" from all directory names - the drivers are in the "drivers/raw"
> directory after all - and then standardizing the library names to
> "librte_rawdev_<name>" for both make and meson.
>
> Bruce Richardson (2): drivers/raw: remove rawdev from driver directory
> names drivers/raw: standardize name format of rawdev drivers
>
Since the .so/.a files we produce are changing, would this patchset - if
accepted - need a deprecation notice in 19.08 for a future 19.11 merge?
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [dpdk-dev] [RFC PATCH 0/2] standardize rawdev names
2019-07-05 9:35 ` [dpdk-dev] [RFC PATCH 0/2] standardize rawdev names Bruce Richardson
@ 2019-07-05 9:38 ` Thomas Monjalon
2019-07-05 9:39 ` Thomas Monjalon
0 siblings, 1 reply; 17+ messages in thread
From: Thomas Monjalon @ 2019-07-05 9:38 UTC (permalink / raw)
To: Bruce Richardson
Cc: dev, shreyansh.jain, hemant.agrawal, neil.horman, david.marchand
05/07/2019 11:35, Bruce Richardson:
> On Fri, Jul 05, 2019 at 10:33:59AM +0100, Bruce Richardson wrote:
> > The names of the rawdev drivers and the resultant libraries they built
> > were pretty inconsistent. In terms of directory names, some had "rawdev"
> > in the name, e.g. skeleton_rawdev, ifpga_rawdev, while others didn't.
> > Also, for the built .so/.a libraries, the names were not always
> > consistent between make and meson, as, while meson enforced a consistent
> > naming scheme, make did not, leading to differences - especially for
> > those drivers with "rawdev" in the directory name.
> >
> > This patchset attempts to make things more standardized by removing
> > "rawdev" from all directory names - the drivers are in the "drivers/raw"
> > directory after all - and then standardizing the library names to
> > "librte_rawdev_<name>" for both make and meson.
> >
> > Bruce Richardson (2): drivers/raw: remove rawdev from driver directory
> > names drivers/raw: standardize name format of rawdev drivers
> >
> Since the .so/.a files we produce are changing, would this patchset - if
> accepted - need a deprecation notice in 19.08 for a future 19.11 merge?
I would say we can merge it in 19.08 without prior notice.
Any other opinion?
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [dpdk-dev] [RFC PATCH 0/2] standardize rawdev names
2019-07-05 9:38 ` Thomas Monjalon
@ 2019-07-05 9:39 ` Thomas Monjalon
2019-07-30 8:17 ` Thomas Monjalon
0 siblings, 1 reply; 17+ messages in thread
From: Thomas Monjalon @ 2019-07-05 9:39 UTC (permalink / raw)
To: Bruce Richardson
Cc: dev, shreyansh.jain, hemant.agrawal, david.marchand, Neil Horman
05/07/2019 11:38, Thomas Monjalon:
> 05/07/2019 11:35, Bruce Richardson:
> > On Fri, Jul 05, 2019 at 10:33:59AM +0100, Bruce Richardson wrote:
> > > The names of the rawdev drivers and the resultant libraries they built
> > > were pretty inconsistent. In terms of directory names, some had "rawdev"
> > > in the name, e.g. skeleton_rawdev, ifpga_rawdev, while others didn't.
> > > Also, for the built .so/.a libraries, the names were not always
> > > consistent between make and meson, as, while meson enforced a consistent
> > > naming scheme, make did not, leading to differences - especially for
> > > those drivers with "rawdev" in the directory name.
> > >
> > > This patchset attempts to make things more standardized by removing
> > > "rawdev" from all directory names - the drivers are in the "drivers/raw"
> > > directory after all - and then standardizing the library names to
> > > "librte_rawdev_<name>" for both make and meson.
> > >
> > > Bruce Richardson (2): drivers/raw: remove rawdev from driver directory
> > > names drivers/raw: standardize name format of rawdev drivers
> > >
> > Since the .so/.a files we produce are changing, would this patchset - if
> > accepted - need a deprecation notice in 19.08 for a future 19.11 merge?
>
> I would say we can merge it in 19.08 without prior notice.
> Any other opinion?
Cc Neil
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [dpdk-dev] [RFC PATCH 0/2] standardize rawdev names
2019-07-05 9:39 ` Thomas Monjalon
@ 2019-07-30 8:17 ` Thomas Monjalon
2019-07-30 9:42 ` Bruce Richardson
2019-07-30 12:20 ` Neil Horman
0 siblings, 2 replies; 17+ messages in thread
From: Thomas Monjalon @ 2019-07-30 8:17 UTC (permalink / raw)
To: dev
Cc: Bruce Richardson, shreyansh.jain, hemant.agrawal, david.marchand,
Neil Horman
05/07/2019 11:39, Thomas Monjalon:
> 05/07/2019 11:38, Thomas Monjalon:
> > 05/07/2019 11:35, Bruce Richardson:
> > > On Fri, Jul 05, 2019 at 10:33:59AM +0100, Bruce Richardson wrote:
> > > > The names of the rawdev drivers and the resultant libraries they built
> > > > were pretty inconsistent. In terms of directory names, some had "rawdev"
> > > > in the name, e.g. skeleton_rawdev, ifpga_rawdev, while others didn't.
> > > > Also, for the built .so/.a libraries, the names were not always
> > > > consistent between make and meson, as, while meson enforced a consistent
> > > > naming scheme, make did not, leading to differences - especially for
> > > > those drivers with "rawdev" in the directory name.
> > > >
> > > > This patchset attempts to make things more standardized by removing
> > > > "rawdev" from all directory names - the drivers are in the "drivers/raw"
> > > > directory after all - and then standardizing the library names to
> > > > "librte_rawdev_<name>" for both make and meson.
> > > >
> > > > Bruce Richardson (2): drivers/raw: remove rawdev from driver directory
> > > > names drivers/raw: standardize name format of rawdev drivers
> > > >
> > > Since the .so/.a files we produce are changing, would this patchset - if
> > > accepted - need a deprecation notice in 19.08 for a future 19.11 merge?
> >
> > I would say we can merge it in 19.08 without prior notice.
> > Any other opinion?
>
> Cc Neil
We got no more opinion.
Does it mean I can merge it in 19.08-rc3?
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [dpdk-dev] [RFC PATCH 0/2] standardize rawdev names
2019-07-30 8:17 ` Thomas Monjalon
@ 2019-07-30 9:42 ` Bruce Richardson
2019-07-30 12:20 ` Neil Horman
1 sibling, 0 replies; 17+ messages in thread
From: Bruce Richardson @ 2019-07-30 9:42 UTC (permalink / raw)
To: Thomas Monjalon
Cc: dev, shreyansh.jain, hemant.agrawal, david.marchand, Neil Horman
On Tue, Jul 30, 2019 at 10:17:46AM +0200, Thomas Monjalon wrote:
> 05/07/2019 11:39, Thomas Monjalon:
> > 05/07/2019 11:38, Thomas Monjalon:
> > > 05/07/2019 11:35, Bruce Richardson:
> > > > On Fri, Jul 05, 2019 at 10:33:59AM +0100, Bruce Richardson wrote:
> > > > > The names of the rawdev drivers and the resultant libraries they built
> > > > > were pretty inconsistent. In terms of directory names, some had "rawdev"
> > > > > in the name, e.g. skeleton_rawdev, ifpga_rawdev, while others didn't.
> > > > > Also, for the built .so/.a libraries, the names were not always
> > > > > consistent between make and meson, as, while meson enforced a consistent
> > > > > naming scheme, make did not, leading to differences - especially for
> > > > > those drivers with "rawdev" in the directory name.
> > > > >
> > > > > This patchset attempts to make things more standardized by removing
> > > > > "rawdev" from all directory names - the drivers are in the "drivers/raw"
> > > > > directory after all - and then standardizing the library names to
> > > > > "librte_rawdev_<name>" for both make and meson.
> > > > >
> > > > > Bruce Richardson (2): drivers/raw: remove rawdev from driver directory
> > > > > names drivers/raw: standardize name format of rawdev drivers
> > > > >
> > > > Since the .so/.a files we produce are changing, would this patchset - if
> > > > accepted - need a deprecation notice in 19.08 for a future 19.11 merge?
> > >
> > > I would say we can merge it in 19.08 without prior notice.
> > > Any other opinion?
> >
> > Cc Neil
>
> We got no more opinion.
> Does it mean I can merge it in 19.08-rc3?
>
Seems like it should be safe enough to me. Rawdevs are pretty new and not
that widely used, I suspect. Any issues that do arise with the rename can
be resolved via symlink, so the risk is low, I suspect.
Regards,
/Bruce
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [dpdk-dev] [RFC PATCH 0/2] standardize rawdev names
2019-07-30 8:17 ` Thomas Monjalon
2019-07-30 9:42 ` Bruce Richardson
@ 2019-07-30 12:20 ` Neil Horman
2019-07-30 13:28 ` Thomas Monjalon
1 sibling, 1 reply; 17+ messages in thread
From: Neil Horman @ 2019-07-30 12:20 UTC (permalink / raw)
To: Thomas Monjalon
Cc: dev, Bruce Richardson, shreyansh.jain, hemant.agrawal, david.marchand
On Tue, Jul 30, 2019 at 10:17:46AM +0200, Thomas Monjalon wrote:
> 05/07/2019 11:39, Thomas Monjalon:
> > 05/07/2019 11:38, Thomas Monjalon:
> > > 05/07/2019 11:35, Bruce Richardson:
> > > > On Fri, Jul 05, 2019 at 10:33:59AM +0100, Bruce Richardson wrote:
> > > > > The names of the rawdev drivers and the resultant libraries they built
> > > > > were pretty inconsistent. In terms of directory names, some had "rawdev"
> > > > > in the name, e.g. skeleton_rawdev, ifpga_rawdev, while others didn't.
> > > > > Also, for the built .so/.a libraries, the names were not always
> > > > > consistent between make and meson, as, while meson enforced a consistent
> > > > > naming scheme, make did not, leading to differences - especially for
> > > > > those drivers with "rawdev" in the directory name.
> > > > >
> > > > > This patchset attempts to make things more standardized by removing
> > > > > "rawdev" from all directory names - the drivers are in the "drivers/raw"
> > > > > directory after all - and then standardizing the library names to
> > > > > "librte_rawdev_<name>" for both make and meson.
> > > > >
> > > > > Bruce Richardson (2): drivers/raw: remove rawdev from driver directory
> > > > > names drivers/raw: standardize name format of rawdev drivers
> > > > >
> > > > Since the .so/.a files we produce are changing, would this patchset - if
> > > > accepted - need a deprecation notice in 19.08 for a future 19.11 merge?
> > >
> > > I would say we can merge it in 19.08 without prior notice.
> > > Any other opinion?
> >
> > Cc Neil
>
> We got no more opinion.
> Does it mean I can merge it in 19.08-rc3?
>
>
>
Sorry, I meant to get to this and completely forgot.
I presume that this is solely a name change, and not a functional change,
correct?
I would think if thats the case, you could just release note the switch, and
distributions could all linker files with the old names to maintain
compatibility.
Neil
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [dpdk-dev] [RFC PATCH 0/2] standardize rawdev names
2019-07-30 12:20 ` Neil Horman
@ 2019-07-30 13:28 ` Thomas Monjalon
0 siblings, 0 replies; 17+ messages in thread
From: Thomas Monjalon @ 2019-07-30 13:28 UTC (permalink / raw)
To: Neil Horman, Bruce Richardson
Cc: dev, shreyansh.jain, hemant.agrawal, david.marchand
30/07/2019 14:20, Neil Horman:
> On Tue, Jul 30, 2019 at 10:17:46AM +0200, Thomas Monjalon wrote:
> > 05/07/2019 11:39, Thomas Monjalon:
> > > 05/07/2019 11:38, Thomas Monjalon:
> > > > 05/07/2019 11:35, Bruce Richardson:
> > > > > On Fri, Jul 05, 2019 at 10:33:59AM +0100, Bruce Richardson wrote:
> > > > > > The names of the rawdev drivers and the resultant libraries they built
> > > > > > were pretty inconsistent. In terms of directory names, some had "rawdev"
> > > > > > in the name, e.g. skeleton_rawdev, ifpga_rawdev, while others didn't.
> > > > > > Also, for the built .so/.a libraries, the names were not always
> > > > > > consistent between make and meson, as, while meson enforced a consistent
> > > > > > naming scheme, make did not, leading to differences - especially for
> > > > > > those drivers with "rawdev" in the directory name.
> > > > > >
> > > > > > This patchset attempts to make things more standardized by removing
> > > > > > "rawdev" from all directory names - the drivers are in the "drivers/raw"
> > > > > > directory after all - and then standardizing the library names to
> > > > > > "librte_rawdev_<name>" for both make and meson.
> > > > > >
> > > > > > Bruce Richardson (2): drivers/raw: remove rawdev from driver directory
> > > > > > names drivers/raw: standardize name format of rawdev drivers
> > > > > >
> > > > > Since the .so/.a files we produce are changing, would this patchset - if
> > > > > accepted - need a deprecation notice in 19.08 for a future 19.11 merge?
> > > >
> > > > I would say we can merge it in 19.08 without prior notice.
> > > > Any other opinion?
> > >
> > > Cc Neil
> >
> > We got no more opinion.
> > Does it mean I can merge it in 19.08-rc3?
> >
> >
> >
> Sorry, I meant to get to this and completely forgot.
>
> I presume that this is solely a name change, and not a functional change,
> correct?
Correct
> I would think if thats the case, you could just release note the switch, and
> distributions could all linker files with the old names to maintain
> compatibility.
I am sending a v2 (rebased with new raw drivers),
and adding a note in the release notes.
^ permalink raw reply [flat|nested] 17+ messages in thread
* [dpdk-dev] [PATCH v2 0/2] standardize rawdev names
2019-07-05 9:33 [dpdk-dev] [RFC PATCH 0/2] standardize rawdev names Bruce Richardson
` (2 preceding siblings ...)
2019-07-05 9:35 ` [dpdk-dev] [RFC PATCH 0/2] standardize rawdev names Bruce Richardson
@ 2019-07-30 13:39 ` Thomas Monjalon
2019-07-30 13:39 ` [dpdk-dev] [PATCH v2 1/2] drivers/raw: remove rawdev from directory names Thomas Monjalon
` (2 more replies)
3 siblings, 3 replies; 17+ messages in thread
From: Thomas Monjalon @ 2019-07-30 13:39 UTC (permalink / raw)
To: dev; +Cc: Neil Horman
The names of the rawdev drivers and the resultant libraries they built
were pretty inconsistent. In terms of directory names, some had "rawdev"
in the name, e.g. skeleton_rawdev, ifpga_rawdev, while others didn't.
Also, for the built .so/.a libraries, the names were not always
consistent between make and meson, as, while meson enforced a consistent
naming scheme, make did not, leading to differences - especially for
those drivers with "rawdev" in the directory name.
This patchset attempts to make things more standardized by removing
"rawdev" from all directory names - the drivers are in the "drivers/raw"
directory after all - and then standardizing the library names to
"librte_rawdev_<name>" for both make and meson.
Bruce Richardson (2):
drivers/raw: remove rawdev from directory names
drivers/raw: standardize naming
v2 (Thomas):
- update doc and MAINTAINERS file
- rebase for ntb and octeontx2
MAINTAINERS | 8 ++++----
doc/guides/rawdevs/{ifpga_rawdev.rst => ifpga.rst} | 0
doc/guides/rawdevs/index.rst | 4 ++--
doc/guides/rawdevs/{ioat_rawdev.rst => ioat.rst} | 0
doc/guides/rel_notes/release_19_08.rst | 3 +++
drivers/raw/Makefile | 4 ++--
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_rawdev => ifpga}/Makefile | 6 +++---
drivers/raw/{ifpga_rawdev => ifpga}/base/Makefile | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/README | 0
.../raw/{ifpga_rawdev => ifpga}/base/ifpga_api.c | 0
.../raw/{ifpga_rawdev => ifpga}/base/ifpga_api.h | 0
.../{ifpga_rawdev => ifpga}/base/ifpga_compat.h | 0
.../{ifpga_rawdev => ifpga}/base/ifpga_defines.h | 0
.../{ifpga_rawdev => ifpga}/base/ifpga_enumerate.c | 0
.../{ifpga_rawdev => ifpga}/base/ifpga_enumerate.h | 0
.../base/ifpga_feature_dev.c | 0
.../base/ifpga_feature_dev.h | 0
.../raw/{ifpga_rawdev => ifpga}/base/ifpga_fme.c | 0
.../{ifpga_rawdev => ifpga}/base/ifpga_fme_dperf.c | 0
.../{ifpga_rawdev => ifpga}/base/ifpga_fme_error.c | 0
.../{ifpga_rawdev => ifpga}/base/ifpga_fme_iperf.c | 0
.../{ifpga_rawdev => ifpga}/base/ifpga_fme_pr.c | 0
.../raw/{ifpga_rawdev => ifpga}/base/ifpga_hw.h | 0
.../raw/{ifpga_rawdev => ifpga}/base/ifpga_port.c | 0
.../base/ifpga_port_error.c | 0
.../raw/{ifpga_rawdev => ifpga}/base/meson.build | 0
.../base/opae_at24_eeprom.c | 0
.../base/opae_at24_eeprom.h | 0
.../raw/{ifpga_rawdev => ifpga}/base/opae_debug.c | 0
.../raw/{ifpga_rawdev => ifpga}/base/opae_debug.h | 0
.../{ifpga_rawdev => ifpga}/base/opae_eth_group.c | 0
.../{ifpga_rawdev => ifpga}/base/opae_eth_group.h | 0
.../raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.c | 0
.../raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.h | 0
.../raw/{ifpga_rawdev => ifpga}/base/opae_i2c.c | 0
.../raw/{ifpga_rawdev => ifpga}/base/opae_i2c.h | 0
.../base/opae_ifpga_hw_api.c | 0
.../base/opae_ifpga_hw_api.h | 0
.../base/opae_intel_max10.c | 0
.../base/opae_intel_max10.h | 0
.../raw/{ifpga_rawdev => ifpga}/base/opae_osdep.h | 0
.../raw/{ifpga_rawdev => ifpga}/base/opae_spi.c | 0
.../raw/{ifpga_rawdev => ifpga}/base/opae_spi.h | 0
.../base/opae_spi_transaction.c | 0
.../base/osdep_raw/osdep_generic.h | 0
.../base/osdep_rte/osdep_generic.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/meson.build | 0
.../rte_rawdev_ifpga_version.map} | 0
drivers/raw/ioat/Makefile | 4 ++--
...oat_version.map => rte_rawdev_ioat_version.map} | 0
drivers/raw/meson.build | 6 +++---
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_rawdev => skeleton}/Makefile | 4 ++--
.../raw/{skeleton_rawdev => skeleton}/meson.build | 0
.../rte_rawdev_skeleton_version.map} | 0
.../skeleton_rawdev.c | 0
.../skeleton_rawdev.h | 0
.../skeleton_rawdev_test.c | 0
mk/rte.app.mk | 14 +++++++-------
68 files changed, 36 insertions(+), 33 deletions(-)
rename doc/guides/rawdevs/{ifpga_rawdev.rst => ifpga.rst} (100%)
rename doc/guides/rawdevs/{ioat_rawdev.rst => ioat.rst} (100%)
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_rawdev => ifpga}/Makefile (82%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/Makefile (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/README (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_api.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_api.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_compat.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_defines.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_enumerate.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_enumerate.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_feature_dev.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_feature_dev.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_dperf.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_error.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_iperf.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_pr.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_hw.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_port.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_port_error.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/meson.build (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_at24_eeprom.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_at24_eeprom.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_debug.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_debug.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_eth_group.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_eth_group.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_i2c.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_i2c.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_ifpga_hw_api.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_ifpga_hw_api.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_intel_max10.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_intel_max10.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_osdep.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi_transaction.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/osdep_raw/osdep_generic.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/osdep_rte/osdep_generic.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/meson.build (100%)
rename drivers/raw/{ifpga_rawdev/rte_pmd_ifpga_rawdev_version.map => ifpga/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_rawdev => skeleton}/Makefile (84%)
rename drivers/raw/{skeleton_rawdev => skeleton}/meson.build (100%)
rename drivers/raw/{skeleton_rawdev/rte_pmd_skeleton_rawdev_version.map => skeleton/rte_rawdev_skeleton_version.map} (100%)
rename drivers/raw/{skeleton_rawdev => skeleton}/skeleton_rawdev.c (100%)
rename drivers/raw/{skeleton_rawdev => skeleton}/skeleton_rawdev.h (100%)
rename drivers/raw/{skeleton_rawdev => skeleton}/skeleton_rawdev_test.c (100%)
--
2.21.0
^ permalink raw reply [flat|nested] 17+ messages in thread
* [dpdk-dev] [PATCH v2 1/2] drivers/raw: remove rawdev from directory names
2019-07-30 13:39 ` [dpdk-dev] [PATCH v2 " Thomas Monjalon
@ 2019-07-30 13:39 ` Thomas Monjalon
2019-07-31 7:28 ` Xu, Rosen
2019-07-30 13:39 ` [dpdk-dev] [PATCH v2 2/2] drivers/raw: standardize naming Thomas Monjalon
2019-07-30 17:44 ` [dpdk-dev] [PATCH v2 0/2] standardize rawdev names Thomas Monjalon
2 siblings, 1 reply; 17+ messages in thread
From: Thomas Monjalon @ 2019-07-30 13:39 UTC (permalink / raw)
To: dev, Rosen Xu, Tianfei zhang, John McNamara, Marko Kovacevic,
Bruce Richardson, Shreyansh Jain, Hemant Agrawal
Cc: Neil Horman
From: Bruce Richardson <bruce.richardson@intel.com>
The ifpga and skeleton rawdev drivers included "rawdev" in their directory
names, which was superfluous given that they were in the drivers/raw
directory. Shorten the names via this patch.
For meson builds, this will rename the final library .so/.a files
produced, but those will be renamed again later via a patch to
standardize rawdev names.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
MAINTAINERS | 8 ++++----
doc/guides/rawdevs/{ifpga_rawdev.rst => ifpga.rst} | 0
doc/guides/rawdevs/index.rst | 4 ++--
doc/guides/rawdevs/{ioat_rawdev.rst => ioat.rst} | 0
drivers/raw/Makefile | 4 ++--
drivers/raw/{ifpga_rawdev => ifpga}/Makefile | 4 ++--
drivers/raw/{ifpga_rawdev => ifpga}/base/Makefile | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/README | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_api.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_api.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_compat.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_defines.h | 0
.../raw/{ifpga_rawdev => ifpga}/base/ifpga_enumerate.c | 0
.../raw/{ifpga_rawdev => ifpga}/base/ifpga_enumerate.h | 0
.../raw/{ifpga_rawdev => ifpga}/base/ifpga_feature_dev.c | 0
.../raw/{ifpga_rawdev => ifpga}/base/ifpga_feature_dev.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme.c | 0
.../raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_dperf.c | 0
.../raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_error.c | 0
.../raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_iperf.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_pr.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_hw.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_port.c | 0
.../raw/{ifpga_rawdev => ifpga}/base/ifpga_port_error.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/meson.build | 0
.../raw/{ifpga_rawdev => ifpga}/base/opae_at24_eeprom.c | 0
.../raw/{ifpga_rawdev => ifpga}/base/opae_at24_eeprom.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_debug.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_debug.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_eth_group.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_eth_group.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_i2c.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_i2c.h | 0
.../raw/{ifpga_rawdev => ifpga}/base/opae_ifpga_hw_api.c | 0
.../raw/{ifpga_rawdev => ifpga}/base/opae_ifpga_hw_api.h | 0
.../raw/{ifpga_rawdev => ifpga}/base/opae_intel_max10.c | 0
.../raw/{ifpga_rawdev => ifpga}/base/opae_intel_max10.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_osdep.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi.h | 0
.../{ifpga_rawdev => ifpga}/base/opae_spi_transaction.c | 0
.../base/osdep_raw/osdep_generic.h | 0
.../base/osdep_rte/osdep_generic.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.c | 0
drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.h | 0
drivers/raw/{ifpga_rawdev => ifpga}/meson.build | 0
.../rte_pmd_ifpga_version.map} | 0
drivers/raw/meson.build | 4 ++--
drivers/raw/{skeleton_rawdev => skeleton}/Makefile | 2 +-
drivers/raw/{skeleton_rawdev => skeleton}/meson.build | 0
.../rte_pmd_skeleton_version.map} | 0
.../raw/{skeleton_rawdev => skeleton}/skeleton_rawdev.c | 0
.../raw/{skeleton_rawdev => skeleton}/skeleton_rawdev.h | 0
.../{skeleton_rawdev => skeleton}/skeleton_rawdev_test.c | 0
56 files changed, 13 insertions(+), 13 deletions(-)
rename doc/guides/rawdevs/{ifpga_rawdev.rst => ifpga.rst} (100%)
rename doc/guides/rawdevs/{ioat_rawdev.rst => ioat.rst} (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/Makefile (86%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/Makefile (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/README (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_api.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_api.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_compat.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_defines.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_enumerate.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_enumerate.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_feature_dev.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_feature_dev.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_dperf.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_error.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_iperf.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_pr.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_hw.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_port.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_port_error.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/meson.build (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_at24_eeprom.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_at24_eeprom.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_debug.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_debug.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_eth_group.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_eth_group.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_i2c.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_i2c.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_ifpga_hw_api.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_ifpga_hw_api.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_intel_max10.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_intel_max10.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_osdep.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi_transaction.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/osdep_raw/osdep_generic.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/base/osdep_rte/osdep_generic.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.c (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.h (100%)
rename drivers/raw/{ifpga_rawdev => ifpga}/meson.build (100%)
rename drivers/raw/{ifpga_rawdev/rte_pmd_ifpga_rawdev_version.map => ifpga/rte_pmd_ifpga_version.map} (100%)
rename drivers/raw/{skeleton_rawdev => skeleton}/Makefile (91%)
rename drivers/raw/{skeleton_rawdev => skeleton}/meson.build (100%)
rename drivers/raw/{skeleton_rawdev/rte_pmd_skeleton_rawdev_version.map => skeleton/rte_pmd_skeleton_version.map} (100%)
rename drivers/raw/{skeleton_rawdev => skeleton}/skeleton_rawdev.c (100%)
rename drivers/raw/{skeleton_rawdev => skeleton}/skeleton_rawdev.h (100%)
rename drivers/raw/{skeleton_rawdev => skeleton}/skeleton_rawdev_test.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index c2b575a94..dc6648c16 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -449,7 +449,7 @@ Raw device API - EXPERIMENTAL
M: Shreyansh Jain <shreyansh.jain@nxp.com>
M: Hemant Agrawal <hemant.agrawal@nxp.com>
F: lib/librte_rawdev/
-F: drivers/raw/skeleton_rawdev/
+F: drivers/raw/skeleton/
F: app/test/test_rawdev.c
F: doc/guides/prog_guide/rawdev.rst
@@ -1103,13 +1103,13 @@ Rawdev Drivers
Intel FPGA
M: Rosen Xu <rosen.xu@intel.com>
M: Tianfei zhang <tianfei.zhang@intel.com>
-F: drivers/raw/ifpga_rawdev/
-F: doc/guides/rawdevs/ifpga_rawdev.rst
+F: drivers/raw/ifpga/
+F: doc/guides/rawdevs/ifpga.rst
IOAT Rawdev
M: Bruce Richardson <bruce.richardson@intel.com>
F: drivers/raw/ioat/
-F: doc/guides/rawdevs/ioat_rawdev.rst
+F: doc/guides/rawdevs/ioat.rst
NXP DPAA2 QDMA
M: Nipun Gupta <nipun.gupta@nxp.com>
diff --git a/doc/guides/rawdevs/ifpga_rawdev.rst b/doc/guides/rawdevs/ifpga.rst
similarity index 100%
rename from doc/guides/rawdevs/ifpga_rawdev.rst
rename to doc/guides/rawdevs/ifpga.rst
diff --git a/doc/guides/rawdevs/index.rst b/doc/guides/rawdevs/index.rst
index fad951637..22bc013ce 100644
--- a/doc/guides/rawdevs/index.rst
+++ b/doc/guides/rawdevs/index.rst
@@ -13,7 +13,7 @@ application through rawdev API.
dpaa2_cmdif
dpaa2_qdma
- ifpga_rawdev
- ioat_rawdev
+ ifpga
+ ioat
ntb
octeontx2_dma
diff --git a/doc/guides/rawdevs/ioat_rawdev.rst b/doc/guides/rawdevs/ioat.rst
similarity index 100%
rename from doc/guides/rawdevs/ioat_rawdev.rst
rename to doc/guides/rawdevs/ioat.rst
diff --git a/drivers/raw/Makefile b/drivers/raw/Makefile
index 879fcca61..0b6d13d03 100644
--- a/drivers/raw/Makefile
+++ b/drivers/raw/Makefile
@@ -4,12 +4,12 @@
include $(RTE_SDK)/mk/rte.vars.mk
# DIRS-$(<configuration>) += <directory>
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton_rawdev
+DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton
ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy)
DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += dpaa2_cmdif
DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) += dpaa2_qdma
endif
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += ifpga_rawdev
+DIRS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += ifpga
DIRS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat
DIRS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += ntb
DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += octeontx2_dma
diff --git a/drivers/raw/ifpga_rawdev/Makefile b/drivers/raw/ifpga/Makefile
similarity index 86%
rename from drivers/raw/ifpga_rawdev/Makefile
rename to drivers/raw/ifpga/Makefile
index f60b547d8..5fa9303d5 100644
--- a/drivers/raw/ifpga_rawdev/Makefile
+++ b/drivers/raw/ifpga/Makefile
@@ -21,13 +21,13 @@ LDLIBS += -lrte_kvargs
LDLIBS += -lrte_bus_pci
LDLIBS += -lrte_bus_ifpga
-EXPORT_MAP := rte_pmd_ifpga_rawdev_version.map
+EXPORT_MAP := rte_pmd_ifpga_version.map
LIBABIVER := 1
VPATH += $(SRCDIR)/base
-include $(RTE_SDK)/drivers/raw/ifpga_rawdev/base/Makefile
+include $(RTE_SDK)/drivers/raw/ifpga/base/Makefile
#
# all source are stored in SRCS-y
diff --git a/drivers/raw/ifpga_rawdev/base/Makefile b/drivers/raw/ifpga/base/Makefile
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/Makefile
rename to drivers/raw/ifpga/base/Makefile
diff --git a/drivers/raw/ifpga_rawdev/base/README b/drivers/raw/ifpga/base/README
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/README
rename to drivers/raw/ifpga/base/README
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_api.c b/drivers/raw/ifpga/base/ifpga_api.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_api.c
rename to drivers/raw/ifpga/base/ifpga_api.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_api.h b/drivers/raw/ifpga/base/ifpga_api.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_api.h
rename to drivers/raw/ifpga/base/ifpga_api.h
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_compat.h b/drivers/raw/ifpga/base/ifpga_compat.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_compat.h
rename to drivers/raw/ifpga/base/ifpga_compat.h
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_defines.h b/drivers/raw/ifpga/base/ifpga_defines.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_defines.h
rename to drivers/raw/ifpga/base/ifpga_defines.h
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c b/drivers/raw/ifpga/base/ifpga_enumerate.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c
rename to drivers/raw/ifpga/base/ifpga_enumerate.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_enumerate.h b/drivers/raw/ifpga/base/ifpga_enumerate.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_enumerate.h
rename to drivers/raw/ifpga/base/ifpga_enumerate.h
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.c b/drivers/raw/ifpga/base/ifpga_feature_dev.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.c
rename to drivers/raw/ifpga/base/ifpga_feature_dev.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h b/drivers/raw/ifpga/base/ifpga_feature_dev.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h
rename to drivers/raw/ifpga/base/ifpga_feature_dev.h
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme.c b/drivers/raw/ifpga/base/ifpga_fme.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_fme.c
rename to drivers/raw/ifpga/base/ifpga_fme.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme_dperf.c b/drivers/raw/ifpga/base/ifpga_fme_dperf.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_fme_dperf.c
rename to drivers/raw/ifpga/base/ifpga_fme_dperf.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme_error.c b/drivers/raw/ifpga/base/ifpga_fme_error.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_fme_error.c
rename to drivers/raw/ifpga/base/ifpga_fme_error.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme_iperf.c b/drivers/raw/ifpga/base/ifpga_fme_iperf.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_fme_iperf.c
rename to drivers/raw/ifpga/base/ifpga_fme_iperf.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c b/drivers/raw/ifpga/base/ifpga_fme_pr.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c
rename to drivers/raw/ifpga/base/ifpga_fme_pr.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_hw.h b/drivers/raw/ifpga/base/ifpga_hw.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_hw.h
rename to drivers/raw/ifpga/base/ifpga_hw.h
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_port.c b/drivers/raw/ifpga/base/ifpga_port.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_port.c
rename to drivers/raw/ifpga/base/ifpga_port.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_port_error.c b/drivers/raw/ifpga/base/ifpga_port_error.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/ifpga_port_error.c
rename to drivers/raw/ifpga/base/ifpga_port_error.c
diff --git a/drivers/raw/ifpga_rawdev/base/meson.build b/drivers/raw/ifpga/base/meson.build
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/meson.build
rename to drivers/raw/ifpga/base/meson.build
diff --git a/drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.c b/drivers/raw/ifpga/base/opae_at24_eeprom.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.c
rename to drivers/raw/ifpga/base/opae_at24_eeprom.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.h b/drivers/raw/ifpga/base/opae_at24_eeprom.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.h
rename to drivers/raw/ifpga/base/opae_at24_eeprom.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_debug.c b/drivers/raw/ifpga/base/opae_debug.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_debug.c
rename to drivers/raw/ifpga/base/opae_debug.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_debug.h b/drivers/raw/ifpga/base/opae_debug.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_debug.h
rename to drivers/raw/ifpga/base/opae_debug.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_eth_group.c b/drivers/raw/ifpga/base/opae_eth_group.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_eth_group.c
rename to drivers/raw/ifpga/base/opae_eth_group.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_eth_group.h b/drivers/raw/ifpga/base/opae_eth_group.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_eth_group.h
rename to drivers/raw/ifpga/base/opae_eth_group.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_hw_api.c b/drivers/raw/ifpga/base/opae_hw_api.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_hw_api.c
rename to drivers/raw/ifpga/base/opae_hw_api.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_hw_api.h b/drivers/raw/ifpga/base/opae_hw_api.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_hw_api.h
rename to drivers/raw/ifpga/base/opae_hw_api.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_i2c.c b/drivers/raw/ifpga/base/opae_i2c.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_i2c.c
rename to drivers/raw/ifpga/base/opae_i2c.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_i2c.h b/drivers/raw/ifpga/base/opae_i2c.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_i2c.h
rename to drivers/raw/ifpga/base/opae_i2c.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.c b/drivers/raw/ifpga/base/opae_ifpga_hw_api.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.c
rename to drivers/raw/ifpga/base/opae_ifpga_hw_api.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.h b/drivers/raw/ifpga/base/opae_ifpga_hw_api.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.h
rename to drivers/raw/ifpga/base/opae_ifpga_hw_api.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c b/drivers/raw/ifpga/base/opae_intel_max10.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_intel_max10.c
rename to drivers/raw/ifpga/base/opae_intel_max10.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_intel_max10.h b/drivers/raw/ifpga/base/opae_intel_max10.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_intel_max10.h
rename to drivers/raw/ifpga/base/opae_intel_max10.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_osdep.h b/drivers/raw/ifpga/base/opae_osdep.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_osdep.h
rename to drivers/raw/ifpga/base/opae_osdep.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_spi.c b/drivers/raw/ifpga/base/opae_spi.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_spi.c
rename to drivers/raw/ifpga/base/opae_spi.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_spi.h b/drivers/raw/ifpga/base/opae_spi.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_spi.h
rename to drivers/raw/ifpga/base/opae_spi.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_spi_transaction.c b/drivers/raw/ifpga/base/opae_spi_transaction.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/opae_spi_transaction.c
rename to drivers/raw/ifpga/base/opae_spi_transaction.c
diff --git a/drivers/raw/ifpga_rawdev/base/osdep_raw/osdep_generic.h b/drivers/raw/ifpga/base/osdep_raw/osdep_generic.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/osdep_raw/osdep_generic.h
rename to drivers/raw/ifpga/base/osdep_raw/osdep_generic.h
diff --git a/drivers/raw/ifpga_rawdev/base/osdep_rte/osdep_generic.h b/drivers/raw/ifpga/base/osdep_rte/osdep_generic.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/base/osdep_rte/osdep_generic.h
rename to drivers/raw/ifpga/base/osdep_rte/osdep_generic.h
diff --git a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c
similarity index 100%
rename from drivers/raw/ifpga_rawdev/ifpga_rawdev.c
rename to drivers/raw/ifpga/ifpga_rawdev.c
diff --git a/drivers/raw/ifpga_rawdev/ifpga_rawdev.h b/drivers/raw/ifpga/ifpga_rawdev.h
similarity index 100%
rename from drivers/raw/ifpga_rawdev/ifpga_rawdev.h
rename to drivers/raw/ifpga/ifpga_rawdev.h
diff --git a/drivers/raw/ifpga_rawdev/meson.build b/drivers/raw/ifpga/meson.build
similarity index 100%
rename from drivers/raw/ifpga_rawdev/meson.build
rename to drivers/raw/ifpga/meson.build
diff --git a/drivers/raw/ifpga_rawdev/rte_pmd_ifpga_rawdev_version.map b/drivers/raw/ifpga/rte_pmd_ifpga_version.map
similarity index 100%
rename from drivers/raw/ifpga_rawdev/rte_pmd_ifpga_rawdev_version.map
rename to drivers/raw/ifpga/rte_pmd_ifpga_version.map
diff --git a/drivers/raw/meson.build b/drivers/raw/meson.build
index c2d034862..bcd5553e1 100644
--- a/drivers/raw/meson.build
+++ b/drivers/raw/meson.build
@@ -2,9 +2,9 @@
# Copyright 2018 NXP
drivers = ['dpaa2_cmdif', 'dpaa2_qdma',
- 'ifpga_rawdev', 'ioat', 'ntb',
+ 'ifpga', 'ioat', 'ntb',
'octeontx2_dma',
- 'skeleton_rawdev']
+ 'skeleton']
std_deps = ['rawdev']
config_flag_fmt = 'RTE_LIBRTE_PMD_@0@_RAWDEV'
driver_name_fmt = 'rte_pmd_@0@'
diff --git a/drivers/raw/skeleton_rawdev/Makefile b/drivers/raw/skeleton/Makefile
similarity index 91%
rename from drivers/raw/skeleton_rawdev/Makefile
rename to drivers/raw/skeleton/Makefile
index 3f97c2ee0..9641e6505 100644
--- a/drivers/raw/skeleton_rawdev/Makefile
+++ b/drivers/raw/skeleton/Makefile
@@ -15,7 +15,7 @@ LDLIBS += -lrte_rawdev
LDLIBS += -lrte_bus_vdev
LDLIBS += -lrte_kvargs
-EXPORT_MAP := rte_pmd_skeleton_rawdev_version.map
+EXPORT_MAP := rte_pmd_skeleton_version.map
LIBABIVER := 1
diff --git a/drivers/raw/skeleton_rawdev/meson.build b/drivers/raw/skeleton/meson.build
similarity index 100%
rename from drivers/raw/skeleton_rawdev/meson.build
rename to drivers/raw/skeleton/meson.build
diff --git a/drivers/raw/skeleton_rawdev/rte_pmd_skeleton_rawdev_version.map b/drivers/raw/skeleton/rte_pmd_skeleton_version.map
similarity index 100%
rename from drivers/raw/skeleton_rawdev/rte_pmd_skeleton_rawdev_version.map
rename to drivers/raw/skeleton/rte_pmd_skeleton_version.map
diff --git a/drivers/raw/skeleton_rawdev/skeleton_rawdev.c b/drivers/raw/skeleton/skeleton_rawdev.c
similarity index 100%
rename from drivers/raw/skeleton_rawdev/skeleton_rawdev.c
rename to drivers/raw/skeleton/skeleton_rawdev.c
diff --git a/drivers/raw/skeleton_rawdev/skeleton_rawdev.h b/drivers/raw/skeleton/skeleton_rawdev.h
similarity index 100%
rename from drivers/raw/skeleton_rawdev/skeleton_rawdev.h
rename to drivers/raw/skeleton/skeleton_rawdev.h
diff --git a/drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c b/drivers/raw/skeleton/skeleton_rawdev_test.c
similarity index 100%
rename from drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c
rename to drivers/raw/skeleton/skeleton_rawdev_test.c
--
2.21.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [dpdk-dev] [PATCH v2 2/2] drivers/raw: standardize naming
2019-07-30 13:39 ` [dpdk-dev] [PATCH v2 " Thomas Monjalon
2019-07-30 13:39 ` [dpdk-dev] [PATCH v2 1/2] drivers/raw: remove rawdev from directory names Thomas Monjalon
@ 2019-07-30 13:39 ` Thomas Monjalon
2019-07-31 7:29 ` Xu, Rosen
2019-07-30 17:44 ` [dpdk-dev] [PATCH v2 0/2] standardize rawdev names Thomas Monjalon
2 siblings, 1 reply; 17+ messages in thread
From: Thomas Monjalon @ 2019-07-30 13:39 UTC (permalink / raw)
To: dev, John McNamara, Marko Kovacevic, Nipun Gupta, Rosen Xu,
Tianfei zhang, Bruce Richardson, Xiaoyun Li, Jingjing Wu,
Satha Rao, Vamsi Attunuru, Shreyansh Jain, Hemant Agrawal
Cc: Neil Horman
From: Bruce Richardson <bruce.richardson@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.richardson@intel.com>
Signed-off-by: Thomas Monjalon <thomas@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
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [dpdk-dev] [PATCH v2 0/2] standardize rawdev names
2019-07-30 13:39 ` [dpdk-dev] [PATCH v2 " Thomas Monjalon
2019-07-30 13:39 ` [dpdk-dev] [PATCH v2 1/2] drivers/raw: remove rawdev from directory names Thomas Monjalon
2019-07-30 13:39 ` [dpdk-dev] [PATCH v2 2/2] drivers/raw: standardize naming Thomas Monjalon
@ 2019-07-30 17:44 ` Thomas Monjalon
2 siblings, 0 replies; 17+ messages in thread
From: Thomas Monjalon @ 2019-07-30 17:44 UTC (permalink / raw)
To: bruce.richardson; +Cc: dev, Neil Horman
30/07/2019 15:39, Thomas Monjalon:
> The names of the rawdev drivers and the resultant libraries they built
> were pretty inconsistent. In terms of directory names, some had "rawdev"
> in the name, e.g. skeleton_rawdev, ifpga_rawdev, while others didn't.
> Also, for the built .so/.a libraries, the names were not always
> consistent between make and meson, as, while meson enforced a consistent
> naming scheme, make did not, leading to differences - especially for
> those drivers with "rawdev" in the directory name.
>
> This patchset attempts to make things more standardized by removing
> "rawdev" from all directory names - the drivers are in the "drivers/raw"
> directory after all - and then standardizing the library names to
> "librte_rawdev_<name>" for both make and meson.
>
> Bruce Richardson (2):
> drivers/raw: remove rawdev from directory names
> drivers/raw: standardize naming
>
> v2 (Thomas):
> - update doc and MAINTAINERS file
> - rebase for ntb and octeontx2
Applied
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [dpdk-dev] [PATCH v2 1/2] drivers/raw: remove rawdev from directory names
2019-07-30 13:39 ` [dpdk-dev] [PATCH v2 1/2] drivers/raw: remove rawdev from directory names Thomas Monjalon
@ 2019-07-31 7:28 ` Xu, Rosen
0 siblings, 0 replies; 17+ messages in thread
From: Xu, Rosen @ 2019-07-31 7:28 UTC (permalink / raw)
To: Thomas Monjalon, dev, Zhang, Tianfei, Mcnamara, John, Kovacevic,
Marko, Richardson, Bruce, Shreyansh Jain, Hemant Agrawal
Cc: Neil Horman
Hi,
> -----Original Message-----
> From: Thomas Monjalon [mailto:thomas@monjalon.net]
> Sent: Tuesday, July 30, 2019 21:40
> To: dev@dpdk.org; Xu, Rosen <rosen.xu@intel.com>; Zhang, Tianfei
> <tianfei.zhang@intel.com>; Mcnamara, John <john.mcnamara@intel.com>;
> Kovacevic, Marko <marko.kovacevic@intel.com>; Richardson, Bruce
> <bruce.richardson@intel.com>; Shreyansh Jain <shreyansh.jain@nxp.com>;
> Hemant Agrawal <hemant.agrawal@nxp.com>
> Cc: Neil Horman <nhorman@tuxdriver.com>
> Subject: [PATCH v2 1/2] drivers/raw: remove rawdev from directory names
>
> From: Bruce Richardson <bruce.richardson@intel.com>
>
> The ifpga and skeleton rawdev drivers included "rawdev" in their directory
> names, which was superfluous given that they were in the drivers/raw
> directory. Shorten the names via this patch.
>
> For meson builds, this will rename the final library .so/.a files produced, but
> those will be renamed again later via a patch to standardize rawdev names.
>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> ---
> MAINTAINERS | 8 ++++----
> doc/guides/rawdevs/{ifpga_rawdev.rst => ifpga.rst} | 0
> doc/guides/rawdevs/index.rst | 4 ++--
> doc/guides/rawdevs/{ioat_rawdev.rst => ioat.rst} | 0
> drivers/raw/Makefile | 4 ++--
> drivers/raw/{ifpga_rawdev => ifpga}/Makefile | 4 ++--
> drivers/raw/{ifpga_rawdev => ifpga}/base/Makefile | 0
> drivers/raw/{ifpga_rawdev => ifpga}/base/README | 0
> drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_api.c | 0
> drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_api.h | 0
> drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_compat.h | 0
> drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_defines.h | 0
> .../raw/{ifpga_rawdev => ifpga}/base/ifpga_enumerate.c | 0
> .../raw/{ifpga_rawdev => ifpga}/base/ifpga_enumerate.h | 0
> .../raw/{ifpga_rawdev => ifpga}/base/ifpga_feature_dev.c |
> 0 .../raw/{ifpga_rawdev => ifpga}/base/ifpga_feature_dev.h | 0
> drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme.c | 0
> .../raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_dperf.c | 0
> .../raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_error.c | 0
> .../raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_iperf.c | 0
> drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_fme_pr.c | 0
> drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_hw.h | 0
> drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_port.c | 0
> .../raw/{ifpga_rawdev => ifpga}/base/ifpga_port_error.c | 0
> drivers/raw/{ifpga_rawdev => ifpga}/base/meson.build | 0
> .../raw/{ifpga_rawdev => ifpga}/base/opae_at24_eeprom.c | 0
> .../raw/{ifpga_rawdev => ifpga}/base/opae_at24_eeprom.h | 0
> drivers/raw/{ifpga_rawdev => ifpga}/base/opae_debug.c | 0
> drivers/raw/{ifpga_rawdev => ifpga}/base/opae_debug.h | 0
> drivers/raw/{ifpga_rawdev => ifpga}/base/opae_eth_group.c | 0
> drivers/raw/{ifpga_rawdev => ifpga}/base/opae_eth_group.h | 0
> drivers/raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.c | 0
> drivers/raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.h | 0
> drivers/raw/{ifpga_rawdev => ifpga}/base/opae_i2c.c | 0
> drivers/raw/{ifpga_rawdev => ifpga}/base/opae_i2c.h | 0
> .../raw/{ifpga_rawdev => ifpga}/base/opae_ifpga_hw_api.c |
> 0 .../raw/{ifpga_rawdev => ifpga}/base/opae_ifpga_hw_api.h | 0
> .../raw/{ifpga_rawdev => ifpga}/base/opae_intel_max10.c | 0
> .../raw/{ifpga_rawdev => ifpga}/base/opae_intel_max10.h | 0
> drivers/raw/{ifpga_rawdev => ifpga}/base/opae_osdep.h | 0
> drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi.c | 0
> drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi.h | 0
> .../{ifpga_rawdev => ifpga}/base/opae_spi_transaction.c | 0
> .../base/osdep_raw/osdep_generic.h | 0
> .../base/osdep_rte/osdep_generic.h | 0
> drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.c | 0
> drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.h | 0
> drivers/raw/{ifpga_rawdev => ifpga}/meson.build | 0
> .../rte_pmd_ifpga_version.map} | 0
> drivers/raw/meson.build | 4 ++--
> drivers/raw/{skeleton_rawdev => skeleton}/Makefile | 2 +-
> drivers/raw/{skeleton_rawdev => skeleton}/meson.build | 0
> .../rte_pmd_skeleton_version.map} | 0
> .../raw/{skeleton_rawdev => skeleton}/skeleton_rawdev.c | 0
> .../raw/{skeleton_rawdev => skeleton}/skeleton_rawdev.h | 0
> .../{skeleton_rawdev => skeleton}/skeleton_rawdev_test.c | 0
> 56 files changed, 13 insertions(+), 13 deletions(-) rename
> doc/guides/rawdevs/{ifpga_rawdev.rst => ifpga.rst} (100%) rename
> doc/guides/rawdevs/{ioat_rawdev.rst => ioat.rst} (100%) rename
> drivers/raw/{ifpga_rawdev => ifpga}/Makefile (86%) rename
> drivers/raw/{ifpga_rawdev => ifpga}/base/Makefile (100%) rename
> drivers/raw/{ifpga_rawdev => ifpga}/base/README (100%) rename
> drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_api.c (100%) rename
> drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_api.h (100%) rename
> drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_compat.h (100%) rename
> drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_defines.h (100%) rename
> drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_enumerate.c (100%)
> rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_enumerate.h (100%)
> rename drivers/raw/{ifpga_rawdev => ifpga}/base/ifpga_feature_dev.c
> (100%) rename drivers/raw/{ifpga_rawdev =>
> ifpga}/base/ifpga_feature_dev.h (100%) rename drivers/raw/{ifpga_rawdev
> => ifpga}/base/ifpga_fme.c (100%) rename drivers/raw/{ifpga_rawdev =>
> ifpga}/base/ifpga_fme_dperf.c (100%) rename drivers/raw/{ifpga_rawdev =>
> ifpga}/base/ifpga_fme_error.c (100%) rename drivers/raw/{ifpga_rawdev =>
> ifpga}/base/ifpga_fme_iperf.c (100%) rename drivers/raw/{ifpga_rawdev =>
> ifpga}/base/ifpga_fme_pr.c (100%) rename drivers/raw/{ifpga_rawdev =>
> ifpga}/base/ifpga_hw.h (100%) rename drivers/raw/{ifpga_rawdev =>
> ifpga}/base/ifpga_port.c (100%) rename drivers/raw/{ifpga_rawdev =>
> ifpga}/base/ifpga_port_error.c (100%) rename drivers/raw/{ifpga_rawdev =>
> ifpga}/base/meson.build (100%) rename drivers/raw/{ifpga_rawdev =>
> ifpga}/base/opae_at24_eeprom.c (100%) rename
> drivers/raw/{ifpga_rawdev => ifpga}/base/opae_at24_eeprom.h (100%)
> rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_debug.c (100%)
> rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_debug.h (100%)
> rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_eth_group.c (100%)
> rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_eth_group.h (100%)
> rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.c (100%)
> rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_hw_api.h (100%)
> rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_i2c.c (100%)
> rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_i2c.h (100%)
> rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_ifpga_hw_api.c
> (100%) rename drivers/raw/{ifpga_rawdev =>
> ifpga}/base/opae_ifpga_hw_api.h (100%) rename
> drivers/raw/{ifpga_rawdev => ifpga}/base/opae_intel_max10.c (100%)
> rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_intel_max10.h
> (100%) rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_osdep.h
> (100%) rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi.c (100%)
> rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi.h (100%)
> rename drivers/raw/{ifpga_rawdev => ifpga}/base/opae_spi_transaction.c
> (100%) rename drivers/raw/{ifpga_rawdev =>
> ifpga}/base/osdep_raw/osdep_generic.h (100%) rename
> drivers/raw/{ifpga_rawdev => ifpga}/base/osdep_rte/osdep_generic.h
> (100%) rename drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.c (100%)
> rename drivers/raw/{ifpga_rawdev => ifpga}/ifpga_rawdev.h (100%)
> rename drivers/raw/{ifpga_rawdev => ifpga}/meson.build (100%) rename
> drivers/raw/{ifpga_rawdev/rte_pmd_ifpga_rawdev_version.map =>
> ifpga/rte_pmd_ifpga_version.map} (100%) rename
> drivers/raw/{skeleton_rawdev => skeleton}/Makefile (91%) rename
> drivers/raw/{skeleton_rawdev => skeleton}/meson.build (100%) rename
> drivers/raw/{skeleton_rawdev/rte_pmd_skeleton_rawdev_version.map =>
> skeleton/rte_pmd_skeleton_version.map} (100%) rename
> drivers/raw/{skeleton_rawdev => skeleton}/skeleton_rawdev.c (100%)
> rename drivers/raw/{skeleton_rawdev => skeleton}/skeleton_rawdev.h
> (100%) rename drivers/raw/{skeleton_rawdev =>
> skeleton}/skeleton_rawdev_test.c (100%)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index c2b575a94..dc6648c16 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -449,7 +449,7 @@ Raw device API - EXPERIMENTAL
> M: Shreyansh Jain <shreyansh.jain@nxp.com>
> M: Hemant Agrawal <hemant.agrawal@nxp.com>
> F: lib/librte_rawdev/
> -F: drivers/raw/skeleton_rawdev/
> +F: drivers/raw/skeleton/
> F: app/test/test_rawdev.c
> F: doc/guides/prog_guide/rawdev.rst
>
> @@ -1103,13 +1103,13 @@ Rawdev Drivers
> Intel FPGA
> M: Rosen Xu <rosen.xu@intel.com>
> M: Tianfei zhang <tianfei.zhang@intel.com>
> -F: drivers/raw/ifpga_rawdev/
> -F: doc/guides/rawdevs/ifpga_rawdev.rst
> +F: drivers/raw/ifpga/
> +F: doc/guides/rawdevs/ifpga.rst
>
> IOAT Rawdev
> M: Bruce Richardson <bruce.richardson@intel.com>
> F: drivers/raw/ioat/
> -F: doc/guides/rawdevs/ioat_rawdev.rst
> +F: doc/guides/rawdevs/ioat.rst
>
> NXP DPAA2 QDMA
> M: Nipun Gupta <nipun.gupta@nxp.com>
> diff --git a/doc/guides/rawdevs/ifpga_rawdev.rst
> b/doc/guides/rawdevs/ifpga.rst similarity index 100% rename from
> doc/guides/rawdevs/ifpga_rawdev.rst
> rename to doc/guides/rawdevs/ifpga.rst
> diff --git a/doc/guides/rawdevs/index.rst b/doc/guides/rawdevs/index.rst
> index fad951637..22bc013ce 100644
> --- a/doc/guides/rawdevs/index.rst
> +++ b/doc/guides/rawdevs/index.rst
> @@ -13,7 +13,7 @@ application through rawdev API.
>
> dpaa2_cmdif
> dpaa2_qdma
> - ifpga_rawdev
> - ioat_rawdev
> + ifpga
> + ioat
> ntb
> octeontx2_dma
> diff --git a/doc/guides/rawdevs/ioat_rawdev.rst
> b/doc/guides/rawdevs/ioat.rst similarity index 100% rename from
> doc/guides/rawdevs/ioat_rawdev.rst
> rename to doc/guides/rawdevs/ioat.rst
> diff --git a/drivers/raw/Makefile b/drivers/raw/Makefile index
> 879fcca61..0b6d13d03 100644
> --- a/drivers/raw/Makefile
> +++ b/drivers/raw/Makefile
> @@ -4,12 +4,12 @@
> include $(RTE_SDK)/mk/rte.vars.mk
>
> # DIRS-$(<configuration>) += <directory>
> -DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) +=
> skeleton_rawdev
> +DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton
> ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy)
> DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) +=
> dpaa2_cmdif
> DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) +=
> dpaa2_qdma endif
> -DIRS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += ifpga_rawdev
> +DIRS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += ifpga
> DIRS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat
> DIRS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += ntb
> DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) +=
> octeontx2_dma diff --git a/drivers/raw/ifpga_rawdev/Makefile
> b/drivers/raw/ifpga/Makefile similarity index 86% rename from
> drivers/raw/ifpga_rawdev/Makefile rename to drivers/raw/ifpga/Makefile
> index f60b547d8..5fa9303d5 100644
> --- a/drivers/raw/ifpga_rawdev/Makefile
> +++ b/drivers/raw/ifpga/Makefile
> @@ -21,13 +21,13 @@ LDLIBS += -lrte_kvargs LDLIBS += -lrte_bus_pci
> LDLIBS += -lrte_bus_ifpga
>
> -EXPORT_MAP := rte_pmd_ifpga_rawdev_version.map
> +EXPORT_MAP := rte_pmd_ifpga_version.map
>
> LIBABIVER := 1
>
> VPATH += $(SRCDIR)/base
>
> -include $(RTE_SDK)/drivers/raw/ifpga_rawdev/base/Makefile
> +include $(RTE_SDK)/drivers/raw/ifpga/base/Makefile
>
> #
> # all source are stored in SRCS-y
> diff --git a/drivers/raw/ifpga_rawdev/base/Makefile
> b/drivers/raw/ifpga/base/Makefile similarity index 100% rename from
> drivers/raw/ifpga_rawdev/base/Makefile
> rename to drivers/raw/ifpga/base/Makefile diff --git
> a/drivers/raw/ifpga_rawdev/base/README
> b/drivers/raw/ifpga/base/README similarity index 100% rename from
> drivers/raw/ifpga_rawdev/base/README
> rename to drivers/raw/ifpga/base/README
> diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_api.c
> b/drivers/raw/ifpga/base/ifpga_api.c
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/ifpga_api.c
> rename to drivers/raw/ifpga/base/ifpga_api.c
> diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_api.h
> b/drivers/raw/ifpga/base/ifpga_api.h
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/ifpga_api.h
> rename to drivers/raw/ifpga/base/ifpga_api.h
> diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_compat.h
> b/drivers/raw/ifpga/base/ifpga_compat.h
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/ifpga_compat.h
> rename to drivers/raw/ifpga/base/ifpga_compat.h
> diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_defines.h
> b/drivers/raw/ifpga/base/ifpga_defines.h
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/ifpga_defines.h
> rename to drivers/raw/ifpga/base/ifpga_defines.h
> diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c
> b/drivers/raw/ifpga/base/ifpga_enumerate.c
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c
> rename to drivers/raw/ifpga/base/ifpga_enumerate.c
> diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_enumerate.h
> b/drivers/raw/ifpga/base/ifpga_enumerate.h
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/ifpga_enumerate.h
> rename to drivers/raw/ifpga/base/ifpga_enumerate.h
> diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.c
> b/drivers/raw/ifpga/base/ifpga_feature_dev.c
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.c
> rename to drivers/raw/ifpga/base/ifpga_feature_dev.c
> diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h
> b/drivers/raw/ifpga/base/ifpga_feature_dev.h
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h
> rename to drivers/raw/ifpga/base/ifpga_feature_dev.h
> diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme.c
> b/drivers/raw/ifpga/base/ifpga_fme.c
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/ifpga_fme.c
> rename to drivers/raw/ifpga/base/ifpga_fme.c
> diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme_dperf.c
> b/drivers/raw/ifpga/base/ifpga_fme_dperf.c
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/ifpga_fme_dperf.c
> rename to drivers/raw/ifpga/base/ifpga_fme_dperf.c
> diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme_error.c
> b/drivers/raw/ifpga/base/ifpga_fme_error.c
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/ifpga_fme_error.c
> rename to drivers/raw/ifpga/base/ifpga_fme_error.c
> diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme_iperf.c
> b/drivers/raw/ifpga/base/ifpga_fme_iperf.c
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/ifpga_fme_iperf.c
> rename to drivers/raw/ifpga/base/ifpga_fme_iperf.c
> diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c
> b/drivers/raw/ifpga/base/ifpga_fme_pr.c
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c
> rename to drivers/raw/ifpga/base/ifpga_fme_pr.c
> diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_hw.h
> b/drivers/raw/ifpga/base/ifpga_hw.h
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/ifpga_hw.h
> rename to drivers/raw/ifpga/base/ifpga_hw.h diff --git
> a/drivers/raw/ifpga_rawdev/base/ifpga_port.c
> b/drivers/raw/ifpga/base/ifpga_port.c
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/ifpga_port.c
> rename to drivers/raw/ifpga/base/ifpga_port.c
> diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_port_error.c
> b/drivers/raw/ifpga/base/ifpga_port_error.c
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/ifpga_port_error.c
> rename to drivers/raw/ifpga/base/ifpga_port_error.c
> diff --git a/drivers/raw/ifpga_rawdev/base/meson.build
> b/drivers/raw/ifpga/base/meson.build
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/meson.build
> rename to drivers/raw/ifpga/base/meson.build
> diff --git a/drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.c
> b/drivers/raw/ifpga/base/opae_at24_eeprom.c
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.c
> rename to drivers/raw/ifpga/base/opae_at24_eeprom.c
> diff --git a/drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.h
> b/drivers/raw/ifpga/base/opae_at24_eeprom.h
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.h
> rename to drivers/raw/ifpga/base/opae_at24_eeprom.h
> diff --git a/drivers/raw/ifpga_rawdev/base/opae_debug.c
> b/drivers/raw/ifpga/base/opae_debug.c
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/opae_debug.c
> rename to drivers/raw/ifpga/base/opae_debug.c
> diff --git a/drivers/raw/ifpga_rawdev/base/opae_debug.h
> b/drivers/raw/ifpga/base/opae_debug.h
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/opae_debug.h
> rename to drivers/raw/ifpga/base/opae_debug.h
> diff --git a/drivers/raw/ifpga_rawdev/base/opae_eth_group.c
> b/drivers/raw/ifpga/base/opae_eth_group.c
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/opae_eth_group.c
> rename to drivers/raw/ifpga/base/opae_eth_group.c
> diff --git a/drivers/raw/ifpga_rawdev/base/opae_eth_group.h
> b/drivers/raw/ifpga/base/opae_eth_group.h
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/opae_eth_group.h
> rename to drivers/raw/ifpga/base/opae_eth_group.h
> diff --git a/drivers/raw/ifpga_rawdev/base/opae_hw_api.c
> b/drivers/raw/ifpga/base/opae_hw_api.c
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/opae_hw_api.c
> rename to drivers/raw/ifpga/base/opae_hw_api.c
> diff --git a/drivers/raw/ifpga_rawdev/base/opae_hw_api.h
> b/drivers/raw/ifpga/base/opae_hw_api.h
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/opae_hw_api.h
> rename to drivers/raw/ifpga/base/opae_hw_api.h
> diff --git a/drivers/raw/ifpga_rawdev/base/opae_i2c.c
> b/drivers/raw/ifpga/base/opae_i2c.c
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/opae_i2c.c
> rename to drivers/raw/ifpga/base/opae_i2c.c diff --git
> a/drivers/raw/ifpga_rawdev/base/opae_i2c.h
> b/drivers/raw/ifpga/base/opae_i2c.h
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/opae_i2c.h
> rename to drivers/raw/ifpga/base/opae_i2c.h diff --git
> a/drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.c
> b/drivers/raw/ifpga/base/opae_ifpga_hw_api.c
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.c
> rename to drivers/raw/ifpga/base/opae_ifpga_hw_api.c
> diff --git a/drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.h
> b/drivers/raw/ifpga/base/opae_ifpga_hw_api.h
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.h
> rename to drivers/raw/ifpga/base/opae_ifpga_hw_api.h
> diff --git a/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c
> b/drivers/raw/ifpga/base/opae_intel_max10.c
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/opae_intel_max10.c
> rename to drivers/raw/ifpga/base/opae_intel_max10.c
> diff --git a/drivers/raw/ifpga_rawdev/base/opae_intel_max10.h
> b/drivers/raw/ifpga/base/opae_intel_max10.h
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/opae_intel_max10.h
> rename to drivers/raw/ifpga/base/opae_intel_max10.h
> diff --git a/drivers/raw/ifpga_rawdev/base/opae_osdep.h
> b/drivers/raw/ifpga/base/opae_osdep.h
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/opae_osdep.h
> rename to drivers/raw/ifpga/base/opae_osdep.h
> diff --git a/drivers/raw/ifpga_rawdev/base/opae_spi.c
> b/drivers/raw/ifpga/base/opae_spi.c
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/opae_spi.c
> rename to drivers/raw/ifpga/base/opae_spi.c diff --git
> a/drivers/raw/ifpga_rawdev/base/opae_spi.h
> b/drivers/raw/ifpga/base/opae_spi.h
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/opae_spi.h
> rename to drivers/raw/ifpga/base/opae_spi.h diff --git
> a/drivers/raw/ifpga_rawdev/base/opae_spi_transaction.c
> b/drivers/raw/ifpga/base/opae_spi_transaction.c
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/opae_spi_transaction.c
> rename to drivers/raw/ifpga/base/opae_spi_transaction.c
> diff --git a/drivers/raw/ifpga_rawdev/base/osdep_raw/osdep_generic.h
> b/drivers/raw/ifpga/base/osdep_raw/osdep_generic.h
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/osdep_raw/osdep_generic.h
> rename to drivers/raw/ifpga/base/osdep_raw/osdep_generic.h
> diff --git a/drivers/raw/ifpga_rawdev/base/osdep_rte/osdep_generic.h
> b/drivers/raw/ifpga/base/osdep_rte/osdep_generic.h
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/base/osdep_rte/osdep_generic.h
> rename to drivers/raw/ifpga/base/osdep_rte/osdep_generic.h
> diff --git a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
> b/drivers/raw/ifpga/ifpga_rawdev.c
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/ifpga_rawdev.c
> rename to drivers/raw/ifpga/ifpga_rawdev.c diff --git
> a/drivers/raw/ifpga_rawdev/ifpga_rawdev.h
> b/drivers/raw/ifpga/ifpga_rawdev.h
> similarity index 100%
> rename from drivers/raw/ifpga_rawdev/ifpga_rawdev.h
> rename to drivers/raw/ifpga/ifpga_rawdev.h diff --git
> a/drivers/raw/ifpga_rawdev/meson.build b/drivers/raw/ifpga/meson.build
> similarity index 100% rename from drivers/raw/ifpga_rawdev/meson.build
> rename to drivers/raw/ifpga/meson.build
> diff --git a/drivers/raw/ifpga_rawdev/rte_pmd_ifpga_rawdev_version.map
> b/drivers/raw/ifpga/rte_pmd_ifpga_version.map
> similarity index 100%
> rename from
> drivers/raw/ifpga_rawdev/rte_pmd_ifpga_rawdev_version.map
> rename to drivers/raw/ifpga/rte_pmd_ifpga_version.map
> diff --git a/drivers/raw/meson.build b/drivers/raw/meson.build index
> c2d034862..bcd5553e1 100644
> --- a/drivers/raw/meson.build
> +++ b/drivers/raw/meson.build
> @@ -2,9 +2,9 @@
> # Copyright 2018 NXP
>
> drivers = ['dpaa2_cmdif', 'dpaa2_qdma',
> - 'ifpga_rawdev', 'ioat', 'ntb',
> + 'ifpga', 'ioat', 'ntb',
> 'octeontx2_dma',
> - 'skeleton_rawdev']
> + 'skeleton']
> std_deps = ['rawdev']
> config_flag_fmt = 'RTE_LIBRTE_PMD_@0@_RAWDEV'
> driver_name_fmt = 'rte_pmd_@0@'
> diff --git a/drivers/raw/skeleton_rawdev/Makefile
> b/drivers/raw/skeleton/Makefile similarity index 91% rename from
> drivers/raw/skeleton_rawdev/Makefile
> rename to drivers/raw/skeleton/Makefile
> index 3f97c2ee0..9641e6505 100644
> --- a/drivers/raw/skeleton_rawdev/Makefile
> +++ b/drivers/raw/skeleton/Makefile
> @@ -15,7 +15,7 @@ LDLIBS += -lrte_rawdev LDLIBS += -lrte_bus_vdev
> LDLIBS += -lrte_kvargs
>
> -EXPORT_MAP := rte_pmd_skeleton_rawdev_version.map
> +EXPORT_MAP := rte_pmd_skeleton_version.map
>
> LIBABIVER := 1
>
> diff --git a/drivers/raw/skeleton_rawdev/meson.build
> b/drivers/raw/skeleton/meson.build
> similarity index 100%
> rename from drivers/raw/skeleton_rawdev/meson.build
> rename to drivers/raw/skeleton/meson.build diff --git
> a/drivers/raw/skeleton_rawdev/rte_pmd_skeleton_rawdev_version.map
> b/drivers/raw/skeleton/rte_pmd_skeleton_version.map
> similarity index 100%
> rename from
> drivers/raw/skeleton_rawdev/rte_pmd_skeleton_rawdev_version.map
> rename to drivers/raw/skeleton/rte_pmd_skeleton_version.map
> diff --git a/drivers/raw/skeleton_rawdev/skeleton_rawdev.c
> b/drivers/raw/skeleton/skeleton_rawdev.c
> similarity index 100%
> rename from drivers/raw/skeleton_rawdev/skeleton_rawdev.c
> rename to drivers/raw/skeleton/skeleton_rawdev.c
> diff --git a/drivers/raw/skeleton_rawdev/skeleton_rawdev.h
> b/drivers/raw/skeleton/skeleton_rawdev.h
> similarity index 100%
> rename from drivers/raw/skeleton_rawdev/skeleton_rawdev.h
> rename to drivers/raw/skeleton/skeleton_rawdev.h
> diff --git a/drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c
> b/drivers/raw/skeleton/skeleton_rawdev_test.c
> similarity index 100%
> rename from drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c
> rename to drivers/raw/skeleton/skeleton_rawdev_test.c
> --
> 2.21.0
Acked-by: Rosen Xu <rosen.xu@intel.com>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [dpdk-dev] [PATCH v2 2/2] drivers/raw: standardize naming
2019-07-30 13:39 ` [dpdk-dev] [PATCH v2 2/2] drivers/raw: standardize naming Thomas Monjalon
@ 2019-07-31 7:29 ` Xu, Rosen
2019-07-31 8:27 ` Thomas Monjalon
0 siblings, 1 reply; 17+ messages in thread
From: Xu, Rosen @ 2019-07-31 7:29 UTC (permalink / raw)
To: Thomas Monjalon, dev, Mcnamara, John, Kovacevic, Marko,
Nipun Gupta, Zhang, Tianfei, Richardson, Bruce, Li, Xiaoyun, Wu,
Jingjing, Satha Rao, Vamsi Attunuru, Shreyansh Jain,
Hemant Agrawal
Cc: Neil Horman
Hi,
I'm okay if it's applied in 19.11.
> -----Original Message-----
> From: Thomas Monjalon [mailto:thomas@monjalon.net]
> Sent: Tuesday, July 30, 2019 21:40
> To: dev@dpdk.org; Mcnamara, John <john.mcnamara@intel.com>;
> Kovacevic, Marko <marko.kovacevic@intel.com>; Nipun Gupta
> <nipun.gupta@nxp.com>; Xu, Rosen <rosen.xu@intel.com>; Zhang, Tianfei
> <tianfei.zhang@intel.com>; Richardson, Bruce
> <bruce.richardson@intel.com>; Li, Xiaoyun <xiaoyun.li@intel.com>; Wu,
> Jingjing <jingjing.wu@intel.com>; Satha Rao <skoteshwar@marvell.com>;
> Vamsi Attunuru <vattunuru@marvell.com>; Shreyansh Jain
> <shreyansh.jain@nxp.com>; Hemant Agrawal <hemant.agrawal@nxp.com>
> Cc: Neil Horman <nhorman@tuxdriver.com>
> Subject: [PATCH v2 2/2] drivers/raw: standardize naming
>
> From: Bruce Richardson <bruce.richardson@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.richardson@intel.com>
> Signed-off-by: Thomas Monjalon <thomas@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.xu@intel.com>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [dpdk-dev] [PATCH v2 2/2] drivers/raw: standardize naming
2019-07-31 7:29 ` Xu, Rosen
@ 2019-07-31 8:27 ` Thomas Monjalon
0 siblings, 0 replies; 17+ messages in thread
From: Thomas Monjalon @ 2019-07-31 8:27 UTC (permalink / raw)
To: Xu, Rosen
Cc: dev, Mcnamara, John, Kovacevic, Marko, Nipun Gupta, Zhang,
Tianfei, Richardson, Bruce, Li, Xiaoyun, Wu, Jingjing, Satha Rao,
Vamsi Attunuru, Shreyansh Jain, Hemant Agrawal, Neil Horman
31/07/2019 09:29, Xu, Rosen:
> Hi,
>
> I'm okay if it's applied in 19.11.
It is already applied in 19.08-rc3.
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2019-07-31 8:28 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-05 9:33 [dpdk-dev] [RFC PATCH 0/2] standardize rawdev names Bruce Richardson
2019-07-05 9:34 ` [dpdk-dev] [RFC PATCH 1/2] drivers/raw: remove rawdev from driver directory names Bruce Richardson
2019-07-05 9:34 ` [dpdk-dev] [RFC PATCH 2/2] drivers/raw: standardize name format of rawdev drivers Bruce Richardson
2019-07-05 9:35 ` [dpdk-dev] [RFC PATCH 0/2] standardize rawdev names Bruce Richardson
2019-07-05 9:38 ` Thomas Monjalon
2019-07-05 9:39 ` Thomas Monjalon
2019-07-30 8:17 ` Thomas Monjalon
2019-07-30 9:42 ` Bruce Richardson
2019-07-30 12:20 ` Neil Horman
2019-07-30 13:28 ` Thomas Monjalon
2019-07-30 13:39 ` [dpdk-dev] [PATCH v2 " Thomas Monjalon
2019-07-30 13:39 ` [dpdk-dev] [PATCH v2 1/2] drivers/raw: remove rawdev from directory names Thomas Monjalon
2019-07-31 7:28 ` Xu, Rosen
2019-07-30 13:39 ` [dpdk-dev] [PATCH v2 2/2] drivers/raw: standardize naming Thomas Monjalon
2019-07-31 7:29 ` Xu, Rosen
2019-07-31 8:27 ` Thomas Monjalon
2019-07-30 17:44 ` [dpdk-dev] [PATCH v2 0/2] standardize rawdev names Thomas Monjalon
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.