The iavf and idpf common directories were used only to share code
between multiple net drivers and did not need to be drivers in their own
right, since it is just as easy to have a dependency from one net driver
on another as a net driver on a common one.
This patchset therefore aims to eliminate the two unnecessary common
drivers. It does so as follows:
* merging common/idpf into net/idpf and updating the cpfl dependency to
point to the net driver.
* merging common/iavf into net/iavf and similarly updating the
dependencies, including the paths from idpf (which does not directly
depend on iavf, but does make use of the definitions in the iavf
header files).
Separately, two other cleanups are done - one to remove an unnecessary
warning disable flag. The second is a little more complex - it makes the
dependency between ice and iavf an optional one, by having ice compile
in the necessary iavf shared code files in case iavf is disabled in the
build.
Bruce Richardson (4):
drivers: merge common and net idpf drivers
net/idpf: re-enable unused variable warnings
drivers: move iavf common folder to iavf net
net/intel: allow building ice driver without iavf
drivers/common/iavf/version.map | 13 -------
drivers/common/idpf/meson.build | 34 -------------------
drivers/common/meson.build | 2 --
drivers/net/intel/cpfl/meson.build | 2 +-
.../iavf => net/intel/iavf/base}/README | 0
.../intel/iavf/base}/iavf_adminq.c | 0
.../intel/iavf/base}/iavf_adminq.h | 0
.../intel/iavf/base}/iavf_adminq_cmd.h | 0
.../iavf => net/intel/iavf/base}/iavf_alloc.h | 0
.../intel/iavf/base}/iavf_common.c | 0
.../intel/iavf/base}/iavf_devids.h | 0
.../iavf => net/intel/iavf/base}/iavf_impl.c | 0
.../iavf => net/intel/iavf/base}/iavf_osdep.h | 0
.../intel/iavf/base}/iavf_prototype.h | 8 +++++
.../intel/iavf/base}/iavf_register.h | 0
.../intel/iavf/base}/iavf_status.h | 0
.../iavf => net/intel/iavf/base}/iavf_type.h | 0
.../iavf => net/intel/iavf/base}/meson.build | 0
.../iavf => net/intel/iavf/base}/virtchnl.h | 0
.../intel/iavf/base}/virtchnl_inline_ipsec.h | 0
drivers/net/intel/iavf/meson.build | 13 ++++---
drivers/net/intel/iavf/version.map | 14 ++++++++
drivers/net/intel/ice/meson.build | 18 +++++++---
.../{common => net/intel}/idpf/base/README | 0
.../intel}/idpf/base/idpf_alloc.h | 0
.../intel}/idpf/base/idpf_controlq.c | 0
.../intel}/idpf/base/idpf_controlq.h | 0
.../intel}/idpf/base/idpf_controlq_api.h | 0
.../intel}/idpf/base/idpf_controlq_setup.c | 0
.../intel}/idpf/base/idpf_devids.h | 0
.../intel}/idpf/base/idpf_lan_pf_regs.h | 0
.../intel}/idpf/base/idpf_lan_txrx.h | 0
.../intel}/idpf/base/idpf_lan_vf_regs.h | 0
.../intel}/idpf/base/idpf_osdep.h | 0
.../intel}/idpf/base/idpf_prototype.h | 0
.../intel}/idpf/base/idpf_type.h | 0
.../intel}/idpf/base/meson.build | 9 -----
.../intel}/idpf/base/siov_regs.h | 0
.../intel}/idpf/base/virtchnl2.h | 0
.../intel}/idpf/base/virtchnl2_lan_desc.h | 0
.../intel}/idpf/idpf_common_device.c | 0
.../intel}/idpf/idpf_common_device.h | 0
.../intel}/idpf/idpf_common_logs.h | 0
.../intel}/idpf/idpf_common_rxtx.c | 2 --
.../intel}/idpf/idpf_common_rxtx.h | 0
.../intel}/idpf/idpf_common_rxtx_avx512.c | 0
.../intel}/idpf/idpf_common_virtchnl.c | 4 +--
.../intel}/idpf/idpf_common_virtchnl.h | 0
drivers/net/intel/idpf/meson.build | 20 +++++++++--
.../{common => net/intel}/idpf/version.map | 0
drivers/net/meson.build | 2 +-
51 files changed, 67 insertions(+), 74 deletions(-)
delete mode 100644 drivers/common/iavf/version.map
delete mode 100644 drivers/common/idpf/meson.build
rename drivers/{common/iavf => net/intel/iavf/base}/README (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_adminq.c (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_adminq.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_adminq_cmd.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_alloc.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_common.c (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_devids.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_impl.c (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_osdep.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_prototype.h (94%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_register.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_status.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_type.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/meson.build (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/virtchnl.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/virtchnl_inline_ipsec.h
(100%)
rename drivers/{common => net/intel}/idpf/base/README (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_alloc.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_controlq.c (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_controlq.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_controlq_api.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_controlq_setup.c (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_devids.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_lan_pf_regs.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_lan_txrx.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_lan_vf_regs.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_osdep.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_prototype.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_type.h (100%)
rename drivers/{common => net/intel}/idpf/base/meson.build (51%)
rename drivers/{common => net/intel}/idpf/base/siov_regs.h (100%)
rename drivers/{common => net/intel}/idpf/base/virtchnl2.h (100%)
rename drivers/{common => net/intel}/idpf/base/virtchnl2_lan_desc.h (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_device.c (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_device.h (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_logs.h (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_rxtx.c (99%)
rename drivers/{common => net/intel}/idpf/idpf_common_rxtx.h (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_rxtx_avx512.c (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_virtchnl.c (99%)
rename drivers/{common => net/intel}/idpf/idpf_common_virtchnl.h (100%)
rename drivers/{common => net/intel}/idpf/version.map (100%)
--
2.43.0
