standardize rawdev names
cover standardize rawdev names
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%)Signature · 1 line
2.21.0
RFC PATCH 1/2 drivers/raw: remove rawdev from driver directory names
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.
---
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%)drivers/raw/Makefile +2 -2
@@ -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
drivers/raw/ifpga/Makefile renamed from drivers/raw/ifpga_rawdev/Makefile +2 -2
@@ -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
drivers/raw/ifpga/base/Makefile renamed from drivers/raw/ifpga_rawdev/base/Makefile +0 -0
drivers/raw/ifpga/base/README renamed from drivers/raw/ifpga_rawdev/base/README +0 -0
drivers/raw/ifpga/base/ifpga_api.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_api.c +0 -0
drivers/raw/ifpga/base/ifpga_api.h renamed from drivers/raw/ifpga_rawdev/base/ifpga_api.h +0 -0
drivers/raw/ifpga/base/ifpga_compat.h renamed from drivers/raw/ifpga_rawdev/base/ifpga_compat.h +0 -0
drivers/raw/ifpga/base/ifpga_defines.h renamed from drivers/raw/ifpga_rawdev/base/ifpga_defines.h +0 -0
drivers/raw/ifpga/base/ifpga_enumerate.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c +0 -0
drivers/raw/ifpga/base/ifpga_enumerate.h renamed from drivers/raw/ifpga_rawdev/base/ifpga_enumerate.h +0 -0
drivers/raw/ifpga/base/ifpga_feature_dev.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.c +0 -0
drivers/raw/ifpga/base/ifpga_feature_dev.h renamed from drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h +0 -0
drivers/raw/ifpga/base/ifpga_fme.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_fme.c +0 -0
drivers/raw/ifpga/base/ifpga_fme_dperf.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_fme_dperf.c +0 -0
drivers/raw/ifpga/base/ifpga_fme_error.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_fme_error.c +0 -0
drivers/raw/ifpga/base/ifpga_fme_iperf.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_fme_iperf.c +0 -0
drivers/raw/ifpga/base/ifpga_fme_pr.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c +0 -0
drivers/raw/ifpga/base/ifpga_hw.h renamed from drivers/raw/ifpga_rawdev/base/ifpga_hw.h +0 -0
drivers/raw/ifpga/base/ifpga_port.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_port.c +0 -0
drivers/raw/ifpga/base/ifpga_port_error.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_port_error.c +0 -0
drivers/raw/ifpga/base/meson.build renamed from drivers/raw/ifpga_rawdev/base/meson.build +0 -0
drivers/raw/ifpga/base/opae_at24_eeprom.c renamed from drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.c +0 -0
drivers/raw/ifpga/base/opae_at24_eeprom.h renamed from drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.h +0 -0
drivers/raw/ifpga/base/opae_debug.c renamed from drivers/raw/ifpga_rawdev/base/opae_debug.c +0 -0
drivers/raw/ifpga/base/opae_debug.h renamed from drivers/raw/ifpga_rawdev/base/opae_debug.h +0 -0
drivers/raw/ifpga/base/opae_eth_group.c renamed from drivers/raw/ifpga_rawdev/base/opae_eth_group.c +0 -0
drivers/raw/ifpga/base/opae_eth_group.h renamed from drivers/raw/ifpga_rawdev/base/opae_eth_group.h +0 -0
drivers/raw/ifpga/base/opae_hw_api.c renamed from drivers/raw/ifpga_rawdev/base/opae_hw_api.c +0 -0
drivers/raw/ifpga/base/opae_hw_api.h renamed from drivers/raw/ifpga_rawdev/base/opae_hw_api.h +0 -0
drivers/raw/ifpga/base/opae_i2c.c renamed from drivers/raw/ifpga_rawdev/base/opae_i2c.c +0 -0
drivers/raw/ifpga/base/opae_i2c.h renamed from drivers/raw/ifpga_rawdev/base/opae_i2c.h +0 -0
drivers/raw/ifpga/base/opae_ifpga_hw_api.c renamed from drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.c +0 -0
drivers/raw/ifpga/base/opae_ifpga_hw_api.h renamed from drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.h +0 -0
drivers/raw/ifpga/base/opae_intel_max10.c renamed from drivers/raw/ifpga_rawdev/base/opae_intel_max10.c +0 -0
drivers/raw/ifpga/base/opae_intel_max10.h renamed from drivers/raw/ifpga_rawdev/base/opae_intel_max10.h +0 -0
drivers/raw/ifpga/base/opae_osdep.h renamed from drivers/raw/ifpga_rawdev/base/opae_osdep.h +0 -0
drivers/raw/ifpga/base/opae_spi.c renamed from drivers/raw/ifpga_rawdev/base/opae_spi.c +0 -0
drivers/raw/ifpga/base/opae_spi.h renamed from drivers/raw/ifpga_rawdev/base/opae_spi.h +0 -0
drivers/raw/ifpga/base/opae_spi_transaction.c renamed from drivers/raw/ifpga_rawdev/base/opae_spi_transaction.c +0 -0
drivers/raw/ifpga/base/osdep_raw/osdep_generic.h renamed from drivers/raw/ifpga_rawdev/base/osdep_raw/osdep_generic.h +0 -0
drivers/raw/ifpga/base/osdep_rte/osdep_generic.h renamed from drivers/raw/ifpga_rawdev/base/osdep_rte/osdep_generic.h +0 -0
drivers/raw/ifpga/ifpga_rawdev.c renamed from drivers/raw/ifpga_rawdev/ifpga_rawdev.c +0 -0
drivers/raw/ifpga/ifpga_rawdev.h renamed from drivers/raw/ifpga_rawdev/ifpga_rawdev.h +0 -0
drivers/raw/ifpga/meson.build renamed from drivers/raw/ifpga_rawdev/meson.build +0 -0
drivers/raw/ifpga/rte_pmd_ifpga_version.map renamed from drivers/raw/ifpga_rawdev/rte_pmd_ifpga_rawdev_version.map +0 -0
drivers/raw/meson.build +2 -2
@@ -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@'
drivers/raw/skeleton/Makefile renamed from drivers/raw/skeleton_rawdev/Makefile +1 -1
@@ -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
drivers/raw/skeleton/meson.build renamed from drivers/raw/skeleton_rawdev/meson.build +0 -0
drivers/raw/skeleton/rte_pmd_skeleton_version.map renamed from drivers/raw/skeleton_rawdev/rte_pmd_skeleton_rawdev_version.map +0 -0
drivers/raw/skeleton/skeleton_rawdev.c renamed from drivers/raw/skeleton_rawdev/skeleton_rawdev.c +0 -0
drivers/raw/skeleton/skeleton_rawdev.h renamed from drivers/raw/skeleton_rawdev/skeleton_rawdev.h +0 -0
drivers/raw/skeleton/skeleton_rawdev_test.c renamed from drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c +0 -0
Signature · 1 line
2.21.0
RFC PATCH 2/2 drivers/raw: standardize name format of rawdev drivers
In reply to Bruce RichardsonThe 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.
---
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%)drivers/raw/dpaa2_cmdif/Makefile +2 -2
@@ -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
drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map renamed from drivers/raw/dpaa2_cmdif/rte_pmd_dpaa2_cmdif_version.map +0 -0
drivers/raw/dpaa2_qdma/Makefile +2 -2
@@ -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
drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map renamed from drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma_version.map +0 -0
drivers/raw/ifpga/Makefile +2 -2
@@ -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
drivers/raw/ifpga/rte_rawdev_ifpga_version.map renamed from drivers/raw/ifpga/rte_pmd_ifpga_version.map +0 -0
drivers/raw/ioat/Makefile +2 -2
@@ -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
drivers/raw/ioat/rte_rawdev_ioat_version.map renamed from drivers/raw/ioat/rte_pmd_ioat_version.map +0 -0
drivers/raw/meson.build +1 -1
@@ -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@'
drivers/raw/skeleton/Makefile +2 -2
@@ -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
drivers/raw/skeleton/rte_rawdev_skeleton_version.map renamed from drivers/raw/skeleton/rte_pmd_skeleton_version.map +0 -0
mk/rte.app.mk +5 -5
@@ -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
Signature · 1 line
2.21.0
Quoted 8 lines · 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.
Quoted 8 lines
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 namesdrivers/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?
05/07/2019 11:35, Bruce Richardson:
Quoted 14 lines · Bruce Richardson
Quoted 13 lines
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.
Quoted 5 lines
Quoted 3 lines
Bruce Richardson (2):
drivers/raw: remove rawdev from driver directory namesdrivers/raw: standardize name format of rawdev driversSince 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?
05/07/2019 11:38, Thomas Monjalon:
Quoted 15 lines
05/07/2019 11:35, Bruce Richardson:
Quoted 14 lines · Bruce Richardson
Quoted 13 lines
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.
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
Bruce Richardson (2):
drivers/raw: remove rawdev from driver directory namesdrivers/raw: standardize name format of rawdev driversSince 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
05/07/2019 11:39, Thomas Monjalon:
Quoted 19 lines
05/07/2019 11:38, Thomas Monjalon:
Quoted 18 lines
05/07/2019 11:35, Bruce Richardson:
Quoted 17 lines · Bruce Richardson
Quoted 16 lines
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 namesdrivers/raw: standardize name format of rawdev drivers
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
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?
Quoted 23 lines · Thomas Monjalon
05/07/2019 11:39, Thomas Monjalon:
Quoted 22 lines
05/07/2019 11:38, Thomas Monjalon:
Quoted 21 lines
05/07/2019 11:35, Bruce Richardson:
Quoted 19 lines · Bruce Richardson
Quoted 8 lines
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.Quoted 8 lines
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 namesdrivers/raw: standardize name format of rawdev driversSince 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?
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
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
Quoted 23 lines · Thomas Monjalon
05/07/2019 11:39, Thomas Monjalon:
Quoted 22 lines
05/07/2019 11:38, Thomas Monjalon:
Quoted 21 lines
05/07/2019 11:35, Bruce Richardson:
Quoted 19 lines · Bruce Richardson
Quoted 8 lines
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.Quoted 8 lines
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 namesdrivers/raw: standardize name format of rawdev driversSince 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?
Quoted 10 lines
Quoted 4 lines
Quoted 2 lines
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
30/07/2019 14:20, Neil Horman:
Quoted 34 lines · Thomas Monjalon
Quoted 23 lines
05/07/2019 11:39, Thomas Monjalon:
Quoted 22 lines
05/07/2019 11:38, Thomas Monjalon:
Quoted 21 lines
05/07/2019 11:35, Bruce Richardson:
Quoted 19 lines · Bruce Richardson
Quoted 8 lines
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.Quoted 8 lines
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 namesdrivers/raw: standardize name format of rawdev driversSince 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?
Quoted 10 lines
Quoted 4 lines
Quoted 2 lines
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?
Quoted 4 lines
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
Quoted 3 lines
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.
v2 cover standardize rawdev names
In reply to Bruce RichardsonThe 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%)Signature · 1 line
2.21.0
PATCH v2 1/2 drivers/raw: remove rawdev from directory names
From: Bruce Richardson <[email protected]>
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.
---
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%)MAINTAINERS +4 -4
@@ -449,7 +449,7 @@ Raw device API - EXPERIMENTAL M: Shreyansh Jain <[email protected]> M: Hemant Agrawal <[email protected]> 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 <[email protected]> M: Tianfei zhang <[email protected]> -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 <[email protected]> F: drivers/raw/ioat/ -F: doc/guides/rawdevs/ioat_rawdev.rst +F: doc/guides/rawdevs/ioat.rst NXP DPAA2 QDMA M: Nipun Gupta <[email protected]>
doc/guides/rawdevs/ifpga.rst renamed from doc/guides/rawdevs/ifpga_rawdev.rst +0 -0
doc/guides/rawdevs/index.rst +2 -2
@@ -13,7 +13,7 @@ application through rawdev API. dpaa2_cmdif dpaa2_qdma - ifpga_rawdev - ioat_rawdev + ifpga + ioat ntb octeontx2_dma
doc/guides/rawdevs/ioat.rst renamed from doc/guides/rawdevs/ioat_rawdev.rst +0 -0
drivers/raw/Makefile +2 -2
@@ -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
drivers/raw/ifpga/Makefile renamed from drivers/raw/ifpga_rawdev/Makefile +2 -2
@@ -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
drivers/raw/ifpga/base/Makefile renamed from drivers/raw/ifpga_rawdev/base/Makefile +0 -0
drivers/raw/ifpga/base/README renamed from drivers/raw/ifpga_rawdev/base/README +0 -0
drivers/raw/ifpga/base/ifpga_api.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_api.c +0 -0
drivers/raw/ifpga/base/ifpga_api.h renamed from drivers/raw/ifpga_rawdev/base/ifpga_api.h +0 -0
drivers/raw/ifpga/base/ifpga_compat.h renamed from drivers/raw/ifpga_rawdev/base/ifpga_compat.h +0 -0
drivers/raw/ifpga/base/ifpga_defines.h renamed from drivers/raw/ifpga_rawdev/base/ifpga_defines.h +0 -0
drivers/raw/ifpga/base/ifpga_enumerate.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c +0 -0
drivers/raw/ifpga/base/ifpga_enumerate.h renamed from drivers/raw/ifpga_rawdev/base/ifpga_enumerate.h +0 -0
drivers/raw/ifpga/base/ifpga_feature_dev.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.c +0 -0
drivers/raw/ifpga/base/ifpga_feature_dev.h renamed from drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h +0 -0
drivers/raw/ifpga/base/ifpga_fme.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_fme.c +0 -0
drivers/raw/ifpga/base/ifpga_fme_dperf.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_fme_dperf.c +0 -0
drivers/raw/ifpga/base/ifpga_fme_error.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_fme_error.c +0 -0
drivers/raw/ifpga/base/ifpga_fme_iperf.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_fme_iperf.c +0 -0
drivers/raw/ifpga/base/ifpga_fme_pr.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c +0 -0
drivers/raw/ifpga/base/ifpga_hw.h renamed from drivers/raw/ifpga_rawdev/base/ifpga_hw.h +0 -0
drivers/raw/ifpga/base/ifpga_port.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_port.c +0 -0
drivers/raw/ifpga/base/ifpga_port_error.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_port_error.c +0 -0
drivers/raw/ifpga/base/meson.build renamed from drivers/raw/ifpga_rawdev/base/meson.build +0 -0
drivers/raw/ifpga/base/opae_at24_eeprom.c renamed from drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.c +0 -0
drivers/raw/ifpga/base/opae_at24_eeprom.h renamed from drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.h +0 -0
drivers/raw/ifpga/base/opae_debug.c renamed from drivers/raw/ifpga_rawdev/base/opae_debug.c +0 -0
drivers/raw/ifpga/base/opae_debug.h renamed from drivers/raw/ifpga_rawdev/base/opae_debug.h +0 -0
drivers/raw/ifpga/base/opae_eth_group.c renamed from drivers/raw/ifpga_rawdev/base/opae_eth_group.c +0 -0
drivers/raw/ifpga/base/opae_eth_group.h renamed from drivers/raw/ifpga_rawdev/base/opae_eth_group.h +0 -0
drivers/raw/ifpga/base/opae_hw_api.c renamed from drivers/raw/ifpga_rawdev/base/opae_hw_api.c +0 -0
drivers/raw/ifpga/base/opae_hw_api.h renamed from drivers/raw/ifpga_rawdev/base/opae_hw_api.h +0 -0
drivers/raw/ifpga/base/opae_i2c.c renamed from drivers/raw/ifpga_rawdev/base/opae_i2c.c +0 -0
drivers/raw/ifpga/base/opae_i2c.h renamed from drivers/raw/ifpga_rawdev/base/opae_i2c.h +0 -0
drivers/raw/ifpga/base/opae_ifpga_hw_api.c renamed from drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.c +0 -0
drivers/raw/ifpga/base/opae_ifpga_hw_api.h renamed from drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.h +0 -0
drivers/raw/ifpga/base/opae_intel_max10.c renamed from drivers/raw/ifpga_rawdev/base/opae_intel_max10.c +0 -0
drivers/raw/ifpga/base/opae_intel_max10.h renamed from drivers/raw/ifpga_rawdev/base/opae_intel_max10.h +0 -0
drivers/raw/ifpga/base/opae_osdep.h renamed from drivers/raw/ifpga_rawdev/base/opae_osdep.h +0 -0
drivers/raw/ifpga/base/opae_spi.c renamed from drivers/raw/ifpga_rawdev/base/opae_spi.c +0 -0
drivers/raw/ifpga/base/opae_spi.h renamed from drivers/raw/ifpga_rawdev/base/opae_spi.h +0 -0
drivers/raw/ifpga/base/opae_spi_transaction.c renamed from drivers/raw/ifpga_rawdev/base/opae_spi_transaction.c +0 -0
drivers/raw/ifpga/base/osdep_raw/osdep_generic.h renamed from drivers/raw/ifpga_rawdev/base/osdep_raw/osdep_generic.h +0 -0
drivers/raw/ifpga/base/osdep_rte/osdep_generic.h renamed from drivers/raw/ifpga_rawdev/base/osdep_rte/osdep_generic.h +0 -0
drivers/raw/ifpga/ifpga_rawdev.c renamed from drivers/raw/ifpga_rawdev/ifpga_rawdev.c +0 -0
drivers/raw/ifpga/ifpga_rawdev.h renamed from drivers/raw/ifpga_rawdev/ifpga_rawdev.h +0 -0
drivers/raw/ifpga/meson.build renamed from drivers/raw/ifpga_rawdev/meson.build +0 -0
drivers/raw/ifpga/rte_pmd_ifpga_version.map renamed from drivers/raw/ifpga_rawdev/rte_pmd_ifpga_rawdev_version.map +0 -0
drivers/raw/meson.build +2 -2
@@ -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@'
drivers/raw/skeleton/Makefile renamed from drivers/raw/skeleton_rawdev/Makefile +1 -1
@@ -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
drivers/raw/skeleton/meson.build renamed from drivers/raw/skeleton_rawdev/meson.build +0 -0
drivers/raw/skeleton/rte_pmd_skeleton_version.map renamed from drivers/raw/skeleton_rawdev/rte_pmd_skeleton_rawdev_version.map +0 -0
drivers/raw/skeleton/skeleton_rawdev.c renamed from drivers/raw/skeleton_rawdev/skeleton_rawdev.c +0 -0
drivers/raw/skeleton/skeleton_rawdev.h renamed from drivers/raw/skeleton_rawdev/skeleton_rawdev.h +0 -0
drivers/raw/skeleton/skeleton_rawdev_test.c renamed from drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c +0 -0
Signature · 1 line
2.21.0
Re: [dpdk-dev] [PATCH v2 1/2] drivers/raw: remove rawdev from directory names
Hi,
Quoted 503 lines
-----Original Message-----
From: Thomas Monjalon [mailto:[email protected]]
Sent: Tuesday, July 30, 2019 21:40
To: [email protected]; Xu, Rosen <[email protected]>; Zhang, Tianfei <[email protected]>; Mcnamara, John <[email protected]>; Kovacevic, Marko <[email protected]>; Richardson, Bruce <[email protected]>; Shreyansh Jain <[email protected]>; Hemant Agrawal <[email protected]>
Cc: Neil Horman <[email protected]>
Subject: [PATCH v2 1/2]drivers/raw: remove rawdev from directory namesFrom: Bruce Richardson <[email protected]>
The ifpga and skeleton rawdev drivers included "rawdev" in their directory names, which was superfluous given that they were in the
drivers/rawdirectory. 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 <[email protected]>Signed-off-by Thomas Monjalon <[email protected]>--- 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%) renamedoc/guides/rawdevs/{ioat_rawdev.rst=>ioat.rst} (100%) renamedrivers/raw/{ifpga_rawdev=> ifpga}/Makefile (86%) renamedrivers/raw/{ifpga_rawdev=> ifpga}/base/Makefile (100%) renamedrivers/raw/{ifpga_rawdev=> ifpga}/base/README (100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/ifpga_api.c(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/ifpga_api.h(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/ifpga_compat.h(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/ifpga_defines.h(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/ifpga_enumerate.c(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/ifpga_enumerate.h(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/ifpga_feature_dev.c(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/ifpga_feature_dev.h(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/ifpga_fme.c(100%) renamedrivers/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%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/ifpga_hw.h(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/ifpga_port.c(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/ifpga_port_error.c(100%) renamedrivers/raw/{ifpga_rawdev=> ifpga}/base/meson.build (100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/opae_at24_eeprom.c(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/opae_at24_eeprom.h(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/opae_debug.c(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/opae_debug.h(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/opae_eth_group.c(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/opae_eth_group.h(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/opae_hw_api.c(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/opae_hw_api.h(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/opae_i2c.c(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/opae_i2c.h(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/opae_ifpga_hw_api.c(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/opae_ifpga_hw_api.h(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/opae_intel_max10.c(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/opae_intel_max10.h(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/opae_osdep.h(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/opae_spi.c(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/opae_spi.h(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/opae_spi_transaction.c(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/osdep_raw/osdep_generic.h(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/base/osdep_rte/osdep_generic.h(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/ifpga_rawdev.c(100%) renamedrivers/raw/{ifpga_rawdev=>ifpga}/ifpga_rawdev.h(100%) renamedrivers/raw/{ifpga_rawdev=> ifpga}/meson.build (100%) renamedrivers/raw/{ifpga_rawdev/rte_pmd_ifpga_rawdev_version.map=> ifpga/rte_pmd_ifpga_version.map} (100%) renamedrivers/raw/{skeleton_rawdev=> skeleton}/Makefile (91%) renamedrivers/raw/{skeleton_rawdev=> skeleton}/meson.build (100%) renamedrivers/raw/{skeleton_rawdev/rte_pmd_skeleton_rawdev_version.map=> skeleton/rte_pmd_skeleton_version.map} (100%) renamedrivers/raw/{skeleton_rawdev=>skeleton}/skeleton_rawdev.c(100%) renamedrivers/raw/{skeleton_rawdev=>skeleton}/skeleton_rawdev.h(100%) renamedrivers/raw/{skeleton_rawdev=>skeleton}/skeleton_rawdev_test.c(100%)MAINTAINERS +4
-4@@ -449,7 +449,7 @@ Raw device API - EXPERIMENTAL M: Shreyansh Jain <[email protected]> M: Hemant Agrawal <[email protected]> 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 <[email protected]> M: Tianfei zhang <[email protected]> -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 <[email protected]> F: drivers/raw/ioat/ -F: doc/guides/rawdevs/ioat_rawdev.rst +F: doc/guides/rawdevs/ioat.rst NXP DPAA2 QDMA M: Nipun Gupta <[email protected]>(quoted diff) +0
-0
b/doc/guides/rawdevs/ifpga.rstsimilarity index 100% rename fromdoc/guides/rawdevs/ifpga_rawdev.rst
rename todoc/guides/rawdevs/ifpga.rstdoc/guides/rawdevs/index.rst +2
-2@@ -13,7 +13,7 @@ application through rawdev API. dpaa2_cmdif dpaa2_qdma - ifpga_rawdev - ioat_rawdev + ifpga + ioat ntb octeontx2_dma(quoted diff) +0
-0
b/doc/guides/rawdevs/ioat.rstsimilarity index 100% rename fromdoc/guides/rawdevs/ioat_rawdev.rst
rename todoc/guides/rawdevs/ioat.rstdrivers/raw/Makefile index renamed from drivers/raw/Makefile +0
-0
879fcca61..0b6d13d03100644drivers/raw/Makefile +0
-1@@ -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_qdmaendifdrivers/raw/Makefile +1
-1-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_dmadiff --git a/drivers/raw/ifpga_rawdev/Makefile b/drivers/raw/ifpga/Makefile similarity index 86% rename fromdrivers/raw/ifpga_rawdev/Makefilerename todrivers/raw/ifpga/Makefileindexf60b547d8..5fa9303d5100644drivers/raw/ifpga/Makefile renamed from drivers/raw/ifpga_rawdev/Makefile +0
-0@@ -21,13 +21,13 @@ LDLIBS += -lrte_kvargs LDLIBS += -lrte_bus_pciLDLIBS += -lrte_bus_ifpga
drivers/raw/ifpga/Makefile renamed from drivers/raw/ifpga_rawdev/Makefile +2
-2-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(quoted diff) +0
-0b/drivers/raw/ifpga/base/Makefile similarity index 100% rename from
drivers/raw/ifpga_rawdev/base/Makefile
rename todrivers/raw/ifpga/base/Makefilediff --git a/drivers/raw/ifpga_rawdev/base/README b/drivers/raw/ifpga/base/README similarity index 100% rename fromdrivers/raw/ifpga_rawdev/base/README
rename todrivers/raw/ifpga/base/READMEdrivers/raw/ifpga/base/ifpga_api.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_api.c +0
-0drivers/raw/ifpga/base/ifpga_api.h renamed from drivers/raw/ifpga_rawdev/base/ifpga_api.h +0
-0drivers/raw/ifpga/base/ifpga_compat.h renamed from drivers/raw/ifpga_rawdev/base/ifpga_compat.h +0
-0drivers/raw/ifpga/base/ifpga_defines.h renamed from drivers/raw/ifpga_rawdev/base/ifpga_defines.h +0
-0drivers/raw/ifpga/base/ifpga_enumerate.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c +0
-0drivers/raw/ifpga/base/ifpga_enumerate.h renamed from drivers/raw/ifpga_rawdev/base/ifpga_enumerate.h +0
-0drivers/raw/ifpga/base/ifpga_feature_dev.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.c +0
-0drivers/raw/ifpga/base/ifpga_feature_dev.h renamed from drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h +0
-0drivers/raw/ifpga/base/ifpga_fme.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_fme.c +0
-0drivers/raw/ifpga/base/ifpga_fme_dperf.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_fme_dperf.c +0
-0drivers/raw/ifpga/base/ifpga_fme_error.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_fme_error.c +0
-0drivers/raw/ifpga/base/ifpga_fme_iperf.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_fme_iperf.c +0
-0drivers/raw/ifpga/base/ifpga_fme_pr.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c +0
-0drivers/raw/ifpga/base/ifpga_hw.h diff --git renamed from drivers/raw/ifpga_rawdev/base/ifpga_hw.h +0
-0
a/drivers/raw/ifpga_rawdev/base/ifpga_port.cb/drivers/raw/ifpga/base/ifpga_port.csimilarity index 100%
rename fromdrivers/raw/ifpga_rawdev/base/ifpga_port.crename todrivers/raw/ifpga/base/ifpga_port.cdrivers/raw/ifpga/base/ifpga_port_error.c renamed from drivers/raw/ifpga_rawdev/base/ifpga_port_error.c +0
-0drivers/raw/ifpga/base/meson.build renamed from drivers/raw/ifpga_rawdev/base/meson.build +0
-0drivers/raw/ifpga/base/opae_at24_eeprom.c renamed from drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.c +0
-0drivers/raw/ifpga/base/opae_at24_eeprom.h renamed from drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.h +0
-0drivers/raw/ifpga/base/opae_debug.c renamed from drivers/raw/ifpga_rawdev/base/opae_debug.c +0
-0drivers/raw/ifpga/base/opae_debug.h renamed from drivers/raw/ifpga_rawdev/base/opae_debug.h +0
-0drivers/raw/ifpga/base/opae_eth_group.c renamed from drivers/raw/ifpga_rawdev/base/opae_eth_group.c +0
-0drivers/raw/ifpga/base/opae_eth_group.h renamed from drivers/raw/ifpga_rawdev/base/opae_eth_group.h +0
-0drivers/raw/ifpga/base/opae_hw_api.c renamed from drivers/raw/ifpga_rawdev/base/opae_hw_api.c +0
-0drivers/raw/ifpga/base/opae_hw_api.h renamed from drivers/raw/ifpga_rawdev/base/opae_hw_api.h +0
-0drivers/raw/ifpga/base/opae_i2c.c diff --git renamed from drivers/raw/ifpga_rawdev/base/opae_i2c.c +0
-0
a/drivers/raw/ifpga_rawdev/base/opae_i2c.hb/drivers/raw/ifpga/base/opae_i2c.h
similarity index 100%
rename fromdrivers/raw/ifpga_rawdev/base/opae_i2c.hrename todrivers/raw/ifpga/base/opae_i2c.hdiff --gita/drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.cb/drivers/raw/ifpga/base/opae_ifpga_hw_api.csimilarity index 100%
rename fromdrivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.crename todrivers/raw/ifpga/base/opae_ifpga_hw_api.cdrivers/raw/ifpga/base/opae_ifpga_hw_api.h renamed from drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.h +0
-0drivers/raw/ifpga/base/opae_intel_max10.c renamed from drivers/raw/ifpga_rawdev/base/opae_intel_max10.c +0
-0drivers/raw/ifpga/base/opae_intel_max10.h renamed from drivers/raw/ifpga_rawdev/base/opae_intel_max10.h +0
-0drivers/raw/ifpga/base/opae_osdep.h renamed from drivers/raw/ifpga_rawdev/base/opae_osdep.h +0
-0drivers/raw/ifpga/base/opae_spi.c diff --git renamed from drivers/raw/ifpga_rawdev/base/opae_spi.c +0
-0
a/drivers/raw/ifpga_rawdev/base/opae_spi.hb/drivers/raw/ifpga/base/opae_spi.h
similarity index 100%
rename fromdrivers/raw/ifpga_rawdev/base/opae_spi.hrename todrivers/raw/ifpga/base/opae_spi.hdiff --gita/drivers/raw/ifpga_rawdev/base/opae_spi_transaction.cb/drivers/raw/ifpga/base/opae_spi_transaction.csimilarity index 100%
rename fromdrivers/raw/ifpga_rawdev/base/opae_spi_transaction.crename todrivers/raw/ifpga/base/opae_spi_transaction.cdrivers/raw/ifpga/base/osdep_raw/osdep_generic.h renamed from drivers/raw/ifpga_rawdev/base/osdep_raw/osdep_generic.h +0
-0drivers/raw/ifpga/base/osdep_rte/osdep_generic.h renamed from drivers/raw/ifpga_rawdev/base/osdep_rte/osdep_generic.h +0
-0drivers/raw/ifpga/ifpga_rawdev.c diff --git renamed from drivers/raw/ifpga_rawdev/ifpga_rawdev.c +0
-0
a/drivers/raw/ifpga_rawdev/ifpga_rawdev.hb/drivers/raw/ifpga/ifpga_rawdev.h
similarity index 100%
rename fromdrivers/raw/ifpga_rawdev/ifpga_rawdev.h
rename todrivers/raw/ifpga/ifpga_rawdev.hdiff --git a/drivers/raw/ifpga_rawdev/meson.build b/drivers/raw/ifpga/meson.build similarity index 100% rename fromdrivers/raw/ifpga_rawdev/meson.buildrename todrivers/raw/ifpga/meson.builddrivers/raw/ifpga/rte_pmd_ifpga_version.map renamed from drivers/raw/ifpga_rawdev/rte_pmd_ifpga_rawdev_version.map +0
-0rename from
drivers/raw/ifpga_rawdev/rte_pmd_ifpga_rawdev_version.maprename todrivers/raw/ifpga/rte_pmd_ifpga_version.mapdrivers/raw/meson.build index renamed from drivers/raw/meson.build +0
-0
c2d034862..bcd5553e1100644drivers/raw/meson.build +2
-2@@ -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@'(quoted diff) +0
-0b/drivers/raw/skeleton/Makefile similarity index 91% rename from
drivers/raw/skeleton_rawdev/Makefile
rename todrivers/raw/skeleton/Makefile
index3f97c2ee0..9641e6505100644drivers/raw/skeleton/Makefile renamed from drivers/raw/skeleton_rawdev/Makefile +0
-0@@ -15,7 +15,7 @@ LDLIBS += -lrte_rawdev LDLIBS += -lrte_bus_vdevLDLIBS += -lrte_kvargs
drivers/raw/skeleton/Makefile renamed from drivers/raw/skeleton_rawdev/Makefile +1
-1-EXPORT_MAP := rte_pmd_skeleton_rawdev_version.map +EXPORT_MAP := rte_pmd_skeleton_version.map LIBABIVER := 1drivers/raw/skeleton/meson.build diff --git renamed from drivers/raw/skeleton_rawdev/meson.build +0
-0a/drivers/raw/skeleton_rawdev/rte_pmd_skeleton_rawdev_version.map b/drivers/raw/skeleton/rte_pmd_skeleton_version.map similarity index 100%
rename fromdrivers/raw/skeleton_rawdev/rte_pmd_skeleton_rawdev_version.maprename todrivers/raw/skeleton/rte_pmd_skeleton_version.mapdrivers/raw/skeleton/skeleton_rawdev.c renamed from drivers/raw/skeleton_rawdev/skeleton_rawdev.c +0
-0drivers/raw/skeleton/skeleton_rawdev.h renamed from drivers/raw/skeleton_rawdev/skeleton_rawdev.h +0
-0drivers/raw/skeleton/skeleton_rawdev_test.c renamed from drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c +0
-1--
Quoted 1 line
2.21.0
PATCH v2 2/2 drivers/raw: standardize naming
In reply to Thomas MonjalonFrom: Bruce Richardson <[email protected]>
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.
---
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%)doc/guides/rel_notes/release_19_08.rst +3 -0
@@ -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 -----------------------
drivers/raw/dpaa2_cmdif/Makefile +2 -2
@@ -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
drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map renamed from drivers/raw/dpaa2_cmdif/rte_pmd_dpaa2_cmdif_version.map +0 -0
drivers/raw/dpaa2_qdma/Makefile +2 -2
@@ -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
drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map renamed from drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma_version.map +0 -0
drivers/raw/ifpga/Makefile +2 -2
@@ -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
drivers/raw/ifpga/rte_rawdev_ifpga_version.map renamed from drivers/raw/ifpga/rte_pmd_ifpga_version.map +0 -0
drivers/raw/ioat/Makefile +2 -2
@@ -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
drivers/raw/ioat/rte_rawdev_ioat_version.map renamed from drivers/raw/ioat/rte_pmd_ioat_version.map +0 -0
drivers/raw/meson.build +1 -1
@@ -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@'
drivers/raw/ntb/Makefile +2 -2
@@ -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
drivers/raw/ntb/rte_rawdev_ntb_version.map renamed from drivers/raw/ntb/rte_pmd_ntb_version.map +0 -0
drivers/raw/octeontx2_dma/Makefile +2 -2
@@ -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
drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map renamed from drivers/raw/octeontx2_dma/rte_pmd_octeontx2_dma_version.map +0 -0
drivers/raw/skeleton/Makefile +2 -2
@@ -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
drivers/raw/skeleton/rte_rawdev_skeleton_version.map renamed from drivers/raw/skeleton/rte_pmd_skeleton_version.map +0 -0
mk/rte.app.mk +7 -7
@@ -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
Signature · 1 line
2.21.0
Re: [dpdk-dev] [PATCH v2 2/2] drivers/raw: standardize naming
Hi,
I'm okay if it's applied in 19.11.
Quoted 306 lines
-----Original Message-----
From: Thomas Monjalon [mailto:[email protected]]
Sent: Tuesday, July 30, 2019 21:40
To: [email protected]; Mcnamara, John <[email protected]>; Kovacevic, Marko <[email protected]>; Nipun Gupta <[email protected]>; Xu, Rosen <[email protected]>; Zhang, Tianfei <[email protected]>; Richardson, Bruce <[email protected]>; Li, Xiaoyun <[email protected]>; Wu, Jingjing <[email protected]>; Satha Rao <[email protected]>; Vamsi Attunuru <[email protected]>; Shreyansh Jain <[email protected]>; Hemant Agrawal <[email protected]>
Cc: Neil Horman <[email protected]>
Subject: [PATCH v2 2/2]drivers/raw: standardize namingFrom: Bruce Richardson <[email protected]>
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 <[email protected]>Signed-off-by Thomas Monjalon <[email protected]>--- 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%) renamedrivers/raw/dpaa2_qdma/{rte_pmd_dpaa2_qdma_version.map=> rte_rawdev_dpaa2_qdma_version.map} (100%) renamedrivers/raw/ifpga/{rte_pmd_ifpga_version.map=> rte_rawdev_ifpga_version.map} (100%) renamedrivers/raw/ioat/{rte_pmd_ioat_version.map=> rte_rawdev_ioat_version.map} (100%) renamedrivers/raw/ntb/{rte_pmd_ntb_version.map=> rte_rawdev_ntb_version.map} (100%) renamedrivers/raw/octeontx2_dma/{rte_pmd_octeontx2_dma_version.map=> rte_rawdev_octeontx2_dma_version.map} (100%) renamedrivers/raw/skeleton/{rte_pmd_skeleton_version.map=> rte_rawdev_skeleton_version.map} (100%)doc/guides/rel_notes/release_19_08.rst +0
-0@@ -351,6 +351,9 @@ ABI Changes * bbdev: New operations and parameters added to support new 5GNRoperations.
The bbdev ABI is still kept experimental.doc/guides/rel_notes/release_19_08.rst +2
-0+* rawdev: The driver names have been changed to ``librte_rawdev_*``. + Now they all have the same prefix, and same name with make and mesonbuilds.
doc/guides/rel_notes/release_19_08.rst +1
-0+ Shared Library Versions -----------------------drivers/raw/dpaa2_cmdif/Makefile +0
-0@@ -6,7 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk # # library name # -LIB = librte_pmd_dpaa2_cmdif.a
drivers/raw/dpaa2_cmdif/Makefile +1
-0+LIB = librte_rawdev_dpaa2_cmdif.a CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -O3@@ -23,7 +23,7 @@ LDLIBS += -lrte_mempool_dpaa2 LDLIBS += -
lrte_rawdevLDLIBS += -lrte_common_dpaaxdrivers/raw/dpaa2_cmdif/Makefile +1
-1-EXPORT_MAP := rte_pmd_dpaa2_cmdif_version.map +EXPORT_MAP := rte_rawdev_dpaa2_cmdif_version.map LIBABIVER := 2drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map renamed from drivers/raw/dpaa2_cmdif/rte_pmd_dpaa2_cmdif_version.map +0
-0(quoted diff) +0
-0b/drivers/raw/dpaa2_qdma/Makefile index
f9a810cc6..0009fd4c6100644drivers/raw/dpaa2_qdma/Makefile +0
-0@@ -6,7 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk # # library name # -LIB = librte_pmd_dpaa2_qdma.a
drivers/raw/dpaa2_qdma/Makefile +1
-0+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_dpaaxdrivers/raw/dpaa2_qdma/Makefile +1
-1-EXPORT_MAP := rte_pmd_dpaa2_qdma_version.map +EXPORT_MAP := rte_rawdev_dpaa2_qdma_version.map LIBABIVER := 3drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map renamed from drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma_version.map +0
-0rename from
drivers/raw/dpaa2_qdma/rte_pmd_dpaa2_qdma_version.maprename todrivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.mapdrivers/raw/ifpga/Makefile index renamed from drivers/raw/ifpga/Makefile +0
-0
5fa9303d5..655b29288100644drivers/raw/ifpga/Makefile +0
-0@@ -6,7 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk # # library name # -LIB = librte_pmd_ifpga_rawdev.a
drivers/raw/ifpga/Makefile +3
-1+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 := 1drivers/raw/ifpga/rte_rawdev_ifpga_version.map renamed from drivers/raw/ifpga/rte_pmd_ifpga_version.map +0
-0drivers/raw/ioat/Makefile index renamed from drivers/raw/ioat/Makefile +0
-0
32f079845..e852afb57100644drivers/raw/ioat/Makefile +2
-2@@ -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 fromdrivers/raw/ioat/rte_pmd_ioat_version.maprename todrivers/raw/ioat/rte_rawdev_ioat_version.mapdrivers/raw/meson.build index renamed from drivers/raw/meson.build +0
-0
bcd5553e1..d7037cd87100644drivers/raw/meson.build +1
-1@@ -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@'drivers/raw/ntb/Makefile index renamed from drivers/raw/ntb/Makefile +0
-0
edd49fe75..6fe2aaf40100644drivers/raw/ntb/Makefile +0
-0@@ -6,7 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk # # library name # -LIB = librte_pmd_ntb.a
drivers/raw/ntb/Makefile +3
-1+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 := 1drivers/raw/ntb/rte_rawdev_ntb_version.map renamed from drivers/raw/ntb/rte_pmd_ntb_version.map +0
-0drivers/raw/octeontx2_dma/Makefile +2
-2@@ -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 := 1diff --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 fromdrivers/raw/octeontx2_dma/rte_pmd_octeontx2_dma_version.maprename todrivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.mapdrivers/raw/skeleton/Makefile +0
-0@@ -6,7 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk # # library name # -LIB = librte_pmd_skeleton_rawdev.a
drivers/raw/skeleton/Makefile +1
-0+LIB = librte_rawdev_skeleton.a CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS)@@ -15,7 +15,7 @@ LDLIBS += -lrte_rawdev LDLIBS += -lrte_bus_vdevLDLIBS += -lrte_kvargs
drivers/raw/skeleton/Makefile +1
-1-EXPORT_MAP := rte_pmd_skeleton_version.map +EXPORT_MAP := rte_rawdev_skeleton_version.map LIBABIVER := 1drivers/raw/skeleton/rte_rawdev_skeleton_version.map renamed from drivers/raw/skeleton/rte_pmd_skeleton_version.map +0
-0mk/rte.app.mk index a277c808e..ba5c39e01 renamed from mk/rte.app.mk +0
-0100644
mk/rte.app.mk +0
-0@@ -312,19 +312,19 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += -lrte_pmd_opdl_event endif #
CONFIG_RTE_LIBRTE_EVENTDEVifeq ($(CONFIG_RTE_LIBRTE_RAWDEV),y)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += -lrte_pmd_skeleton_rawdevmk/rte.app.mk +2
-1+_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_qdmamk/rte.app.mk +4
-1+_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_rawdevmk/rte.app.mk +0
-2-_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_ioatmk/rte.app.mk +3
-1+_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 --
Quoted 1 line
2.21.0
Re: [dpdk-dev] [PATCH v2 2/2] drivers/raw: standardize naming
31/07/2019 09:29, Xu, Rosen:
Quoted 3 lines
Hi,
I'm okay if it's applied in 19.11.
It is already applied in 19.08-rc3.
Thomas Monjalon
Applied30/07/2019 15:39, Thomas Monjalon:
Quoted 13 lines
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.
Quoted 7 lines
Bruce Richardson (2):
drivers/raw: remove rawdev from directory names
drivers/raw: standardize namingv2 (Thomas):
- update doc andMAINTAINERSfile
- rebase for ntb and octeontx2
Applied