remove common iavf and idpf drivers
Subsystems (2)
cover remove common iavf and idpf drivers
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
PATCH 1/4 drivers: merge common and net idpf drivers
Rather than having some of the idpf code split out into the "common" directory, used by both a net/idpf and a net/cpfl driver, we can merge all idpf code together under net/idpf and have the cpfl driver depend on "net/idpf" rather than "common/idpf".
---
drivers/common/idpf/meson.build | 34 -------------------
drivers/common/meson.build | 1 -
drivers/net/intel/cpfl/meson.build | 2 +-
.../{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 | 0
.../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 | 0
.../intel}/idpf/idpf_common_rxtx.h | 0
.../intel}/idpf/idpf_common_rxtx_avx512.c | 0
.../intel}/idpf/idpf_common_virtchnl.c | 0
.../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 +-
31 files changed, 20 insertions(+), 39 deletions(-)
delete mode 100644 drivers/common/idpf/meson.build
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 (100%)
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 (100%)
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 (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_virtchnl.h (100%)
rename drivers/{common => net/intel}/idpf/version.map (100%)drivers/common/idpf/meson.build deleted +0 -34
@@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2022 Intel Corporation - -if dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0 - subdir_done() -endif - -includes += include_directories('../iavf') - -deps += ['mbuf'] - -sources = files( - 'idpf_common_device.c', - 'idpf_common_rxtx.c', - 'idpf_common_virtchnl.c', -) - -if arch_subdir == 'x86' - if cc_has_avx512 - cflags += ['-DCC_AVX512_SUPPORT'] - avx512_args = cflags + cc_avx512_flags - if cc.has_argument('-march=skylake-avx512') - avx512_args += '-march=skylake-avx512' - endif - idpf_common_avx512_lib = static_library('idpf_common_avx512_lib', - 'idpf_common_rxtx_avx512.c', - dependencies: [static_rte_mbuf,], - include_directories: includes, - c_args: avx512_args) - objs += idpf_common_avx512_lib.extract_objects('idpf_common_rxtx_avx512.c') - endif -endif - -subdir('base')
drivers/common/meson.build +0 -1
@@ -6,7 +6,6 @@ drivers = [ 'cpt', 'dpaax', 'iavf', - 'idpf', 'ionic', 'mvep', 'octeontx',
drivers/net/intel/cpfl/meson.build +1 -1
@@ -11,7 +11,7 @@ if dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0 subdir_done() endif -deps += ['hash', 'common_idpf'] +deps += ['hash', 'net_idpf'] sources = files( 'cpfl_ethdev.c',
drivers/net/intel/idpf/base/README renamed from drivers/common/idpf/base/README +0 -0
drivers/net/intel/idpf/base/idpf_alloc.h renamed from drivers/common/idpf/base/idpf_alloc.h +0 -0
drivers/net/intel/idpf/base/idpf_controlq.c renamed from drivers/common/idpf/base/idpf_controlq.c +0 -0
drivers/net/intel/idpf/base/idpf_controlq.h renamed from drivers/common/idpf/base/idpf_controlq.h +0 -0
drivers/net/intel/idpf/base/idpf_controlq_api.h renamed from drivers/common/idpf/base/idpf_controlq_api.h +0 -0
drivers/net/intel/idpf/base/idpf_controlq_setup.c renamed from drivers/common/idpf/base/idpf_controlq_setup.c +0 -0
drivers/net/intel/idpf/base/idpf_devids.h renamed from drivers/common/idpf/base/idpf_devids.h +0 -0
drivers/net/intel/idpf/base/idpf_lan_pf_regs.h renamed from drivers/common/idpf/base/idpf_lan_pf_regs.h +0 -0
drivers/net/intel/idpf/base/idpf_lan_txrx.h renamed from drivers/common/idpf/base/idpf_lan_txrx.h +0 -0
drivers/net/intel/idpf/base/idpf_lan_vf_regs.h renamed from drivers/common/idpf/base/idpf_lan_vf_regs.h +0 -0
drivers/net/intel/idpf/base/idpf_osdep.h renamed from drivers/common/idpf/base/idpf_osdep.h +0 -0
drivers/net/intel/idpf/base/idpf_prototype.h renamed from drivers/common/idpf/base/idpf_prototype.h +0 -0
drivers/net/intel/idpf/base/idpf_type.h renamed from drivers/common/idpf/base/idpf_type.h +0 -0
drivers/net/intel/idpf/base/meson.build renamed from drivers/common/idpf/base/meson.build +0 -0
drivers/net/intel/idpf/base/siov_regs.h renamed from drivers/common/idpf/base/siov_regs.h +0 -0
drivers/net/intel/idpf/base/virtchnl2.h renamed from drivers/common/idpf/base/virtchnl2.h +0 -0
drivers/net/intel/idpf/base/virtchnl2_lan_desc.h renamed from drivers/common/idpf/base/virtchnl2_lan_desc.h +0 -0
drivers/net/intel/idpf/idpf_common_device.c renamed from drivers/common/idpf/idpf_common_device.c +0 -0
drivers/net/intel/idpf/idpf_common_device.h renamed from drivers/common/idpf/idpf_common_device.h +0 -0
drivers/net/intel/idpf/idpf_common_logs.h renamed from drivers/common/idpf/idpf_common_logs.h +0 -0
drivers/net/intel/idpf/idpf_common_rxtx.c renamed from drivers/common/idpf/idpf_common_rxtx.c +0 -0
drivers/net/intel/idpf/idpf_common_rxtx.h renamed from drivers/common/idpf/idpf_common_rxtx.h +0 -0
drivers/net/intel/idpf/idpf_common_rxtx_avx512.c renamed from drivers/common/idpf/idpf_common_rxtx_avx512.c +0 -0
drivers/net/intel/idpf/idpf_common_virtchnl.c renamed from drivers/common/idpf/idpf_common_virtchnl.c +0 -0
drivers/net/intel/idpf/idpf_common_virtchnl.h renamed from drivers/common/idpf/idpf_common_virtchnl.h +0 -0
drivers/net/intel/idpf/meson.build +18 -2
@@ -7,13 +7,29 @@ if is_windows subdir_done() endif -deps += ['common_idpf'] +includes += include_directories('../../../common/iavf') sources = files( + 'idpf_common_device.c', + 'idpf_common_rxtx.c', + 'idpf_common_virtchnl.c', + 'idpf_ethdev.c', 'idpf_rxtx.c', ) -if arch_subdir == 'x86'and cc_has_avx512 +if arch_subdir == 'x86' and cc_has_avx512 cflags += ['-DCC_AVX512_SUPPORT'] + avx512_args = cflags + cc_avx512_flags + if cc.has_argument('-march=skylake-avx512') + avx512_args += '-march=skylake-avx512' + endif + idpf_common_avx512_lib = static_library('idpf_common_avx512_lib', + 'idpf_common_rxtx_avx512.c', + dependencies: static_rte_mbuf, + include_directories: includes, + c_args: avx512_args) + objs += idpf_common_avx512_lib.extract_objects('idpf_common_rxtx_avx512.c') endif + +subdir('base')
drivers/net/intel/idpf/version.map renamed from drivers/common/idpf/version.map +0 -0
drivers/net/meson.build +1 -1
@@ -24,7 +24,6 @@ drivers = [ 'gve', 'hinic', 'hns3', - 'intel/cpfl', 'intel/e1000', 'intel/fm10k', 'intel/i40e',
@@ -34,6 +33,7 @@ drivers = [ 'intel/igc', 'intel/ipn3ke', 'intel/ixgbe', + 'intel/cpfl', # depends on idpf, so must come after it 'ionic', 'mana', 'memif',
Signature · 1 line
2.43.0
PATCH 2/4 net/idpf: re-enable unused variable warnings
In reply to Bruce RichardsonThe idpf driver was being built with warnings disabled for unused variables. However, while the warning was being disabled in the base code directory, all suppressed warnings were in the main directory. Therefore, just remove the unused variables and re-enable the warnings.
--- drivers/net/intel/idpf/base/meson.build | 9 --------- drivers/net/intel/idpf/idpf_common_rxtx.c | 2 -- drivers/net/intel/idpf/idpf_common_virtchnl.c | 4 ++-- 3 files changed, 2 insertions(+), 13 deletions(-)
drivers/net/intel/idpf/base/meson.build +0 -9
@@ -5,12 +5,3 @@ sources += files( 'idpf_controlq.c', 'idpf_controlq_setup.c', ) - -error_cflags = [ - '-Wno-unused-variable', -] -foreach flag: error_cflags - if cc.has_argument(flag) - cflags += flag - endif -endforeach
drivers/net/intel/idpf/idpf_common_rxtx.c +0 -2
@@ -1178,7 +1178,6 @@ idpf_dp_singleq_recv_scatter_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,struct rte_mbuf *last_seg = rxq->pkt_last_seg;struct rte_mbuf *rxm;struct rte_mbuf *nmb; -struct rte_eth_dev *dev;const uint32_t *ptype_tbl = rxq->adapter->ptype_tbl;uint16_t rx_id = rxq->rx_tail;uint16_t rx_packet_len;
@@ -1310,7 +1309,6 @@ idpf_xmit_cleanup(struct idpf_tx_queue *txq)uint16_t nb_tx_desc = txq->nb_tx_desc;uint16_t desc_to_clean_to;uint16_t nb_tx_to_clean; -uint16_t i;volatile struct idpf_base_tx_desc *txd = txq->tx_ring;
drivers/net/intel/idpf/idpf_common_virtchnl.c +2 -2
@@ -362,7 +362,7 @@ idpf_vc_queue_grps_add(struct idpf_vport *vport, {struct idpf_adapter *adapter = vport->adapter;struct idpf_cmd_info args; -int size, qg_info_size; +int size;int err =-1 ; size = sizeof(*p2p_queue_grps_info) +
@@ -1044,7 +1044,7 @@ int idpf_vc_rxq_config_by_info(struct idpf_vport *vport, struct virtchnl2_rxq_instruct idpf_adapter *adapter = vport->adapter;struct virtchnl2_config_rx_queues *vc_rxqs =NULL ;struct idpf_cmd_info args; -int size, err, i; +int size, err; size =sizeof (*vc_rxqs) + (num_qs -1 ) *sizeof (struct virtchnl2_rxq_info );
Signature · 1 line
2.43.0
PATCH 3/4 drivers: move iavf common folder to iavf net
In reply to Bruce RichardsonThe common/iavf driver folder contains the base code for the iavf driver, which is also linked against by the ice driver and others. However, there is no need for this to be in common, and we can move it to the net/intel/iavf as a base code driver. This involves updating dependencies that were on common/iavf to net/iavf
---
drivers/common/iavf/version.map | 13 -------------
drivers/common/meson.build | 1 -
.../{common/iavf => net/intel/iavf/base}/README | 0
.../iavf => net/intel/iavf/base}/iavf_adminq.c | 0
.../iavf => net/intel/iavf/base}/iavf_adminq.h | 0
.../iavf => net/intel/iavf/base}/iavf_adminq_cmd.h | 0
.../iavf => net/intel/iavf/base}/iavf_alloc.h | 0
.../iavf => net/intel/iavf/base}/iavf_common.c | 0
.../iavf => net/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
.../iavf => net/intel/iavf/base}/iavf_prototype.h | 0
.../iavf => net/intel/iavf/base}/iavf_register.h | 0
.../iavf => net/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 | 7 +++----
drivers/net/intel/idpf/meson.build | 2 +-
22 files changed, 27 insertions(+), 23 deletions(-)
delete mode 100644 drivers/common/iavf/version.map
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 (100%)
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%)drivers/common/iavf/version.map deleted +0 -13
@@ -1,13 +0,0 @@ -INTERNAL { - global: - - iavf_aq_send_msg_to_pf; - iavf_clean_arq_element; - iavf_init_adminq; - iavf_set_mac_type; - iavf_shutdown_adminq; - iavf_vf_parse_hw_config; - iavf_vf_reset; - - local: *; -};
drivers/common/meson.build +0 -1
@@ -5,7 +5,6 @@ std_deps = ['eal'] drivers = [ 'cpt', 'dpaax', - 'iavf', 'ionic', 'mvep', 'octeontx',
drivers/net/intel/iavf/base/README renamed from drivers/common/iavf/README +0 -0
drivers/net/intel/iavf/base/iavf_adminq.c renamed from drivers/common/iavf/iavf_adminq.c +0 -0
drivers/net/intel/iavf/base/iavf_adminq.h renamed from drivers/common/iavf/iavf_adminq.h +0 -0
drivers/net/intel/iavf/base/iavf_adminq_cmd.h renamed from drivers/common/iavf/iavf_adminq_cmd.h +0 -0
drivers/net/intel/iavf/base/iavf_alloc.h renamed from drivers/common/iavf/iavf_alloc.h +0 -0
drivers/net/intel/iavf/base/iavf_common.c renamed from drivers/common/iavf/iavf_common.c +0 -0
drivers/net/intel/iavf/base/iavf_devids.h renamed from drivers/common/iavf/iavf_devids.h +0 -0
drivers/net/intel/iavf/base/iavf_impl.c renamed from drivers/common/iavf/iavf_impl.c +0 -0
drivers/net/intel/iavf/base/iavf_osdep.h renamed from drivers/common/iavf/iavf_osdep.h +0 -0
drivers/net/intel/iavf/base/iavf_prototype.h renamed from drivers/common/iavf/iavf_prototype.h +0 -0
drivers/net/intel/iavf/base/iavf_register.h renamed from drivers/common/iavf/iavf_register.h +0 -0
drivers/net/intel/iavf/base/iavf_status.h renamed from drivers/common/iavf/iavf_status.h +0 -0
drivers/net/intel/iavf/base/iavf_type.h renamed from drivers/common/iavf/iavf_type.h +0 -0
drivers/net/intel/iavf/base/meson.build renamed from drivers/common/iavf/meson.build +0 -0
drivers/net/intel/iavf/base/virtchnl.h renamed from drivers/common/iavf/virtchnl.h +0 -0
drivers/net/intel/iavf/base/virtchnl_inline_ipsec.h renamed from drivers/common/iavf/virtchnl_inline_ipsec.h +0 -0
drivers/net/intel/iavf/meson.build +9 -4
@@ -7,9 +7,13 @@ endif testpmd_sources = files('iavf_testpmd.c') -deps += ['common_iavf', 'security', 'cryptodev'] +deps += ['security', 'cryptodev'] sources = files( + 'base/iavf_adminq.c', + 'base/iavf_common.c', + 'base/iavf_impl.c', + 'iavf_ethdev.c', 'iavf_rxtx.c', 'iavf_vchnl.c',
@@ -20,8 +24,9 @@ sources = files( 'iavf_ipsec_crypto.c', 'iavf_fsub.c', ) +includes += include_directories('base') -if arch_subdir == 'x86' and is_variable('static_rte_common_iavf') +if arch_subdir == 'x86' sources += files('iavf_rxtx_vec_sse.c') if is_windows and cc.get_id() != 'clang'
@@ -30,7 +35,7 @@ if arch_subdir == 'x86' and is_variable('static_rte_common_iavf') iavf_avx2_lib = static_library('iavf_avx2_lib', 'iavf_rxtx_vec_avx2.c', - dependencies: [static_rte_ethdev, static_rte_common_iavf], + dependencies: [static_rte_ethdev], include_directories: includes, c_args: [cflags, '-mavx2']) objs += iavf_avx2_lib.extract_objects('iavf_rxtx_vec_avx2.c')
@@ -43,7 +48,7 @@ if arch_subdir == 'x86' and is_variable('static_rte_common_iavf') endif iavf_avx512_lib = static_library('iavf_avx512_lib', 'iavf_rxtx_vec_avx512.c', - dependencies: [static_rte_ethdev, static_rte_common_iavf], + dependencies: [static_rte_ethdev], include_directories: includes, c_args: avx512_args) objs += iavf_avx512_lib.extract_objects('iavf_rxtx_vec_avx512.c')
drivers/net/intel/iavf/version.map +14 -0
@@ -17,3 +17,17 @@ EXPERIMENTAL { # added in 21.11 rte_pmd_ifd_dynflag_proto_xtr_ipsec_crypto_said_mask; }; + +INTERNAL { + global: + + iavf_aq_send_msg_to_pf; + iavf_clean_arq_element; + iavf_init_adminq; + iavf_set_mac_type; + iavf_shutdown_adminq; + iavf_vf_parse_hw_config; + iavf_vf_reset; + + local: *; +};
drivers/net/intel/ice/meson.build +3 -4
@@ -18,7 +18,7 @@ sources = files( testpmd_sources = files('ice_testpmd.c') -deps += ['hash', 'net', 'common_iavf'] +deps += ['hash', 'net', 'net_iavf'] includes += include_directories('base') if arch_subdir == 'x86'
@@ -30,7 +30,7 @@ if arch_subdir == 'x86' ice_avx2_lib = static_library('ice_avx2_lib', 'ice_rxtx_vec_avx2.c', - dependencies: [static_rte_ethdev, static_rte_kvargs, static_rte_hash], + dependencies: [static_rte_ethdev, static_rte_hash], include_directories: includes, c_args: [cflags, '-mavx2']) objs += ice_avx2_lib.extract_objects('ice_rxtx_vec_avx2.c')
@@ -43,8 +43,7 @@ if arch_subdir == 'x86' endif ice_avx512_lib = static_library('ice_avx512_lib', 'ice_rxtx_vec_avx512.c', - dependencies: [static_rte_ethdev, - static_rte_kvargs, static_rte_hash], + dependencies: [static_rte_ethdev, static_rte_hash], include_directories: includes, c_args: avx512_args) objs += ice_avx512_lib.extract_objects('ice_rxtx_vec_avx512.c')
drivers/net/intel/idpf/meson.build +1 -1
@@ -7,7 +7,7 @@ if is_windows subdir_done() endif -includes += include_directories('../../../common/iavf') +includes += include_directories('../iavf/base') sources = files( 'idpf_common_device.c',
Signature · 1 line
2.43.0
PATCH 4/4 net/intel: allow building ice driver without iavf
In reply to Bruce RichardsonThe ice PMD relies on a number of functions from the iavf base code, which can be got by linking against that iavf driver. However, since only three C files are necessary here, we can allow ice to be built independently of iavf by including the base files directly in cases where iavf is not part of the build. If it is part of the build, the dependency remains as now.
--- drivers/net/intel/iavf/base/iavf_prototype.h | 8 ++++++++ drivers/net/intel/ice/meson.build | 13 ++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-)
drivers/net/intel/iavf/base/iavf_prototype.h +8 -0
@@ -11,6 +11,14 @@#include <rte_compat.h> +/* functions only need exporting if this is being built into +* iavf driver itself. If included in ice driver, then no export +*/ +#ifndef RTE_NET_IAVF +#undef __rte_internal +#define __rte_internal +#endif +/* Prototypes for shared code functions that are not in * the standard function pointer structures. These are * mostly because they are needed even before the init
drivers/net/intel/ice/meson.build +12 -1
@@ -18,9 +18,20 @@ sources = files( testpmd_sources = files('ice_testpmd.c') -deps += ['hash', 'net', 'net_iavf'] +deps += ['hash', 'net'] includes += include_directories('base') +if dpdk_conf.has('RTE_NET_IAVF') + deps += 'net_iavf' +else + includes += include_directories('../iavf/base') + sources += files( + '../iavf/base/iavf_adminq.c', + '../iavf/base/iavf_common.c', + '../iavf/base/iavf_impl.c', + ) +endif + if arch_subdir == 'x86' sources += files('ice_rxtx_vec_sse.c')
Signature · 1 line
2.43.0
v2 cover remove common iavf and idpf drivers
In reply to Bruce RichardsonThe 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.
v2: include Release note updates
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
doc/guides/rel_notes/release_25_03.rst | 9 +++++
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 +-
52 files changed, 76 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
PATCH v2 1/4 drivers: merge common and net idpf drivers
Rather than having some of the idpf code split out into the "common" directory, used by both a net/idpf and a net/cpfl driver, we can merge all idpf code together under net/idpf and have the cpfl driver depend on "net/idpf" rather than "common/idpf".
---
doc/guides/rel_notes/release_25_03.rst | 6 ++++
drivers/common/idpf/meson.build | 34 -------------------
drivers/common/meson.build | 1 -
drivers/net/intel/cpfl/meson.build | 2 +-
.../{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 | 0
.../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 | 0
.../intel}/idpf/idpf_common_rxtx.h | 0
.../intel}/idpf/idpf_common_rxtx_avx512.c | 0
.../intel}/idpf/idpf_common_virtchnl.c | 0
.../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 +-
32 files changed, 26 insertions(+), 39 deletions(-)
delete mode 100644 drivers/common/idpf/meson.build
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 (100%)
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 (100%)
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 (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_virtchnl.h (100%)
rename drivers/{common => net/intel}/idpf/version.map (100%)doc/guides/rel_notes/release_25_03.rst +6 -0
@@ -115,6 +115,12 @@ API Changes but to enable/disable these drivers via Meson option requires use of the new paths. For example, ``-Denable_drivers=/net/i40e`` becomes ``-Denable_drivers=/net/intel/i40e``. +* The driver ``common/idpf`` has been merged into the ``net/intel/idpf`` driver. + This change should have no impact to end applications, but, + when specifying the ``idpf`` or ``cpfl`` net drivers to meson via ``-Denable_drivers`` option, + there is no longer any need to also specify the ``common/idpf`` driver. + Note, however, ``net/intel/cpfl`` driver now depends upon the ``net/intel/idpf`` driver. + ABI Changes -----------
drivers/common/idpf/meson.build deleted +0 -34
@@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2022 Intel Corporation - -if dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0 - subdir_done() -endif - -includes += include_directories('../iavf') - -deps += ['mbuf'] - -sources = files( - 'idpf_common_device.c', - 'idpf_common_rxtx.c', - 'idpf_common_virtchnl.c', -) - -if arch_subdir == 'x86' - if cc_has_avx512 - cflags += ['-DCC_AVX512_SUPPORT'] - avx512_args = cflags + cc_avx512_flags - if cc.has_argument('-march=skylake-avx512') - avx512_args += '-march=skylake-avx512' - endif - idpf_common_avx512_lib = static_library('idpf_common_avx512_lib', - 'idpf_common_rxtx_avx512.c', - dependencies: [static_rte_mbuf,], - include_directories: includes, - c_args: avx512_args) - objs += idpf_common_avx512_lib.extract_objects('idpf_common_rxtx_avx512.c') - endif -endif - -subdir('base')
drivers/common/meson.build +0 -1
@@ -6,7 +6,6 @@ drivers = [ 'cpt', 'dpaax', 'iavf', - 'idpf', 'ionic', 'mvep', 'octeontx',
drivers/net/intel/cpfl/meson.build +1 -1
@@ -11,7 +11,7 @@ if dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0 subdir_done() endif -deps += ['hash', 'common_idpf'] +deps += ['hash', 'net_idpf'] sources = files( 'cpfl_ethdev.c',
drivers/net/intel/idpf/base/README renamed from drivers/common/idpf/base/README +0 -0
drivers/net/intel/idpf/base/idpf_alloc.h renamed from drivers/common/idpf/base/idpf_alloc.h +0 -0
drivers/net/intel/idpf/base/idpf_controlq.c renamed from drivers/common/idpf/base/idpf_controlq.c +0 -0
drivers/net/intel/idpf/base/idpf_controlq.h renamed from drivers/common/idpf/base/idpf_controlq.h +0 -0
drivers/net/intel/idpf/base/idpf_controlq_api.h renamed from drivers/common/idpf/base/idpf_controlq_api.h +0 -0
drivers/net/intel/idpf/base/idpf_controlq_setup.c renamed from drivers/common/idpf/base/idpf_controlq_setup.c +0 -0
drivers/net/intel/idpf/base/idpf_devids.h renamed from drivers/common/idpf/base/idpf_devids.h +0 -0
drivers/net/intel/idpf/base/idpf_lan_pf_regs.h renamed from drivers/common/idpf/base/idpf_lan_pf_regs.h +0 -0
drivers/net/intel/idpf/base/idpf_lan_txrx.h renamed from drivers/common/idpf/base/idpf_lan_txrx.h +0 -0
drivers/net/intel/idpf/base/idpf_lan_vf_regs.h renamed from drivers/common/idpf/base/idpf_lan_vf_regs.h +0 -0
drivers/net/intel/idpf/base/idpf_osdep.h renamed from drivers/common/idpf/base/idpf_osdep.h +0 -0
drivers/net/intel/idpf/base/idpf_prototype.h renamed from drivers/common/idpf/base/idpf_prototype.h +0 -0
drivers/net/intel/idpf/base/idpf_type.h renamed from drivers/common/idpf/base/idpf_type.h +0 -0
drivers/net/intel/idpf/base/meson.build renamed from drivers/common/idpf/base/meson.build +0 -0
drivers/net/intel/idpf/base/siov_regs.h renamed from drivers/common/idpf/base/siov_regs.h +0 -0
drivers/net/intel/idpf/base/virtchnl2.h renamed from drivers/common/idpf/base/virtchnl2.h +0 -0
drivers/net/intel/idpf/base/virtchnl2_lan_desc.h renamed from drivers/common/idpf/base/virtchnl2_lan_desc.h +0 -0
drivers/net/intel/idpf/idpf_common_device.c renamed from drivers/common/idpf/idpf_common_device.c +0 -0
drivers/net/intel/idpf/idpf_common_device.h renamed from drivers/common/idpf/idpf_common_device.h +0 -0
drivers/net/intel/idpf/idpf_common_logs.h renamed from drivers/common/idpf/idpf_common_logs.h +0 -0
drivers/net/intel/idpf/idpf_common_rxtx.c renamed from drivers/common/idpf/idpf_common_rxtx.c +0 -0
drivers/net/intel/idpf/idpf_common_rxtx.h renamed from drivers/common/idpf/idpf_common_rxtx.h +0 -0
drivers/net/intel/idpf/idpf_common_rxtx_avx512.c renamed from drivers/common/idpf/idpf_common_rxtx_avx512.c +0 -0
drivers/net/intel/idpf/idpf_common_virtchnl.c renamed from drivers/common/idpf/idpf_common_virtchnl.c +0 -0
drivers/net/intel/idpf/idpf_common_virtchnl.h renamed from drivers/common/idpf/idpf_common_virtchnl.h +0 -0
drivers/net/intel/idpf/meson.build +18 -2
@@ -7,13 +7,29 @@ if is_windows subdir_done() endif -deps += ['common_idpf'] +includes += include_directories('../../../common/iavf') sources = files( + 'idpf_common_device.c', + 'idpf_common_rxtx.c', + 'idpf_common_virtchnl.c', + 'idpf_ethdev.c', 'idpf_rxtx.c', ) -if arch_subdir == 'x86'and cc_has_avx512 +if arch_subdir == 'x86' and cc_has_avx512 cflags += ['-DCC_AVX512_SUPPORT'] + avx512_args = cflags + cc_avx512_flags + if cc.has_argument('-march=skylake-avx512') + avx512_args += '-march=skylake-avx512' + endif + idpf_common_avx512_lib = static_library('idpf_common_avx512_lib', + 'idpf_common_rxtx_avx512.c', + dependencies: static_rte_mbuf, + include_directories: includes, + c_args: avx512_args) + objs += idpf_common_avx512_lib.extract_objects('idpf_common_rxtx_avx512.c') endif + +subdir('base')
drivers/net/intel/idpf/version.map renamed from drivers/common/idpf/version.map +0 -0
drivers/net/meson.build +1 -1
@@ -24,7 +24,6 @@ drivers = [ 'gve', 'hinic', 'hns3', - 'intel/cpfl', 'intel/e1000', 'intel/fm10k', 'intel/i40e',
@@ -34,6 +33,7 @@ drivers = [ 'intel/igc', 'intel/ipn3ke', 'intel/ixgbe', + 'intel/cpfl', # depends on idpf, so must come after it 'ionic', 'mana', 'memif',
Signature · 1 line
2.43.0
PATCH v2 2/4 net/idpf: re-enable unused variable warnings
In reply to Bruce RichardsonThe idpf driver was being built with warnings disabled for unused variables. However, while the warning was being disabled in the base code directory, all suppressed warnings were in the main directory. Therefore, just remove the unused variables and re-enable the warnings.
--- drivers/net/intel/idpf/base/meson.build | 9 --------- drivers/net/intel/idpf/idpf_common_rxtx.c | 2 -- drivers/net/intel/idpf/idpf_common_virtchnl.c | 4 ++-- 3 files changed, 2 insertions(+), 13 deletions(-)
drivers/net/intel/idpf/base/meson.build +0 -9
@@ -5,12 +5,3 @@ sources += files( 'idpf_controlq.c', 'idpf_controlq_setup.c', ) - -error_cflags = [ - '-Wno-unused-variable', -] -foreach flag: error_cflags - if cc.has_argument(flag) - cflags += flag - endif -endforeach
drivers/net/intel/idpf/idpf_common_rxtx.c +0 -2
@@ -1178,7 +1178,6 @@ idpf_dp_singleq_recv_scatter_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,struct rte_mbuf *last_seg = rxq->pkt_last_seg;struct rte_mbuf *rxm;struct rte_mbuf *nmb; -struct rte_eth_dev *dev;const uint32_t *ptype_tbl = rxq->adapter->ptype_tbl;uint16_t rx_id = rxq->rx_tail;uint16_t rx_packet_len;
@@ -1310,7 +1309,6 @@ idpf_xmit_cleanup(struct idpf_tx_queue *txq)uint16_t nb_tx_desc = txq->nb_tx_desc;uint16_t desc_to_clean_to;uint16_t nb_tx_to_clean; -uint16_t i;volatile struct idpf_base_tx_desc *txd = txq->tx_ring;
drivers/net/intel/idpf/idpf_common_virtchnl.c +2 -2
@@ -362,7 +362,7 @@ idpf_vc_queue_grps_add(struct idpf_vport *vport, {struct idpf_adapter *adapter = vport->adapter;struct idpf_cmd_info args; -int size, qg_info_size; +int size;int err =-1 ; size = sizeof(*p2p_queue_grps_info) +
@@ -1044,7 +1044,7 @@ int idpf_vc_rxq_config_by_info(struct idpf_vport *vport, struct virtchnl2_rxq_instruct idpf_adapter *adapter = vport->adapter;struct virtchnl2_config_rx_queues *vc_rxqs =NULL ;struct idpf_cmd_info args; -int size, err, i; +int size, err; size =sizeof (*vc_rxqs) + (num_qs -1 ) *sizeof (struct virtchnl2_rxq_info );
Signature · 1 line
2.43.0
PATCH v2 3/4 drivers: move iavf common folder to iavf net
In reply to Bruce RichardsonThe common/iavf driver folder contains the base code for the iavf driver, which is also linked against by the ice driver and others. However, there is no need for this to be in common, and we can move it to the net/intel/iavf as a base code driver. This involves updating dependencies that were on common/iavf to net/iavf
---
doc/guides/rel_notes/release_25_03.rst | 5 ++++-
drivers/common/iavf/version.map | 13 -------------
drivers/common/meson.build | 1 -
.../{common/iavf => net/intel/iavf/base}/README | 0
.../iavf => net/intel/iavf/base}/iavf_adminq.c | 0
.../iavf => net/intel/iavf/base}/iavf_adminq.h | 0
.../iavf => net/intel/iavf/base}/iavf_adminq_cmd.h | 0
.../iavf => net/intel/iavf/base}/iavf_alloc.h | 0
.../iavf => net/intel/iavf/base}/iavf_common.c | 0
.../iavf => net/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
.../iavf => net/intel/iavf/base}/iavf_prototype.h | 0
.../iavf => net/intel/iavf/base}/iavf_register.h | 0
.../iavf => net/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 | 7 +++----
drivers/net/intel/idpf/meson.build | 2 +-
23 files changed, 31 insertions(+), 24 deletions(-)
delete mode 100644 drivers/common/iavf/version.map
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 (100%)
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%)doc/guides/rel_notes/release_25_03.rst +4 -1
@@ -116,9 +116,12 @@ API Changes For example, ``-Denable_drivers=/net/i40e`` becomes ``-Denable_drivers=/net/intel/i40e``. * The driver ``common/idpf`` has been merged into the ``net/intel/idpf`` driver. - This change should have no impact to end applications, but, + Similarly, the ``common/iavf`` driver has been merged into the ``net/intel/iavf`` driver. + These changes should have no impact to end applications, but, when specifying the ``idpf`` or ``cpfl`` net drivers to meson via ``-Denable_drivers`` option, there is no longer any need to also specify the ``common/idpf`` driver. + In the same way, when specifying the ``iavf`` or ``ice`` net drivers, + there is no need to also specify the ``common/iavf`` driver. Note, however, ``net/intel/cpfl`` driver now depends upon the ``net/intel/idpf`` driver.
drivers/common/iavf/version.map deleted +0 -13
@@ -1,13 +0,0 @@ -INTERNAL { - global: - - iavf_aq_send_msg_to_pf; - iavf_clean_arq_element; - iavf_init_adminq; - iavf_set_mac_type; - iavf_shutdown_adminq; - iavf_vf_parse_hw_config; - iavf_vf_reset; - - local: *; -};
drivers/common/meson.build +0 -1
@@ -5,7 +5,6 @@ std_deps = ['eal'] drivers = [ 'cpt', 'dpaax', - 'iavf', 'ionic', 'mvep', 'octeontx',
drivers/net/intel/iavf/base/README renamed from drivers/common/iavf/README +0 -0
drivers/net/intel/iavf/base/iavf_adminq.c renamed from drivers/common/iavf/iavf_adminq.c +0 -0
drivers/net/intel/iavf/base/iavf_adminq.h renamed from drivers/common/iavf/iavf_adminq.h +0 -0
drivers/net/intel/iavf/base/iavf_adminq_cmd.h renamed from drivers/common/iavf/iavf_adminq_cmd.h +0 -0
drivers/net/intel/iavf/base/iavf_alloc.h renamed from drivers/common/iavf/iavf_alloc.h +0 -0
drivers/net/intel/iavf/base/iavf_common.c renamed from drivers/common/iavf/iavf_common.c +0 -0
drivers/net/intel/iavf/base/iavf_devids.h renamed from drivers/common/iavf/iavf_devids.h +0 -0
drivers/net/intel/iavf/base/iavf_impl.c renamed from drivers/common/iavf/iavf_impl.c +0 -0
drivers/net/intel/iavf/base/iavf_osdep.h renamed from drivers/common/iavf/iavf_osdep.h +0 -0
drivers/net/intel/iavf/base/iavf_prototype.h renamed from drivers/common/iavf/iavf_prototype.h +0 -0
drivers/net/intel/iavf/base/iavf_register.h renamed from drivers/common/iavf/iavf_register.h +0 -0
drivers/net/intel/iavf/base/iavf_status.h renamed from drivers/common/iavf/iavf_status.h +0 -0
drivers/net/intel/iavf/base/iavf_type.h renamed from drivers/common/iavf/iavf_type.h +0 -0
drivers/net/intel/iavf/base/meson.build renamed from drivers/common/iavf/meson.build +0 -0
drivers/net/intel/iavf/base/virtchnl.h renamed from drivers/common/iavf/virtchnl.h +0 -0
drivers/net/intel/iavf/base/virtchnl_inline_ipsec.h renamed from drivers/common/iavf/virtchnl_inline_ipsec.h +0 -0
drivers/net/intel/iavf/meson.build +9 -4
@@ -7,9 +7,13 @@ endif testpmd_sources = files('iavf_testpmd.c') -deps += ['common_iavf', 'security', 'cryptodev'] +deps += ['security', 'cryptodev'] sources = files( + 'base/iavf_adminq.c', + 'base/iavf_common.c', + 'base/iavf_impl.c', + 'iavf_ethdev.c', 'iavf_rxtx.c', 'iavf_vchnl.c',
@@ -20,8 +24,9 @@ sources = files( 'iavf_ipsec_crypto.c', 'iavf_fsub.c', ) +includes += include_directories('base') -if arch_subdir == 'x86' and is_variable('static_rte_common_iavf') +if arch_subdir == 'x86' sources += files('iavf_rxtx_vec_sse.c') if is_windows and cc.get_id() != 'clang'
@@ -30,7 +35,7 @@ if arch_subdir == 'x86' and is_variable('static_rte_common_iavf') iavf_avx2_lib = static_library('iavf_avx2_lib', 'iavf_rxtx_vec_avx2.c', - dependencies: [static_rte_ethdev, static_rte_common_iavf], + dependencies: [static_rte_ethdev], include_directories: includes, c_args: [cflags, '-mavx2']) objs += iavf_avx2_lib.extract_objects('iavf_rxtx_vec_avx2.c')
@@ -43,7 +48,7 @@ if arch_subdir == 'x86' and is_variable('static_rte_common_iavf') endif iavf_avx512_lib = static_library('iavf_avx512_lib', 'iavf_rxtx_vec_avx512.c', - dependencies: [static_rte_ethdev, static_rte_common_iavf], + dependencies: [static_rte_ethdev], include_directories: includes, c_args: avx512_args) objs += iavf_avx512_lib.extract_objects('iavf_rxtx_vec_avx512.c')
drivers/net/intel/iavf/version.map +14 -0
@@ -17,3 +17,17 @@ EXPERIMENTAL { # added in 21.11 rte_pmd_ifd_dynflag_proto_xtr_ipsec_crypto_said_mask; }; + +INTERNAL { + global: + + iavf_aq_send_msg_to_pf; + iavf_clean_arq_element; + iavf_init_adminq; + iavf_set_mac_type; + iavf_shutdown_adminq; + iavf_vf_parse_hw_config; + iavf_vf_reset; + + local: *; +};
drivers/net/intel/ice/meson.build +3 -4
@@ -18,7 +18,7 @@ sources = files( testpmd_sources = files('ice_testpmd.c') -deps += ['hash', 'net', 'common_iavf'] +deps += ['hash', 'net', 'net_iavf'] includes += include_directories('base') if arch_subdir == 'x86'
@@ -30,7 +30,7 @@ if arch_subdir == 'x86' ice_avx2_lib = static_library('ice_avx2_lib', 'ice_rxtx_vec_avx2.c', - dependencies: [static_rte_ethdev, static_rte_kvargs, static_rte_hash], + dependencies: [static_rte_ethdev, static_rte_hash], include_directories: includes, c_args: [cflags, '-mavx2']) objs += ice_avx2_lib.extract_objects('ice_rxtx_vec_avx2.c')
@@ -43,8 +43,7 @@ if arch_subdir == 'x86' endif ice_avx512_lib = static_library('ice_avx512_lib', 'ice_rxtx_vec_avx512.c', - dependencies: [static_rte_ethdev, - static_rte_kvargs, static_rte_hash], + dependencies: [static_rte_ethdev, static_rte_hash], include_directories: includes, c_args: avx512_args) objs += ice_avx512_lib.extract_objects('ice_rxtx_vec_avx512.c')
drivers/net/intel/idpf/meson.build +1 -1
@@ -7,7 +7,7 @@ if is_windows subdir_done() endif -includes += include_directories('../../../common/iavf') +includes += include_directories('../iavf/base') sources = files( 'idpf_common_device.c',
Signature · 1 line
2.43.0
PATCH v2 4/4 net/intel: allow building ice driver without iavf
In reply to Bruce RichardsonThe ice PMD relies on a number of functions from the iavf base code, which can be got by linking against that iavf driver. However, since only three C files are necessary here, we can allow ice to be built independently of iavf by including the base files directly in cases where iavf is not part of the build. If it is part of the build, the dependency remains as now.
--- drivers/net/intel/iavf/base/iavf_prototype.h | 8 ++++++++ drivers/net/intel/ice/meson.build | 13 ++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-)
drivers/net/intel/iavf/base/iavf_prototype.h +8 -0
@@ -11,6 +11,14 @@#include <rte_compat.h> +/* functions only need exporting if this is being built into +* iavf driver itself. If included in ice driver, then no export +*/ +#ifndef RTE_NET_IAVF +#undef __rte_internal +#define __rte_internal +#endif +/* Prototypes for shared code functions that are not in * the standard function pointer structures. These are * mostly because they are needed even before the init
drivers/net/intel/ice/meson.build +12 -1
@@ -18,9 +18,20 @@ sources = files( testpmd_sources = files('ice_testpmd.c') -deps += ['hash', 'net', 'net_iavf'] +deps += ['hash', 'net'] includes += include_directories('base') +if dpdk_conf.has('RTE_NET_IAVF') + deps += 'net_iavf' +else + includes += include_directories('../iavf/base') + sources += files( + '../iavf/base/iavf_adminq.c', + '../iavf/base/iavf_common.c', + '../iavf/base/iavf_impl.c', + ) +endif + if arch_subdir == 'x86' sources += files('ice_rxtx_vec_sse.c')
Signature · 1 line
2.43.0
Hello Bruce,
Quoted 23 lines · Bruce Richardson
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.
Quoted 7 lines
v2: include Release note updates
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
You'll probably need something like:
$ git show --oneline 9863a695075109f15bbfa2f1a3042139f25d6493 -- devtools/libabigail.abignore 9863a69507 net/liquidio: remove LiquidIO ethdev driver
devtools/libabigail.abignore +1 -0
@@ -25,6 +25,7 @@ ; ; SKIP_LIBRARY=librte_common_mlx5_glue ; SKIP_LIBRARY=librte_net_mlx4_glue +; SKIP_LIBRARY=librte_net_liquidio ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Experimental APIs exceptions ;
Signature · 1 line
David Marchand
Quoted 45 lines · David Marchand
Hello Bruce,
Quoted 23 lines · Bruce Richardson
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.
Quoted 7 lines
v2: include Release note updates
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 iavfYou'll probably need something like:
$ git show --oneline 9863a695075109f15bbfa2f1a3042139f25d6493 -- devtools/libabigail.abignore 9863a69507 net/liquidio: remove LiquidIO ethdev driverdevtools/libabigail.abignore +0
-0
devtools/libabigail.abignore line 29
Quoted 5 lines
devtools/libabigail.abignore +1
-0@@ -25,6 +25,7 @@ ; ; SKIP_LIBRARY=librte_common_mlx5_glue ; SKIP_LIBRARY=librte_net_mlx4_glue +; SKIP_LIBRARY=librte_net_liquidio
Yes, I see the libabigail errors in the CI now. V3 coming up...
/Bruce
v3 cover remove common iavf and idpf drivers
In reply to Bruce RichardsonThe 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.
v3: add libabigail exclusions for removed libs
v2: include Release note updates
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
devtools/libabigail.abignore | 2 ++
doc/guides/rel_notes/release_25_03.rst | 9 +++++
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 +-
53 files changed, 78 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
PATCH v3 1/4 drivers: merge common and net idpf drivers
Rather than having some of the idpf code split out into the "common" directory, used by both a net/idpf and a net/cpfl driver, we can merge all idpf code together under net/idpf and have the cpfl driver depend on "net/idpf" rather than "common/idpf".
---
devtools/libabigail.abignore | 1 +
doc/guides/rel_notes/release_25_03.rst | 6 ++++
drivers/common/idpf/meson.build | 34 -------------------
drivers/common/meson.build | 1 -
drivers/net/intel/cpfl/meson.build | 2 +-
.../{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 | 0
.../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 | 0
.../intel}/idpf/idpf_common_rxtx.h | 0
.../intel}/idpf/idpf_common_rxtx_avx512.c | 0
.../intel}/idpf/idpf_common_virtchnl.c | 0
.../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 +-
33 files changed, 27 insertions(+), 39 deletions(-)
delete mode 100644 drivers/common/idpf/meson.build
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 (100%)
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 (100%)
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 (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_virtchnl.h (100%)
rename drivers/{common => net/intel}/idpf/version.map (100%)devtools/libabigail.abignore +1 -0
@@ -25,6 +25,7 @@ ; ; SKIP_LIBRARY=librte_common_mlx5_glue ; SKIP_LIBRARY=librte_net_mlx4_glue +; SKIP_LIBRARY=librte_common_idpf ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Experimental APIs exceptions ;
doc/guides/rel_notes/release_25_03.rst +6 -0
@@ -115,6 +115,12 @@ API Changes but to enable/disable these drivers via Meson option requires use of the new paths. For example, ``-Denable_drivers=/net/i40e`` becomes ``-Denable_drivers=/net/intel/i40e``. +* The driver ``common/idpf`` has been merged into the ``net/intel/idpf`` driver. + This change should have no impact to end applications, but, + when specifying the ``idpf`` or ``cpfl`` net drivers to meson via ``-Denable_drivers`` option, + there is no longer any need to also specify the ``common/idpf`` driver. + Note, however, ``net/intel/cpfl`` driver now depends upon the ``net/intel/idpf`` driver. + ABI Changes -----------
drivers/common/idpf/meson.build deleted +0 -34
@@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2022 Intel Corporation - -if dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0 - subdir_done() -endif - -includes += include_directories('../iavf') - -deps += ['mbuf'] - -sources = files( - 'idpf_common_device.c', - 'idpf_common_rxtx.c', - 'idpf_common_virtchnl.c', -) - -if arch_subdir == 'x86' - if cc_has_avx512 - cflags += ['-DCC_AVX512_SUPPORT'] - avx512_args = cflags + cc_avx512_flags - if cc.has_argument('-march=skylake-avx512') - avx512_args += '-march=skylake-avx512' - endif - idpf_common_avx512_lib = static_library('idpf_common_avx512_lib', - 'idpf_common_rxtx_avx512.c', - dependencies: [static_rte_mbuf,], - include_directories: includes, - c_args: avx512_args) - objs += idpf_common_avx512_lib.extract_objects('idpf_common_rxtx_avx512.c') - endif -endif - -subdir('base')
drivers/common/meson.build +0 -1
@@ -6,7 +6,6 @@ drivers = [ 'cpt', 'dpaax', 'iavf', - 'idpf', 'ionic', 'mvep', 'octeontx',
drivers/net/intel/cpfl/meson.build +1 -1
@@ -11,7 +11,7 @@ if dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0 subdir_done() endif -deps += ['hash', 'common_idpf'] +deps += ['hash', 'net_idpf'] sources = files( 'cpfl_ethdev.c',
drivers/net/intel/idpf/base/README renamed from drivers/common/idpf/base/README +0 -0
drivers/net/intel/idpf/base/idpf_alloc.h renamed from drivers/common/idpf/base/idpf_alloc.h +0 -0
drivers/net/intel/idpf/base/idpf_controlq.c renamed from drivers/common/idpf/base/idpf_controlq.c +0 -0
drivers/net/intel/idpf/base/idpf_controlq.h renamed from drivers/common/idpf/base/idpf_controlq.h +0 -0
drivers/net/intel/idpf/base/idpf_controlq_api.h renamed from drivers/common/idpf/base/idpf_controlq_api.h +0 -0
drivers/net/intel/idpf/base/idpf_controlq_setup.c renamed from drivers/common/idpf/base/idpf_controlq_setup.c +0 -0
drivers/net/intel/idpf/base/idpf_devids.h renamed from drivers/common/idpf/base/idpf_devids.h +0 -0
drivers/net/intel/idpf/base/idpf_lan_pf_regs.h renamed from drivers/common/idpf/base/idpf_lan_pf_regs.h +0 -0
drivers/net/intel/idpf/base/idpf_lan_txrx.h renamed from drivers/common/idpf/base/idpf_lan_txrx.h +0 -0
drivers/net/intel/idpf/base/idpf_lan_vf_regs.h renamed from drivers/common/idpf/base/idpf_lan_vf_regs.h +0 -0
drivers/net/intel/idpf/base/idpf_osdep.h renamed from drivers/common/idpf/base/idpf_osdep.h +0 -0
drivers/net/intel/idpf/base/idpf_prototype.h renamed from drivers/common/idpf/base/idpf_prototype.h +0 -0
drivers/net/intel/idpf/base/idpf_type.h renamed from drivers/common/idpf/base/idpf_type.h +0 -0
drivers/net/intel/idpf/base/meson.build renamed from drivers/common/idpf/base/meson.build +0 -0
drivers/net/intel/idpf/base/siov_regs.h renamed from drivers/common/idpf/base/siov_regs.h +0 -0
drivers/net/intel/idpf/base/virtchnl2.h renamed from drivers/common/idpf/base/virtchnl2.h +0 -0
drivers/net/intel/idpf/base/virtchnl2_lan_desc.h renamed from drivers/common/idpf/base/virtchnl2_lan_desc.h +0 -0
drivers/net/intel/idpf/idpf_common_device.c renamed from drivers/common/idpf/idpf_common_device.c +0 -0
drivers/net/intel/idpf/idpf_common_device.h renamed from drivers/common/idpf/idpf_common_device.h +0 -0
drivers/net/intel/idpf/idpf_common_logs.h renamed from drivers/common/idpf/idpf_common_logs.h +0 -0
drivers/net/intel/idpf/idpf_common_rxtx.c renamed from drivers/common/idpf/idpf_common_rxtx.c +0 -0
drivers/net/intel/idpf/idpf_common_rxtx.h renamed from drivers/common/idpf/idpf_common_rxtx.h +0 -0
drivers/net/intel/idpf/idpf_common_rxtx_avx512.c renamed from drivers/common/idpf/idpf_common_rxtx_avx512.c +0 -0
drivers/net/intel/idpf/idpf_common_virtchnl.c renamed from drivers/common/idpf/idpf_common_virtchnl.c +0 -0
drivers/net/intel/idpf/idpf_common_virtchnl.h renamed from drivers/common/idpf/idpf_common_virtchnl.h +0 -0
drivers/net/intel/idpf/meson.build +18 -2
@@ -7,13 +7,29 @@ if is_windows subdir_done() endif -deps += ['common_idpf'] +includes += include_directories('../../../common/iavf') sources = files( + 'idpf_common_device.c', + 'idpf_common_rxtx.c', + 'idpf_common_virtchnl.c', + 'idpf_ethdev.c', 'idpf_rxtx.c', ) -if arch_subdir == 'x86'and cc_has_avx512 +if arch_subdir == 'x86' and cc_has_avx512 cflags += ['-DCC_AVX512_SUPPORT'] + avx512_args = cflags + cc_avx512_flags + if cc.has_argument('-march=skylake-avx512') + avx512_args += '-march=skylake-avx512' + endif + idpf_common_avx512_lib = static_library('idpf_common_avx512_lib', + 'idpf_common_rxtx_avx512.c', + dependencies: static_rte_mbuf, + include_directories: includes, + c_args: avx512_args) + objs += idpf_common_avx512_lib.extract_objects('idpf_common_rxtx_avx512.c') endif + +subdir('base')
drivers/net/intel/idpf/version.map renamed from drivers/common/idpf/version.map +0 -0
drivers/net/meson.build +1 -1
@@ -24,7 +24,6 @@ drivers = [ 'gve', 'hinic', 'hns3', - 'intel/cpfl', 'intel/e1000', 'intel/fm10k', 'intel/i40e',
@@ -34,6 +33,7 @@ drivers = [ 'intel/igc', 'intel/ipn3ke', 'intel/ixgbe', + 'intel/cpfl', # depends on idpf, so must come after it 'ionic', 'mana', 'memif',
Signature · 1 line
2.43.0
RE: [PATCH v3 1/4] drivers: merge common and net idpf drivers
Rather than having some of the idpf code split out into the "common"
directory, used by both a net/idpf and a net/cpfl driver, we can merge all idpf code together under net/idpf and have the cpfl driver depend on "net/idpf" rather than "common/idpf".
---
devtools/libabigail.abignore | 1 +
doc/guides/rel_notes/release_25_03.rst | 6 ++++
drivers/common/idpf/meson.build | 34 -------------------
drivers/common/meson.build | 1 -
drivers/net/intel/cpfl/meson.build | 2 +-
.../{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 | 0
.../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 | 0
.../intel}/idpf/idpf_common_rxtx.h | 0
.../intel}/idpf/idpf_common_rxtx_avx512.c | 0
.../intel}/idpf/idpf_common_virtchnl.c | 0
.../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 +-
33 files changed, 27 insertions(+), 39 deletions(-) delete mode 100644 drivers/common/idpf/meson.build 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 (100%) 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 (100%) 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 (100%) rename drivers/{common => net/intel}/idpf/idpf_common_virtchnl.h (100%) rename drivers/{common => net/intel}/idpf/version.map (100%)devtools/libabigail.abignore +1 -0
@@ -25,6 +25,7 @@ ; ; SKIP_LIBRARY=librte_common_mlx5_glue ; SKIP_LIBRARY=librte_net_mlx4_glue +; SKIP_LIBRARY=librte_common_idpf ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Experimental APIs exceptions ;
doc/guides/rel_notes/release_25_03.rst +7 -0
@@ -115,6 +115,12 @@ API Changes but to enable/disable these drivers via Meson option requires use of the new paths. For example, ``-Denable_drivers=/net/i40e`` becomes ``-Denable_drivers=/net/intel/i40e``. +* The driver ``common/idpf`` has been merged into the ``net/intel/idpf`` driver. + This change should have no impact to end applications, but, + when specifying the ``idpf`` or ``cpfl`` net drivers to meson via +``-Denable_drivers`` option, + there is no longer any need to also specify the ``common/idpf`` driver. + Note, however, ``net/intel/cpfl`` driver now depends upon the ``net/intel/idpf`` driver. + ABI Changes
-----------
drivers/common/idpf/meson.build deleted +0 -33
@@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2022 Intel Corporation - -if dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0 - subdir_done() -endif - -includes += include_directories('../iavf') - -deps += ['mbuf'] - -sources = files( - 'idpf_common_device.c', - 'idpf_common_rxtx.c', - 'idpf_common_virtchnl.c', -) - -if arch_subdir == 'x86' - if cc_has_avx512 - cflags += ['-DCC_AVX512_SUPPORT'] - avx512_args = cflags + cc_avx512_flags - if cc.has_argument('-march=skylake-avx512') - avx512_args += '-march=skylake-avx512' - endif - idpf_common_avx512_lib = static_library('idpf_common_avx512_lib', - 'idpf_common_rxtx_avx512.c', - dependencies: [static_rte_mbuf,], - include_directories: includes, - c_args: avx512_args) - objs += idpf_common_avx512_lib.extract_objects('idpf_common_rxtx_avx512.c') - endif -endif - -subdir('base')
drivers/common/meson.build +0 -1
@@ -6,7 +6,6 @@ drivers = [ 'cpt', 'dpaax', 'iavf', - 'idpf', 'ionic', 'mvep', 'octeontx',
drivers/net/intel/cpfl/meson.build +1 -1
@@ -11,7 +11,7 @@ if dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0 subdir_done() endif -deps += ['hash', 'common_idpf'] +deps += ['hash', 'net_idpf'] sources = files( 'cpfl_ethdev.c',
drivers/net/intel/idpf/base/README renamed from drivers/common/idpf/base/README rename to drivers/net/intel/idpf/base/README +0 -0
drivers/net/intel/idpf/base/idpf_alloc.h renamed from drivers/common/idpf/base/idpf_alloc.h +0 -0
drivers/net/intel/idpf/base/idpf_controlq.c renamed from drivers/common/idpf/base/idpf_controlq.c +0 -0
drivers/net/intel/idpf/base/idpf_controlq.h renamed from drivers/common/idpf/base/idpf_controlq.h +0 -0
drivers/net/intel/idpf/base/idpf_controlq_api.h renamed from drivers/common/idpf/base/idpf_controlq_api.h +0 -0
drivers/net/intel/idpf/base/idpf_controlq_setup.c renamed from drivers/common/idpf/base/idpf_controlq_setup.c +0 -0
drivers/net/intel/idpf/base/idpf_devids.h renamed from drivers/common/idpf/base/idpf_devids.h +0 -0
drivers/net/intel/idpf/base/idpf_lan_pf_regs.h renamed from drivers/common/idpf/base/idpf_lan_pf_regs.h +0 -0
drivers/net/intel/idpf/base/idpf_lan_txrx.h renamed from drivers/common/idpf/base/idpf_lan_txrx.h +0 -0
drivers/net/intel/idpf/base/idpf_lan_vf_regs.h renamed from drivers/common/idpf/base/idpf_lan_vf_regs.h +0 -0
drivers/net/intel/idpf/base/idpf_osdep.h renamed from drivers/common/idpf/base/idpf_osdep.h +0 -0
drivers/net/intel/idpf/base/idpf_prototype.h renamed from drivers/common/idpf/base/idpf_prototype.h +0 -0
drivers/net/intel/idpf/base/idpf_type.h renamed from drivers/common/idpf/base/idpf_type.h +0 -0
drivers/net/intel/idpf/base/meson.build renamed from drivers/common/idpf/base/meson.build +0 -0
drivers/net/intel/idpf/base/siov_regs.h renamed from drivers/common/idpf/base/siov_regs.h +0 -0
drivers/net/intel/idpf/base/virtchnl2.h renamed from drivers/common/idpf/base/virtchnl2.h +0 -0
drivers/net/intel/idpf/base/virtchnl2_lan_desc.h renamed from drivers/common/idpf/base/virtchnl2_lan_desc.h +0 -0
drivers/net/intel/idpf/idpf_common_device.c renamed from drivers/common/idpf/idpf_common_device.c +0 -0
drivers/net/intel/idpf/idpf_common_device.h renamed from drivers/common/idpf/idpf_common_device.h +0 -0
drivers/net/intel/idpf/idpf_common_logs.h renamed from drivers/common/idpf/idpf_common_logs.h +0 -0
drivers/net/intel/idpf/idpf_common_rxtx.c renamed from drivers/common/idpf/idpf_common_rxtx.c +0 -0
drivers/net/intel/idpf/idpf_common_rxtx.h renamed from drivers/common/idpf/idpf_common_rxtx.h +0 -0
drivers/net/intel/idpf/idpf_common_rxtx_avx512.c renamed from drivers/common/idpf/idpf_common_rxtx_avx512.c +0 -0
drivers/net/intel/idpf/idpf_common_virtchnl.c renamed from drivers/common/idpf/idpf_common_virtchnl.c +0 -0
drivers/net/intel/idpf/idpf_common_virtchnl.h renamed from drivers/common/idpf/idpf_common_virtchnl.h +0 -0
drivers/net/intel/idpf/meson.build +18 -2
@@ -7,13 +7,29 @@ if is_windows subdir_done() endif -deps += ['common_idpf'] +includes += include_directories('../../../common/iavf') sources = files( + 'idpf_common_device.c', + 'idpf_common_rxtx.c', + 'idpf_common_virtchnl.c', + 'idpf_ethdev.c', 'idpf_rxtx.c', ) -if arch_subdir == 'x86'and cc_has_avx512 +if arch_subdir == 'x86' and cc_has_avx512 cflags += ['-DCC_AVX512_SUPPORT'] + avx512_args = cflags + cc_avx512_flags + if cc.has_argument('-march=skylake-avx512') + avx512_args += '-march=skylake-avx512' + endif + idpf_common_avx512_lib = static_library('idpf_common_avx512_lib', + 'idpf_common_rxtx_avx512.c', + dependencies: static_rte_mbuf, + include_directories: includes, + c_args: avx512_args) + objs += + idpf_common_avx512_lib.extract_objects('idpf_common_rxtx_avx512.c') endif +
+subdir('base')
drivers/net/intel/idpf/version.map renamed from drivers/common/idpf/version.map rename to drivers/net/intel/idpf/version.map +0 -0
drivers/net/meson.build +1 -1
@@ -24,7 +24,6 @@ drivers = [ 'gve', 'hinic', 'hns3', - 'intel/cpfl', 'intel/e1000', 'intel/fm10k', 'intel/i40e',
@@ -34,6 +33,7 @@ drivers = [ 'intel/igc', 'intel/ipn3ke', 'intel/ixgbe', + 'intel/cpfl', # depends on idpf, so must come after it 'ionic', 'mana', 'memif',
--
Looks good to me - thanks Bruce!
2.43.0
PATCH v3 2/4 net/idpf: re-enable unused variable warnings
In reply to Bruce RichardsonThe idpf driver was being built with warnings disabled for unused variables. However, while the warning was being disabled in the base code directory, all suppressed warnings were in the main directory. Therefore, just remove the unused variables and re-enable the warnings.
--- drivers/net/intel/idpf/base/meson.build | 9 --------- drivers/net/intel/idpf/idpf_common_rxtx.c | 2 -- drivers/net/intel/idpf/idpf_common_virtchnl.c | 4 ++-- 3 files changed, 2 insertions(+), 13 deletions(-)
drivers/net/intel/idpf/base/meson.build +0 -9
@@ -5,12 +5,3 @@ sources += files( 'idpf_controlq.c', 'idpf_controlq_setup.c', ) - -error_cflags = [ - '-Wno-unused-variable', -] -foreach flag: error_cflags - if cc.has_argument(flag) - cflags += flag - endif -endforeach
drivers/net/intel/idpf/idpf_common_rxtx.c +0 -2
@@ -1178,7 +1178,6 @@ idpf_dp_singleq_recv_scatter_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,struct rte_mbuf *last_seg = rxq->pkt_last_seg;struct rte_mbuf *rxm;struct rte_mbuf *nmb; -struct rte_eth_dev *dev;const uint32_t *ptype_tbl = rxq->adapter->ptype_tbl;uint16_t rx_id = rxq->rx_tail;uint16_t rx_packet_len;
@@ -1310,7 +1309,6 @@ idpf_xmit_cleanup(struct idpf_tx_queue *txq)uint16_t nb_tx_desc = txq->nb_tx_desc;uint16_t desc_to_clean_to;uint16_t nb_tx_to_clean; -uint16_t i;volatile struct idpf_base_tx_desc *txd = txq->tx_ring;
drivers/net/intel/idpf/idpf_common_virtchnl.c +2 -2
@@ -362,7 +362,7 @@ idpf_vc_queue_grps_add(struct idpf_vport *vport, {struct idpf_adapter *adapter = vport->adapter;struct idpf_cmd_info args; -int size, qg_info_size; +int size;int err =-1 ; size = sizeof(*p2p_queue_grps_info) +
@@ -1044,7 +1044,7 @@ int idpf_vc_rxq_config_by_info(struct idpf_vport *vport, struct virtchnl2_rxq_instruct idpf_adapter *adapter = vport->adapter;struct virtchnl2_config_rx_queues *vc_rxqs =NULL ;struct idpf_cmd_info args; -int size, err, i; +int size, err; size =sizeof (*vc_rxqs) + (num_qs -1 ) *sizeof (struct virtchnl2_rxq_info );
Signature · 1 line
2.43.0
RE: [PATCH v3 2/4] net/idpf: re-enable unused variable warnings
The idpf driver was being built with warnings disabled for unused variables. However, while the warning was being disabled in the base code directory, all suppressed warnings were in the main directory. Therefore, just remove the unused variables and re-enable the warnings.
--- drivers/net/intel/idpf/base/meson.build | 9 --------- drivers/net/intel/idpf/idpf_common_rxtx.c | 2 -- drivers/net/intel/idpf/idpf_common_virtchnl.c | 4 ++-- 3 files changed, 2 insertions(+), 13 deletions(-)
drivers/net/intel/idpf/base/meson.build +0 -9
@@ -5,12 +5,3 @@ sources += files( 'idpf_controlq.c', 'idpf_controlq_setup.c', ) - -error_cflags = [ - '-Wno-unused-variable', -] -foreach flag: error_cflags - if cc.has_argument(flag) - cflags += flag - endif -endforeach
drivers/net/intel/idpf/idpf_common_rxtx.c +0 -2
@@ -1178,7 +1178,6 @@ idpf_dp_singleq_recv_scatter_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,struct rte_mbuf *last_seg = rxq->pkt_last_seg;struct rte_mbuf *rxm;struct rte_mbuf *nmb; -struct rte_eth_dev *dev;const uint32_t *ptype_tbl = rxq->adapter->ptype_tbl;uint16_t rx_id = rxq->rx_tail;uint16_t rx_packet_len;
@@ -1310,7 +1309,6 @@ idpf_xmit_cleanup(struct idpf_tx_queue *txq)uint16_t nb_tx_desc = txq->nb_tx_desc;uint16_t desc_to_clean_to;uint16_t nb_tx_to_clean; -uint16_t i;volatile struct idpf_base_tx_desc *txd = txq->tx_ring;
drivers/net/intel/idpf/idpf_common_virtchnl.c +2 -2
@@ -362,7 +362,7 @@ idpf_vc_queue_grps_add(struct idpf_vport *vport, {struct idpf_adapter *adapter = vport->adapter;struct idpf_cmd_info args; -int size, qg_info_size; +int size;int err =-1 ; size = sizeof(*p2p_queue_grps_info) +
@@ -1044,7 +1044,7 @@ int idpf_vc_rxq_config_by_info(struct idpf_vport *vport, struct virtchnl2_rxq_instruct idpf_adapter *adapter = vport->adapter;struct virtchnl2_config_rx_queues *vc_rxqs =NULL ;struct idpf_cmd_info args; -int size, err, i; +int size, err; size =sizeof (*vc_rxqs) + (num_qs -1 ) *sizeof (struct virtchnl2_rxq_info );
--
Looks good to me.
2.43.0
PATCH v3 3/4 drivers: move iavf common folder to iavf net
In reply to Bruce RichardsonThe common/iavf driver folder contains the base code for the iavf driver, which is also linked against by the ice driver and others. However, there is no need for this to be in common, and we can move it to the net/intel/iavf as a base code driver. This involves updating dependencies that were on common/iavf to net/iavf
---
devtools/libabigail.abignore | 1 +
doc/guides/rel_notes/release_25_03.rst | 5 ++++-
drivers/common/iavf/version.map | 13 -------------
drivers/common/meson.build | 1 -
.../{common/iavf => net/intel/iavf/base}/README | 0
.../iavf => net/intel/iavf/base}/iavf_adminq.c | 0
.../iavf => net/intel/iavf/base}/iavf_adminq.h | 0
.../iavf => net/intel/iavf/base}/iavf_adminq_cmd.h | 0
.../iavf => net/intel/iavf/base}/iavf_alloc.h | 0
.../iavf => net/intel/iavf/base}/iavf_common.c | 0
.../iavf => net/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
.../iavf => net/intel/iavf/base}/iavf_prototype.h | 0
.../iavf => net/intel/iavf/base}/iavf_register.h | 0
.../iavf => net/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 | 7 +++----
drivers/net/intel/idpf/meson.build | 2 +-
24 files changed, 32 insertions(+), 24 deletions(-)
delete mode 100644 drivers/common/iavf/version.map
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 (100%)
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%)devtools/libabigail.abignore +1 -0
@@ -26,6 +26,7 @@ ; SKIP_LIBRARY=librte_common_mlx5_glue ; SKIP_LIBRARY=librte_net_mlx4_glue ; SKIP_LIBRARY=librte_common_idpf +; SKIP_LIBRARY=librte_common_iavf ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Experimental APIs exceptions ;
doc/guides/rel_notes/release_25_03.rst +4 -1
@@ -116,9 +116,12 @@ API Changes For example, ``-Denable_drivers=/net/i40e`` becomes ``-Denable_drivers=/net/intel/i40e``. * The driver ``common/idpf`` has been merged into the ``net/intel/idpf`` driver. - This change should have no impact to end applications, but, + Similarly, the ``common/iavf`` driver has been merged into the ``net/intel/iavf`` driver. + These changes should have no impact to end applications, but, when specifying the ``idpf`` or ``cpfl`` net drivers to meson via ``-Denable_drivers`` option, there is no longer any need to also specify the ``common/idpf`` driver. + In the same way, when specifying the ``iavf`` or ``ice`` net drivers, + there is no need to also specify the ``common/iavf`` driver. Note, however, ``net/intel/cpfl`` driver now depends upon the ``net/intel/idpf`` driver.
drivers/common/iavf/version.map deleted +0 -13
@@ -1,13 +0,0 @@ -INTERNAL { - global: - - iavf_aq_send_msg_to_pf; - iavf_clean_arq_element; - iavf_init_adminq; - iavf_set_mac_type; - iavf_shutdown_adminq; - iavf_vf_parse_hw_config; - iavf_vf_reset; - - local: *; -};
drivers/common/meson.build +0 -1
@@ -5,7 +5,6 @@ std_deps = ['eal'] drivers = [ 'cpt', 'dpaax', - 'iavf', 'ionic', 'mvep', 'octeontx',
drivers/net/intel/iavf/base/README renamed from drivers/common/iavf/README +0 -0
drivers/net/intel/iavf/base/iavf_adminq.c renamed from drivers/common/iavf/iavf_adminq.c +0 -0
drivers/net/intel/iavf/base/iavf_adminq.h renamed from drivers/common/iavf/iavf_adminq.h +0 -0
drivers/net/intel/iavf/base/iavf_adminq_cmd.h renamed from drivers/common/iavf/iavf_adminq_cmd.h +0 -0
drivers/net/intel/iavf/base/iavf_alloc.h renamed from drivers/common/iavf/iavf_alloc.h +0 -0
drivers/net/intel/iavf/base/iavf_common.c renamed from drivers/common/iavf/iavf_common.c +0 -0
drivers/net/intel/iavf/base/iavf_devids.h renamed from drivers/common/iavf/iavf_devids.h +0 -0
drivers/net/intel/iavf/base/iavf_impl.c renamed from drivers/common/iavf/iavf_impl.c +0 -0
drivers/net/intel/iavf/base/iavf_osdep.h renamed from drivers/common/iavf/iavf_osdep.h +0 -0
drivers/net/intel/iavf/base/iavf_prototype.h renamed from drivers/common/iavf/iavf_prototype.h +0 -0
drivers/net/intel/iavf/base/iavf_register.h renamed from drivers/common/iavf/iavf_register.h +0 -0
drivers/net/intel/iavf/base/iavf_status.h renamed from drivers/common/iavf/iavf_status.h +0 -0
drivers/net/intel/iavf/base/iavf_type.h renamed from drivers/common/iavf/iavf_type.h +0 -0
drivers/net/intel/iavf/base/meson.build renamed from drivers/common/iavf/meson.build +0 -0
drivers/net/intel/iavf/base/virtchnl.h renamed from drivers/common/iavf/virtchnl.h +0 -0
drivers/net/intel/iavf/base/virtchnl_inline_ipsec.h renamed from drivers/common/iavf/virtchnl_inline_ipsec.h +0 -0
drivers/net/intel/iavf/meson.build +9 -4
@@ -7,9 +7,13 @@ endif testpmd_sources = files('iavf_testpmd.c') -deps += ['common_iavf', 'security', 'cryptodev'] +deps += ['security', 'cryptodev'] sources = files( + 'base/iavf_adminq.c', + 'base/iavf_common.c', + 'base/iavf_impl.c', + 'iavf_ethdev.c', 'iavf_rxtx.c', 'iavf_vchnl.c',
@@ -20,8 +24,9 @@ sources = files( 'iavf_ipsec_crypto.c', 'iavf_fsub.c', ) +includes += include_directories('base') -if arch_subdir == 'x86' and is_variable('static_rte_common_iavf') +if arch_subdir == 'x86' sources += files('iavf_rxtx_vec_sse.c') if is_windows and cc.get_id() != 'clang'
@@ -30,7 +35,7 @@ if arch_subdir == 'x86' and is_variable('static_rte_common_iavf') iavf_avx2_lib = static_library('iavf_avx2_lib', 'iavf_rxtx_vec_avx2.c', - dependencies: [static_rte_ethdev, static_rte_common_iavf], + dependencies: [static_rte_ethdev], include_directories: includes, c_args: [cflags, '-mavx2']) objs += iavf_avx2_lib.extract_objects('iavf_rxtx_vec_avx2.c')
@@ -43,7 +48,7 @@ if arch_subdir == 'x86' and is_variable('static_rte_common_iavf') endif iavf_avx512_lib = static_library('iavf_avx512_lib', 'iavf_rxtx_vec_avx512.c', - dependencies: [static_rte_ethdev, static_rte_common_iavf], + dependencies: [static_rte_ethdev], include_directories: includes, c_args: avx512_args) objs += iavf_avx512_lib.extract_objects('iavf_rxtx_vec_avx512.c')
drivers/net/intel/iavf/version.map +14 -0
@@ -17,3 +17,17 @@ EXPERIMENTAL { # added in 21.11 rte_pmd_ifd_dynflag_proto_xtr_ipsec_crypto_said_mask; }; + +INTERNAL { + global: + + iavf_aq_send_msg_to_pf; + iavf_clean_arq_element; + iavf_init_adminq; + iavf_set_mac_type; + iavf_shutdown_adminq; + iavf_vf_parse_hw_config; + iavf_vf_reset; + + local: *; +};
drivers/net/intel/ice/meson.build +3 -4
@@ -18,7 +18,7 @@ sources = files( testpmd_sources = files('ice_testpmd.c') -deps += ['hash', 'net', 'common_iavf'] +deps += ['hash', 'net', 'net_iavf'] includes += include_directories('base') if arch_subdir == 'x86'
@@ -30,7 +30,7 @@ if arch_subdir == 'x86' ice_avx2_lib = static_library('ice_avx2_lib', 'ice_rxtx_vec_avx2.c', - dependencies: [static_rte_ethdev, static_rte_kvargs, static_rte_hash], + dependencies: [static_rte_ethdev, static_rte_hash], include_directories: includes, c_args: [cflags, '-mavx2']) objs += ice_avx2_lib.extract_objects('ice_rxtx_vec_avx2.c')
@@ -43,8 +43,7 @@ if arch_subdir == 'x86' endif ice_avx512_lib = static_library('ice_avx512_lib', 'ice_rxtx_vec_avx512.c', - dependencies: [static_rte_ethdev, - static_rte_kvargs, static_rte_hash], + dependencies: [static_rte_ethdev, static_rte_hash], include_directories: includes, c_args: avx512_args) objs += ice_avx512_lib.extract_objects('ice_rxtx_vec_avx512.c')
drivers/net/intel/idpf/meson.build +1 -1
@@ -7,7 +7,7 @@ if is_windows subdir_done() endif -includes += include_directories('../../../common/iavf') +includes += include_directories('../iavf/base') sources = files( 'idpf_common_device.c',
Signature · 1 line
2.43.0
PATCH v3 4/4 net/intel: allow building ice driver without iavf
In reply to Bruce RichardsonThe ice PMD relies on a number of functions from the iavf base code, which can be got by linking against that iavf driver. However, since only three C files are necessary here, we can allow ice to be built independently of iavf by including the base files directly in cases where iavf is not part of the build. If it is part of the build, the dependency remains as now.
--- drivers/net/intel/iavf/base/iavf_prototype.h | 8 ++++++++ drivers/net/intel/ice/meson.build | 13 ++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-)
drivers/net/intel/iavf/base/iavf_prototype.h +8 -0
@@ -11,6 +11,14 @@#include <rte_compat.h> +/* functions only need exporting if this is being built into +* iavf driver itself. If included in ice driver, then no export +*/ +#ifndef RTE_NET_IAVF +#undef __rte_internal +#define __rte_internal +#endif +/* Prototypes for shared code functions that are not in * the standard function pointer structures. These are * mostly because they are needed even before the init
drivers/net/intel/ice/meson.build +12 -1
@@ -18,9 +18,20 @@ sources = files( testpmd_sources = files('ice_testpmd.c') -deps += ['hash', 'net', 'net_iavf'] +deps += ['hash', 'net'] includes += include_directories('base') +if dpdk_conf.has('RTE_NET_IAVF') + deps += 'net_iavf' +else + includes += include_directories('../iavf/base') + sources += files( + '../iavf/base/iavf_adminq.c', + '../iavf/base/iavf_common.c', + '../iavf/base/iavf_impl.c', + ) +endif + if arch_subdir == 'x86' sources += files('ice_rxtx_vec_sse.c')
Signature · 1 line
2.43.0
Quoted 16 lines · Bruce Richardson
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).
Quoted 8 lines
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.
v3: add libabigail exclusions for removed libs
v2: include Release note updates
v3 has some meson style issues.
UNH is picky about this as it (recently started to?) runs check-meson.py.
$ ./devtools/check-meson.py Error: Incorrect indent at drivers/net/intel/ice/meson.build:29 Error: Incorrect indent at drivers/net/intel/ice/meson.build:30 Error: Incorrect indent at drivers/net/intel/ice/meson.build:31
Signature · 1 line
David Marchand
v4 cover remove common iavf and idpf drivers
In reply to Bruce RichardsonThe 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.
v4: fix meson indentation issue flagged by check-meson.py
v3: add libabigail exclusions for removed libs
v2: include Release note updates
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
devtools/libabigail.abignore | 2 ++
doc/guides/rel_notes/release_25_03.rst | 9 +++++
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 +-
53 files changed, 78 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
PATCH v4 1/4 drivers: merge common and net idpf drivers
Rather than having some of the idpf code split out into the "common" directory, used by both a net/idpf and a net/cpfl driver, we can merge all idpf code together under net/idpf and have the cpfl driver depend on "net/idpf" rather than "common/idpf".
---
devtools/libabigail.abignore | 1 +
doc/guides/rel_notes/release_25_03.rst | 6 ++++
drivers/common/idpf/meson.build | 34 -------------------
drivers/common/meson.build | 1 -
drivers/net/intel/cpfl/meson.build | 2 +-
.../{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 | 0
.../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 | 0
.../intel}/idpf/idpf_common_rxtx.h | 0
.../intel}/idpf/idpf_common_rxtx_avx512.c | 0
.../intel}/idpf/idpf_common_virtchnl.c | 0
.../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 +-
33 files changed, 27 insertions(+), 39 deletions(-)
delete mode 100644 drivers/common/idpf/meson.build
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 (100%)
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 (100%)
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 (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_virtchnl.h (100%)
rename drivers/{common => net/intel}/idpf/version.map (100%)devtools/libabigail.abignore +1 -0
@@ -25,6 +25,7 @@ ; ; SKIP_LIBRARY=librte_common_mlx5_glue ; SKIP_LIBRARY=librte_net_mlx4_glue +; SKIP_LIBRARY=librte_common_idpf ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Experimental APIs exceptions ;
doc/guides/rel_notes/release_25_03.rst +6 -0
@@ -115,6 +115,12 @@ API Changes but to enable/disable these drivers via Meson option requires use of the new paths. For example, ``-Denable_drivers=/net/i40e`` becomes ``-Denable_drivers=/net/intel/i40e``. +* The driver ``common/idpf`` has been merged into the ``net/intel/idpf`` driver. + This change should have no impact to end applications, but, + when specifying the ``idpf`` or ``cpfl`` net drivers to meson via ``-Denable_drivers`` option, + there is no longer any need to also specify the ``common/idpf`` driver. + Note, however, ``net/intel/cpfl`` driver now depends upon the ``net/intel/idpf`` driver. + ABI Changes -----------
drivers/common/idpf/meson.build deleted +0 -34
@@ -1,34 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2022 Intel Corporation - -if dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0 - subdir_done() -endif - -includes += include_directories('../iavf') - -deps += ['mbuf'] - -sources = files( - 'idpf_common_device.c', - 'idpf_common_rxtx.c', - 'idpf_common_virtchnl.c', -) - -if arch_subdir == 'x86' - if cc_has_avx512 - cflags += ['-DCC_AVX512_SUPPORT'] - avx512_args = cflags + cc_avx512_flags - if cc.has_argument('-march=skylake-avx512') - avx512_args += '-march=skylake-avx512' - endif - idpf_common_avx512_lib = static_library('idpf_common_avx512_lib', - 'idpf_common_rxtx_avx512.c', - dependencies: [static_rte_mbuf,], - include_directories: includes, - c_args: avx512_args) - objs += idpf_common_avx512_lib.extract_objects('idpf_common_rxtx_avx512.c') - endif -endif - -subdir('base')
drivers/common/meson.build +0 -1
@@ -6,7 +6,6 @@ drivers = [ 'cpt', 'dpaax', 'iavf', - 'idpf', 'ionic', 'mvep', 'octeontx',
drivers/net/intel/cpfl/meson.build +1 -1
@@ -11,7 +11,7 @@ if dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0 subdir_done() endif -deps += ['hash', 'common_idpf'] +deps += ['hash', 'net_idpf'] sources = files( 'cpfl_ethdev.c',
drivers/net/intel/idpf/base/README renamed from drivers/common/idpf/base/README +0 -0
drivers/net/intel/idpf/base/idpf_alloc.h renamed from drivers/common/idpf/base/idpf_alloc.h +0 -0
drivers/net/intel/idpf/base/idpf_controlq.c renamed from drivers/common/idpf/base/idpf_controlq.c +0 -0
drivers/net/intel/idpf/base/idpf_controlq.h renamed from drivers/common/idpf/base/idpf_controlq.h +0 -0
drivers/net/intel/idpf/base/idpf_controlq_api.h renamed from drivers/common/idpf/base/idpf_controlq_api.h +0 -0
drivers/net/intel/idpf/base/idpf_controlq_setup.c renamed from drivers/common/idpf/base/idpf_controlq_setup.c +0 -0
drivers/net/intel/idpf/base/idpf_devids.h renamed from drivers/common/idpf/base/idpf_devids.h +0 -0
drivers/net/intel/idpf/base/idpf_lan_pf_regs.h renamed from drivers/common/idpf/base/idpf_lan_pf_regs.h +0 -0
drivers/net/intel/idpf/base/idpf_lan_txrx.h renamed from drivers/common/idpf/base/idpf_lan_txrx.h +0 -0
drivers/net/intel/idpf/base/idpf_lan_vf_regs.h renamed from drivers/common/idpf/base/idpf_lan_vf_regs.h +0 -0
drivers/net/intel/idpf/base/idpf_osdep.h renamed from drivers/common/idpf/base/idpf_osdep.h +0 -0
drivers/net/intel/idpf/base/idpf_prototype.h renamed from drivers/common/idpf/base/idpf_prototype.h +0 -0
drivers/net/intel/idpf/base/idpf_type.h renamed from drivers/common/idpf/base/idpf_type.h +0 -0
drivers/net/intel/idpf/base/meson.build renamed from drivers/common/idpf/base/meson.build +0 -0
drivers/net/intel/idpf/base/siov_regs.h renamed from drivers/common/idpf/base/siov_regs.h +0 -0
drivers/net/intel/idpf/base/virtchnl2.h renamed from drivers/common/idpf/base/virtchnl2.h +0 -0
drivers/net/intel/idpf/base/virtchnl2_lan_desc.h renamed from drivers/common/idpf/base/virtchnl2_lan_desc.h +0 -0
drivers/net/intel/idpf/idpf_common_device.c renamed from drivers/common/idpf/idpf_common_device.c +0 -0
drivers/net/intel/idpf/idpf_common_device.h renamed from drivers/common/idpf/idpf_common_device.h +0 -0
drivers/net/intel/idpf/idpf_common_logs.h renamed from drivers/common/idpf/idpf_common_logs.h +0 -0
drivers/net/intel/idpf/idpf_common_rxtx.c renamed from drivers/common/idpf/idpf_common_rxtx.c +0 -0
drivers/net/intel/idpf/idpf_common_rxtx.h renamed from drivers/common/idpf/idpf_common_rxtx.h +0 -0
drivers/net/intel/idpf/idpf_common_rxtx_avx512.c renamed from drivers/common/idpf/idpf_common_rxtx_avx512.c +0 -0
drivers/net/intel/idpf/idpf_common_virtchnl.c renamed from drivers/common/idpf/idpf_common_virtchnl.c +0 -0
drivers/net/intel/idpf/idpf_common_virtchnl.h renamed from drivers/common/idpf/idpf_common_virtchnl.h +0 -0
drivers/net/intel/idpf/meson.build +18 -2
@@ -7,13 +7,29 @@ if is_windows subdir_done() endif -deps += ['common_idpf'] +includes += include_directories('../../../common/iavf') sources = files( + 'idpf_common_device.c', + 'idpf_common_rxtx.c', + 'idpf_common_virtchnl.c', + 'idpf_ethdev.c', 'idpf_rxtx.c', ) -if arch_subdir == 'x86'and cc_has_avx512 +if arch_subdir == 'x86' and cc_has_avx512 cflags += ['-DCC_AVX512_SUPPORT'] + avx512_args = cflags + cc_avx512_flags + if cc.has_argument('-march=skylake-avx512') + avx512_args += '-march=skylake-avx512' + endif + idpf_common_avx512_lib = static_library('idpf_common_avx512_lib', + 'idpf_common_rxtx_avx512.c', + dependencies: static_rte_mbuf, + include_directories: includes, + c_args: avx512_args) + objs += idpf_common_avx512_lib.extract_objects('idpf_common_rxtx_avx512.c') endif + +subdir('base')
drivers/net/intel/idpf/version.map renamed from drivers/common/idpf/version.map +0 -0
drivers/net/meson.build +1 -1
@@ -24,7 +24,6 @@ drivers = [ 'gve', 'hinic', 'hns3', - 'intel/cpfl', 'intel/e1000', 'intel/fm10k', 'intel/i40e',
@@ -34,6 +33,7 @@ drivers = [ 'intel/igc', 'intel/ipn3ke', 'intel/ixgbe', + 'intel/cpfl', # depends on idpf, so must come after it 'ionic', 'mana', 'memif',
Signature · 1 line
2.43.0
PATCH v4 2/4 net/idpf: re-enable unused variable warnings
In reply to Bruce RichardsonThe idpf driver was being built with warnings disabled for unused variables. However, while the warning was being disabled in the base code directory, all suppressed warnings were in the main directory. Therefore, just remove the unused variables and re-enable the warnings.
--- drivers/net/intel/idpf/base/meson.build | 9 --------- drivers/net/intel/idpf/idpf_common_rxtx.c | 2 -- drivers/net/intel/idpf/idpf_common_virtchnl.c | 4 ++-- 3 files changed, 2 insertions(+), 13 deletions(-)
drivers/net/intel/idpf/base/meson.build +0 -9
@@ -5,12 +5,3 @@ sources += files( 'idpf_controlq.c', 'idpf_controlq_setup.c', ) - -error_cflags = [ - '-Wno-unused-variable', -] -foreach flag: error_cflags - if cc.has_argument(flag) - cflags += flag - endif -endforeach
drivers/net/intel/idpf/idpf_common_rxtx.c +0 -2
@@ -1178,7 +1178,6 @@ idpf_dp_singleq_recv_scatter_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,struct rte_mbuf *last_seg = rxq->pkt_last_seg;struct rte_mbuf *rxm;struct rte_mbuf *nmb; -struct rte_eth_dev *dev;const uint32_t *ptype_tbl = rxq->adapter->ptype_tbl;uint16_t rx_id = rxq->rx_tail;uint16_t rx_packet_len;
@@ -1310,7 +1309,6 @@ idpf_xmit_cleanup(struct idpf_tx_queue *txq)uint16_t nb_tx_desc = txq->nb_tx_desc;uint16_t desc_to_clean_to;uint16_t nb_tx_to_clean; -uint16_t i;volatile struct idpf_base_tx_desc *txd = txq->tx_ring;
drivers/net/intel/idpf/idpf_common_virtchnl.c +2 -2
@@ -362,7 +362,7 @@ idpf_vc_queue_grps_add(struct idpf_vport *vport, {struct idpf_adapter *adapter = vport->adapter;struct idpf_cmd_info args; -int size, qg_info_size; +int size;int err =-1 ; size = sizeof(*p2p_queue_grps_info) +
@@ -1044,7 +1044,7 @@ int idpf_vc_rxq_config_by_info(struct idpf_vport *vport, struct virtchnl2_rxq_instruct idpf_adapter *adapter = vport->adapter;struct virtchnl2_config_rx_queues *vc_rxqs =NULL ;struct idpf_cmd_info args; -int size, err, i; +int size, err; size =sizeof (*vc_rxqs) + (num_qs -1 ) *sizeof (struct virtchnl2_rxq_info );
Signature · 1 line
2.43.0
PATCH v4 3/4 drivers: move iavf common folder to iavf net
In reply to Bruce RichardsonThe common/iavf driver folder contains the base code for the iavf driver, which is also linked against by the ice driver and others. However, there is no need for this to be in common, and we can move it to the net/intel/iavf as a base code driver. This involves updating dependencies that were on common/iavf to net/iavf
---
devtools/libabigail.abignore | 1 +
doc/guides/rel_notes/release_25_03.rst | 5 ++++-
drivers/common/iavf/version.map | 13 -------------
drivers/common/meson.build | 1 -
.../{common/iavf => net/intel/iavf/base}/README | 0
.../iavf => net/intel/iavf/base}/iavf_adminq.c | 0
.../iavf => net/intel/iavf/base}/iavf_adminq.h | 0
.../iavf => net/intel/iavf/base}/iavf_adminq_cmd.h | 0
.../iavf => net/intel/iavf/base}/iavf_alloc.h | 0
.../iavf => net/intel/iavf/base}/iavf_common.c | 0
.../iavf => net/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
.../iavf => net/intel/iavf/base}/iavf_prototype.h | 0
.../iavf => net/intel/iavf/base}/iavf_register.h | 0
.../iavf => net/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 | 7 +++----
drivers/net/intel/idpf/meson.build | 2 +-
24 files changed, 32 insertions(+), 24 deletions(-)
delete mode 100644 drivers/common/iavf/version.map
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 (100%)
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%)devtools/libabigail.abignore +1 -0
@@ -26,6 +26,7 @@ ; SKIP_LIBRARY=librte_common_mlx5_glue ; SKIP_LIBRARY=librte_net_mlx4_glue ; SKIP_LIBRARY=librte_common_idpf +; SKIP_LIBRARY=librte_common_iavf ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Experimental APIs exceptions ;
doc/guides/rel_notes/release_25_03.rst +4 -1
@@ -116,9 +116,12 @@ API Changes For example, ``-Denable_drivers=/net/i40e`` becomes ``-Denable_drivers=/net/intel/i40e``. * The driver ``common/idpf`` has been merged into the ``net/intel/idpf`` driver. - This change should have no impact to end applications, but, + Similarly, the ``common/iavf`` driver has been merged into the ``net/intel/iavf`` driver. + These changes should have no impact to end applications, but, when specifying the ``idpf`` or ``cpfl`` net drivers to meson via ``-Denable_drivers`` option, there is no longer any need to also specify the ``common/idpf`` driver. + In the same way, when specifying the ``iavf`` or ``ice`` net drivers, + there is no need to also specify the ``common/iavf`` driver. Note, however, ``net/intel/cpfl`` driver now depends upon the ``net/intel/idpf`` driver.
drivers/common/iavf/version.map deleted +0 -13
@@ -1,13 +0,0 @@ -INTERNAL { - global: - - iavf_aq_send_msg_to_pf; - iavf_clean_arq_element; - iavf_init_adminq; - iavf_set_mac_type; - iavf_shutdown_adminq; - iavf_vf_parse_hw_config; - iavf_vf_reset; - - local: *; -};
drivers/common/meson.build +0 -1
@@ -5,7 +5,6 @@ std_deps = ['eal'] drivers = [ 'cpt', 'dpaax', - 'iavf', 'ionic', 'mvep', 'octeontx',
drivers/net/intel/iavf/base/README renamed from drivers/common/iavf/README +0 -0
drivers/net/intel/iavf/base/iavf_adminq.c renamed from drivers/common/iavf/iavf_adminq.c +0 -0
drivers/net/intel/iavf/base/iavf_adminq.h renamed from drivers/common/iavf/iavf_adminq.h +0 -0
drivers/net/intel/iavf/base/iavf_adminq_cmd.h renamed from drivers/common/iavf/iavf_adminq_cmd.h +0 -0
drivers/net/intel/iavf/base/iavf_alloc.h renamed from drivers/common/iavf/iavf_alloc.h +0 -0
drivers/net/intel/iavf/base/iavf_common.c renamed from drivers/common/iavf/iavf_common.c +0 -0
drivers/net/intel/iavf/base/iavf_devids.h renamed from drivers/common/iavf/iavf_devids.h +0 -0
drivers/net/intel/iavf/base/iavf_impl.c renamed from drivers/common/iavf/iavf_impl.c +0 -0
drivers/net/intel/iavf/base/iavf_osdep.h renamed from drivers/common/iavf/iavf_osdep.h +0 -0
drivers/net/intel/iavf/base/iavf_prototype.h renamed from drivers/common/iavf/iavf_prototype.h +0 -0
drivers/net/intel/iavf/base/iavf_register.h renamed from drivers/common/iavf/iavf_register.h +0 -0
drivers/net/intel/iavf/base/iavf_status.h renamed from drivers/common/iavf/iavf_status.h +0 -0
drivers/net/intel/iavf/base/iavf_type.h renamed from drivers/common/iavf/iavf_type.h +0 -0
drivers/net/intel/iavf/base/meson.build renamed from drivers/common/iavf/meson.build +0 -0
drivers/net/intel/iavf/base/virtchnl.h renamed from drivers/common/iavf/virtchnl.h +0 -0
drivers/net/intel/iavf/base/virtchnl_inline_ipsec.h renamed from drivers/common/iavf/virtchnl_inline_ipsec.h +0 -0
drivers/net/intel/iavf/meson.build +9 -4
@@ -7,9 +7,13 @@ endif testpmd_sources = files('iavf_testpmd.c') -deps += ['common_iavf', 'security', 'cryptodev'] +deps += ['security', 'cryptodev'] sources = files( + 'base/iavf_adminq.c', + 'base/iavf_common.c', + 'base/iavf_impl.c', + 'iavf_ethdev.c', 'iavf_rxtx.c', 'iavf_vchnl.c',
@@ -20,8 +24,9 @@ sources = files( 'iavf_ipsec_crypto.c', 'iavf_fsub.c', ) +includes += include_directories('base') -if arch_subdir == 'x86' and is_variable('static_rte_common_iavf') +if arch_subdir == 'x86' sources += files('iavf_rxtx_vec_sse.c') if is_windows and cc.get_id() != 'clang'
@@ -30,7 +35,7 @@ if arch_subdir == 'x86' and is_variable('static_rte_common_iavf') iavf_avx2_lib = static_library('iavf_avx2_lib', 'iavf_rxtx_vec_avx2.c', - dependencies: [static_rte_ethdev, static_rte_common_iavf], + dependencies: [static_rte_ethdev], include_directories: includes, c_args: [cflags, '-mavx2']) objs += iavf_avx2_lib.extract_objects('iavf_rxtx_vec_avx2.c')
@@ -43,7 +48,7 @@ if arch_subdir == 'x86' and is_variable('static_rte_common_iavf') endif iavf_avx512_lib = static_library('iavf_avx512_lib', 'iavf_rxtx_vec_avx512.c', - dependencies: [static_rte_ethdev, static_rte_common_iavf], + dependencies: [static_rte_ethdev], include_directories: includes, c_args: avx512_args) objs += iavf_avx512_lib.extract_objects('iavf_rxtx_vec_avx512.c')
drivers/net/intel/iavf/version.map +14 -0
@@ -17,3 +17,17 @@ EXPERIMENTAL { # added in 21.11 rte_pmd_ifd_dynflag_proto_xtr_ipsec_crypto_said_mask; }; + +INTERNAL { + global: + + iavf_aq_send_msg_to_pf; + iavf_clean_arq_element; + iavf_init_adminq; + iavf_set_mac_type; + iavf_shutdown_adminq; + iavf_vf_parse_hw_config; + iavf_vf_reset; + + local: *; +};
drivers/net/intel/ice/meson.build +3 -4
@@ -18,7 +18,7 @@ sources = files( testpmd_sources = files('ice_testpmd.c') -deps += ['hash', 'net', 'common_iavf'] +deps += ['hash', 'net', 'net_iavf'] includes += include_directories('base') if arch_subdir == 'x86'
@@ -30,7 +30,7 @@ if arch_subdir == 'x86' ice_avx2_lib = static_library('ice_avx2_lib', 'ice_rxtx_vec_avx2.c', - dependencies: [static_rte_ethdev, static_rte_kvargs, static_rte_hash], + dependencies: [static_rte_ethdev, static_rte_hash], include_directories: includes, c_args: [cflags, '-mavx2']) objs += ice_avx2_lib.extract_objects('ice_rxtx_vec_avx2.c')
@@ -43,8 +43,7 @@ if arch_subdir == 'x86' endif ice_avx512_lib = static_library('ice_avx512_lib', 'ice_rxtx_vec_avx512.c', - dependencies: [static_rte_ethdev, - static_rte_kvargs, static_rte_hash], + dependencies: [static_rte_ethdev, static_rte_hash], include_directories: includes, c_args: avx512_args) objs += ice_avx512_lib.extract_objects('ice_rxtx_vec_avx512.c')
drivers/net/intel/idpf/meson.build +1 -1
@@ -7,7 +7,7 @@ if is_windows subdir_done() endif -includes += include_directories('../../../common/iavf') +includes += include_directories('../iavf/base') sources = files( 'idpf_common_device.c',
Signature · 1 line
2.43.0
PATCH v4 4/4 net/intel: allow building ice driver without iavf
In reply to Bruce RichardsonThe ice PMD relies on a number of functions from the iavf base code, which can be got by linking against that iavf driver. However, since only three C files are necessary here, we can allow ice to be built independently of iavf by including the base files directly in cases where iavf is not part of the build. If it is part of the build, the dependency remains as now.
--- drivers/net/intel/iavf/base/iavf_prototype.h | 8 ++++++++ drivers/net/intel/ice/meson.build | 13 ++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-)
drivers/net/intel/iavf/base/iavf_prototype.h +8 -0
@@ -11,6 +11,14 @@#include <rte_compat.h> +/* functions only need exporting if this is being built into +* iavf driver itself. If included in ice driver, then no export +*/ +#ifndef RTE_NET_IAVF +#undef __rte_internal +#define __rte_internal +#endif +/* Prototypes for shared code functions that are not in * the standard function pointer structures. These are * mostly because they are needed even before the init
drivers/net/intel/ice/meson.build +12 -1
@@ -18,9 +18,20 @@ sources = files( testpmd_sources = files('ice_testpmd.c') -deps += ['hash', 'net', 'net_iavf'] +deps += ['hash', 'net'] includes += include_directories('base') +if dpdk_conf.has('RTE_NET_IAVF') + deps += 'net_iavf' +else + includes += include_directories('../iavf/base') + sources += files( + '../iavf/base/iavf_adminq.c', + '../iavf/base/iavf_common.c', + '../iavf/base/iavf_impl.c', + ) +endif + if arch_subdir == 'x86' sources += files('ice_rxtx_vec_sse.c')
Signature · 1 line
2.43.0
v5 cover remove common iavf and idpf drivers
In reply to Bruce RichardsonThe 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.
v5: rebase on top of next-net-intel tree
v4: fix meson indentation issue flagged by check-meson.py
v3: add libabigail exclusions for removed libs
v2: include Release note updates
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
devtools/libabigail.abignore | 2 +
doc/guides/rel_notes/release_25_03.rst | 9 ++++
drivers/common/iavf/version.map | 13 ------
drivers/common/idpf/meson.build | 41 -------------------
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_avx2.c | 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 | 31 ++++++++++++--
.../{common => net/intel}/idpf/version.map | 0
drivers/net/meson.build | 2 +-
54 files changed, 88 insertions(+), 82 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_avx2.c (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
PATCH v5 1/4 drivers: merge common and net idpf drivers
Rather than having some of the idpf code split out into the "common" directory, used by both a net/idpf and a net/cpfl driver, we can merge all idpf code together under net/idpf and have the cpfl driver depend on "net/idpf" rather than "common/idpf".
---
devtools/libabigail.abignore | 1 +
doc/guides/rel_notes/release_25_03.rst | 6 +++
drivers/common/idpf/meson.build | 41 -------------------
drivers/common/meson.build | 1 -
drivers/net/intel/cpfl/meson.build | 2 +-
.../{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 | 0
.../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 | 0
.../intel}/idpf/idpf_common_rxtx.h | 0
.../intel}/idpf/idpf_common_rxtx_avx2.c | 0
.../intel}/idpf/idpf_common_rxtx_avx512.c | 0
.../intel}/idpf/idpf_common_virtchnl.c | 0
.../intel}/idpf/idpf_common_virtchnl.h | 0
drivers/net/intel/idpf/meson.build | 31 ++++++++++++--
.../{common => net/intel}/idpf/version.map | 0
drivers/net/meson.build | 2 +-
34 files changed, 37 insertions(+), 47 deletions(-)
delete mode 100644 drivers/common/idpf/meson.build
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 (100%)
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 (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_rxtx.h (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_rxtx_avx2.c (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_rxtx_avx512.c (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_virtchnl.c (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_virtchnl.h (100%)
rename drivers/{common => net/intel}/idpf/version.map (100%)devtools/libabigail.abignore +1 -0
@@ -23,6 +23,7 @@ ; This is not a libabigail rule (see check-abi.sh). ; This is used for driver removal and other special cases like mlx glue libs. ; +; SKIP_LIBRARY=librte_common_idpf ; SKIP_LIBRARY=librte_common_mlx5_glue ; SKIP_LIBRARY=librte_net_mlx4_glue ; SKIP_LIBRARY=librte_net_igc
doc/guides/rel_notes/release_25_03.rst +6 -0
@@ -181,6 +181,12 @@ API Changes has changed from ``-Denable_drivers=net/igc`` to ``-Denable_drivers=net/intel/e1000``. +* The driver ``common/idpf`` has been merged into the ``net/intel/idpf`` driver. + This change should have no impact to end applications, but, + when specifying the ``idpf`` or ``cpfl`` net drivers to meson via ``-Denable_drivers`` option, + there is no longer any need to also specify the ``common/idpf`` driver. + Note, however, ``net/intel/cpfl`` driver now depends upon the ``net/intel/idpf`` driver. + ABI Changes -----------
drivers/common/idpf/meson.build deleted +0 -41
41 lines not on this page · raw message
drivers/common/meson.build +0 -1
@@ -6,7 +6,6 @@ drivers = [ 'cpt', 'dpaax', 'iavf', - 'idpf', 'ionic', 'mvep', 'octeontx',
drivers/net/intel/cpfl/meson.build +1 -1
@@ -11,7 +11,7 @@ if dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0 subdir_done() endif -deps += ['hash', 'common_idpf'] +deps += ['hash', 'net_idpf'] sources = files( 'cpfl_ethdev.c',
drivers/net/intel/idpf/base/README renamed from drivers/common/idpf/base/README +0 -0
drivers/net/intel/idpf/base/idpf_alloc.h renamed from drivers/common/idpf/base/idpf_alloc.h +0 -0
drivers/net/intel/idpf/base/idpf_controlq.c renamed from drivers/common/idpf/base/idpf_controlq.c +0 -0
drivers/net/intel/idpf/base/idpf_controlq.h renamed from drivers/common/idpf/base/idpf_controlq.h +0 -0
drivers/net/intel/idpf/base/idpf_controlq_api.h renamed from drivers/common/idpf/base/idpf_controlq_api.h +0 -0
drivers/net/intel/idpf/base/idpf_controlq_setup.c renamed from drivers/common/idpf/base/idpf_controlq_setup.c +0 -0
drivers/net/intel/idpf/base/idpf_devids.h renamed from drivers/common/idpf/base/idpf_devids.h +0 -0
drivers/net/intel/idpf/base/idpf_lan_pf_regs.h renamed from drivers/common/idpf/base/idpf_lan_pf_regs.h +0 -0
drivers/net/intel/idpf/base/idpf_lan_txrx.h renamed from drivers/common/idpf/base/idpf_lan_txrx.h +0 -0
drivers/net/intel/idpf/base/idpf_lan_vf_regs.h renamed from drivers/common/idpf/base/idpf_lan_vf_regs.h +0 -0
drivers/net/intel/idpf/base/idpf_osdep.h renamed from drivers/common/idpf/base/idpf_osdep.h +0 -0
drivers/net/intel/idpf/base/idpf_prototype.h renamed from drivers/common/idpf/base/idpf_prototype.h +0 -0
drivers/net/intel/idpf/base/idpf_type.h renamed from drivers/common/idpf/base/idpf_type.h +0 -0
drivers/net/intel/idpf/base/meson.build renamed from drivers/common/idpf/base/meson.build +0 -0
drivers/net/intel/idpf/base/siov_regs.h renamed from drivers/common/idpf/base/siov_regs.h +0 -0
drivers/net/intel/idpf/base/virtchnl2.h renamed from drivers/common/idpf/base/virtchnl2.h +0 -0
drivers/net/intel/idpf/base/virtchnl2_lan_desc.h renamed from drivers/common/idpf/base/virtchnl2_lan_desc.h +0 -0
drivers/net/intel/idpf/idpf_common_device.c renamed from drivers/common/idpf/idpf_common_device.c +0 -0
drivers/net/intel/idpf/idpf_common_device.h renamed from drivers/common/idpf/idpf_common_device.h +0 -0
drivers/net/intel/idpf/idpf_common_logs.h renamed from drivers/common/idpf/idpf_common_logs.h +0 -0
drivers/net/intel/idpf/idpf_common_rxtx.c renamed from drivers/common/idpf/idpf_common_rxtx.c +0 -0
drivers/net/intel/idpf/idpf_common_rxtx.h renamed from drivers/common/idpf/idpf_common_rxtx.h +0 -0
drivers/net/intel/idpf/idpf_common_rxtx_avx2.c renamed from drivers/common/idpf/idpf_common_rxtx_avx2.c +0 -0
drivers/net/intel/idpf/idpf_common_rxtx_avx512.c renamed from drivers/common/idpf/idpf_common_rxtx_avx512.c +0 -0
drivers/net/intel/idpf/idpf_common_virtchnl.c renamed from drivers/common/idpf/idpf_common_virtchnl.c +0 -0
drivers/net/intel/idpf/idpf_common_virtchnl.h renamed from drivers/common/idpf/idpf_common_virtchnl.h +0 -0
drivers/net/intel/idpf/meson.build +28 -3
@@ -7,13 +7,38 @@ if is_windows subdir_done() endif -deps += ['common_idpf'] +includes += include_directories('../../../common/iavf') sources = files( + 'idpf_common_device.c', + 'idpf_common_rxtx.c', + 'idpf_common_virtchnl.c', + 'idpf_ethdev.c', 'idpf_rxtx.c', ) -if arch_subdir == 'x86'and cc_has_avx512 - cflags += ['-DCC_AVX512_SUPPORT'] +if arch_subdir == 'x86' + idpf_avx2_lib = static_library('idpf_avx2_lib', + 'idpf_common_rxtx_avx2.c', + dependencies: [static_rte_ethdev, static_rte_hash], + include_directories: includes, + c_args: [cflags, '-mavx2']) + objs += idpf_avx2_lib.extract_objects('idpf_common_rxtx_avx2.c') + + if cc_has_avx512 + cflags += ['-DCC_AVX512_SUPPORT'] + avx512_args = cflags + cc_avx512_flags + if cc.has_argument('-march=skylake-avx512') + avx512_args += '-march=skylake-avx512' + endif + idpf_common_avx512_lib = static_library('idpf_common_avx512_lib', + 'idpf_common_rxtx_avx512.c', + dependencies: static_rte_mbuf, + include_directories: includes, + c_args: avx512_args) + objs += idpf_common_avx512_lib.extract_objects('idpf_common_rxtx_avx512.c') + endif endif + +subdir('base')
drivers/net/intel/idpf/version.map renamed from drivers/common/idpf/version.map +0 -0
drivers/net/meson.build +1 -1
@@ -24,7 +24,6 @@ drivers = [ 'gve', 'hinic', 'hns3', - 'intel/cpfl', 'intel/e1000', 'intel/fm10k', 'intel/i40e',
@@ -33,6 +32,7 @@ drivers = [ 'intel/idpf', 'intel/ipn3ke', 'intel/ixgbe', + 'intel/cpfl', # depends on idpf, so must come after it 'ionic', 'mana', 'memif',
Signature · 1 line
2.43.0
PATCH v5 2/4 net/idpf: re-enable unused variable warnings
In reply to Bruce RichardsonThe idpf driver was being built with warnings disabled for unused variables. However, while the warning was being disabled in the base code directory, all suppressed warnings were in the main directory. Therefore, just remove the unused variables and re-enable the warnings.
--- drivers/net/intel/idpf/base/meson.build | 9 --------- drivers/net/intel/idpf/idpf_common_rxtx.c | 2 -- drivers/net/intel/idpf/idpf_common_virtchnl.c | 4 ++-- 3 files changed, 2 insertions(+), 13 deletions(-)
drivers/net/intel/idpf/base/meson.build +0 -9
@@ -5,12 +5,3 @@ sources += files( 'idpf_controlq.c', 'idpf_controlq_setup.c', ) - -error_cflags = [ - '-Wno-unused-variable', -] -foreach flag: error_cflags - if cc.has_argument(flag) - cflags += flag - endif -endforeach
drivers/net/intel/idpf/idpf_common_rxtx.c +0 -2
@@ -1178,7 +1178,6 @@ idpf_dp_singleq_recv_scatter_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,struct rte_mbuf *last_seg = rxq->pkt_last_seg;struct rte_mbuf *rxm;struct rte_mbuf *nmb; -struct rte_eth_dev *dev;const uint32_t *ptype_tbl = rxq->adapter->ptype_tbl;uint16_t rx_id = rxq->rx_tail;uint16_t rx_packet_len;
@@ -1310,7 +1309,6 @@ idpf_xmit_cleanup(struct idpf_tx_queue *txq)uint16_t nb_tx_desc = txq->nb_tx_desc;uint16_t desc_to_clean_to;uint16_t nb_tx_to_clean; -uint16_t i;volatile struct idpf_base_tx_desc *txd = txq->tx_ring;
drivers/net/intel/idpf/idpf_common_virtchnl.c +2 -2
@@ -362,7 +362,7 @@ idpf_vc_queue_grps_add(struct idpf_vport *vport, {struct idpf_adapter *adapter = vport->adapter;struct idpf_cmd_info args; -int size, qg_info_size; +int size;int err =-1 ; size = sizeof(*p2p_queue_grps_info) +
@@ -1044,7 +1044,7 @@ int idpf_vc_rxq_config_by_info(struct idpf_vport *vport, struct virtchnl2_rxq_instruct idpf_adapter *adapter = vport->adapter;struct virtchnl2_config_rx_queues *vc_rxqs =NULL ;struct idpf_cmd_info args; -int size, err, i; +int size, err; size =sizeof (*vc_rxqs) + (num_qs -1 ) *sizeof (struct virtchnl2_rxq_info );
Signature · 1 line
2.43.0
PATCH v5 3/4 drivers: move iavf common folder to iavf net
In reply to Bruce RichardsonThe common/iavf driver folder contains the base code for the iavf driver, which is also linked against by the ice driver and others. However, there is no need for this to be in common, and we can move it to the net/intel/iavf as a base code driver. This involves updating dependencies that were on common/iavf to net/iavf
---
devtools/libabigail.abignore | 1 +
doc/guides/rel_notes/release_25_03.rst | 5 ++++-
drivers/common/iavf/version.map | 13 -------------
drivers/common/meson.build | 1 -
.../{common/iavf => net/intel/iavf/base}/README | 0
.../iavf => net/intel/iavf/base}/iavf_adminq.c | 0
.../iavf => net/intel/iavf/base}/iavf_adminq.h | 0
.../iavf => net/intel/iavf/base}/iavf_adminq_cmd.h | 0
.../iavf => net/intel/iavf/base}/iavf_alloc.h | 0
.../iavf => net/intel/iavf/base}/iavf_common.c | 0
.../iavf => net/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
.../iavf => net/intel/iavf/base}/iavf_prototype.h | 0
.../iavf => net/intel/iavf/base}/iavf_register.h | 0
.../iavf => net/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 | 7 +++----
drivers/net/intel/idpf/meson.build | 2 +-
24 files changed, 32 insertions(+), 24 deletions(-)
delete mode 100644 drivers/common/iavf/version.map
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 (100%)
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%)devtools/libabigail.abignore +1 -0
@@ -23,6 +23,7 @@ ; This is not a libabigail rule (see check-abi.sh). ; This is used for driver removal and other special cases like mlx glue libs. ; +; SKIP_LIBRARY=librte_common_iavf ; SKIP_LIBRARY=librte_common_idpf ; SKIP_LIBRARY=librte_common_mlx5_glue ; SKIP_LIBRARY=librte_net_mlx4_glue
doc/guides/rel_notes/release_25_03.rst +4 -1
@@ -182,9 +182,12 @@ API Changes ``-Denable_drivers=net/intel/e1000``. * The driver ``common/idpf`` has been merged into the ``net/intel/idpf`` driver. - This change should have no impact to end applications, but, + Similarly, the ``common/iavf`` driver has been merged into the ``net/intel/iavf`` driver. + These changes should have no impact to end applications, but, when specifying the ``idpf`` or ``cpfl`` net drivers to meson via ``-Denable_drivers`` option, there is no longer any need to also specify the ``common/idpf`` driver. + In the same way, when specifying the ``iavf`` or ``ice`` net drivers, + there is no need to also specify the ``common/iavf`` driver. Note, however, ``net/intel/cpfl`` driver now depends upon the ``net/intel/idpf`` driver.
drivers/common/iavf/version.map deleted +0 -13
@@ -1,13 +0,0 @@ -INTERNAL { - global: - - iavf_aq_send_msg_to_pf; - iavf_clean_arq_element; - iavf_init_adminq; - iavf_set_mac_type; - iavf_shutdown_adminq; - iavf_vf_parse_hw_config; - iavf_vf_reset; - - local: *; -};
drivers/common/meson.build +0 -1
@@ -5,7 +5,6 @@ std_deps = ['eal'] drivers = [ 'cpt', 'dpaax', - 'iavf', 'ionic', 'mvep', 'octeontx',
drivers/net/intel/iavf/base/README renamed from drivers/common/iavf/README +0 -0
drivers/net/intel/iavf/base/iavf_adminq.c renamed from drivers/common/iavf/iavf_adminq.c +0 -0
drivers/net/intel/iavf/base/iavf_adminq.h renamed from drivers/common/iavf/iavf_adminq.h +0 -0
drivers/net/intel/iavf/base/iavf_adminq_cmd.h renamed from drivers/common/iavf/iavf_adminq_cmd.h +0 -0
drivers/net/intel/iavf/base/iavf_alloc.h renamed from drivers/common/iavf/iavf_alloc.h +0 -0
drivers/net/intel/iavf/base/iavf_common.c renamed from drivers/common/iavf/iavf_common.c +0 -0
drivers/net/intel/iavf/base/iavf_devids.h renamed from drivers/common/iavf/iavf_devids.h +0 -0
drivers/net/intel/iavf/base/iavf_impl.c renamed from drivers/common/iavf/iavf_impl.c +0 -0
drivers/net/intel/iavf/base/iavf_osdep.h renamed from drivers/common/iavf/iavf_osdep.h +0 -0
drivers/net/intel/iavf/base/iavf_prototype.h renamed from drivers/common/iavf/iavf_prototype.h +0 -0
drivers/net/intel/iavf/base/iavf_register.h renamed from drivers/common/iavf/iavf_register.h +0 -0
drivers/net/intel/iavf/base/iavf_status.h renamed from drivers/common/iavf/iavf_status.h +0 -0
drivers/net/intel/iavf/base/iavf_type.h renamed from drivers/common/iavf/iavf_type.h +0 -0
drivers/net/intel/iavf/base/meson.build renamed from drivers/common/iavf/meson.build +0 -0
drivers/net/intel/iavf/base/virtchnl.h renamed from drivers/common/iavf/virtchnl.h +0 -0
drivers/net/intel/iavf/base/virtchnl_inline_ipsec.h renamed from drivers/common/iavf/virtchnl_inline_ipsec.h +0 -0
drivers/net/intel/iavf/meson.build +9 -4
@@ -7,9 +7,13 @@ endif testpmd_sources = files('iavf_testpmd.c') -deps += ['common_iavf', 'security', 'cryptodev'] +deps += ['security', 'cryptodev'] sources = files( + 'base/iavf_adminq.c', + 'base/iavf_common.c', + 'base/iavf_impl.c', + 'iavf_ethdev.c', 'iavf_rxtx.c', 'iavf_vchnl.c',
@@ -20,8 +24,9 @@ sources = files( 'iavf_ipsec_crypto.c', 'iavf_fsub.c', ) +includes += include_directories('base') -if arch_subdir == 'x86' and is_variable('static_rte_common_iavf') +if arch_subdir == 'x86' sources += files('iavf_rxtx_vec_sse.c') if is_windows and cc.get_id() != 'clang'
@@ -30,7 +35,7 @@ if arch_subdir == 'x86' and is_variable('static_rte_common_iavf') iavf_avx2_lib = static_library('iavf_avx2_lib', 'iavf_rxtx_vec_avx2.c', - dependencies: [static_rte_ethdev, static_rte_common_iavf], + dependencies: [static_rte_ethdev], include_directories: includes, c_args: [cflags, '-mavx2']) objs += iavf_avx2_lib.extract_objects('iavf_rxtx_vec_avx2.c')
@@ -43,7 +48,7 @@ if arch_subdir == 'x86' and is_variable('static_rte_common_iavf') endif iavf_avx512_lib = static_library('iavf_avx512_lib', 'iavf_rxtx_vec_avx512.c', - dependencies: [static_rte_ethdev, static_rte_common_iavf], + dependencies: [static_rte_ethdev], include_directories: includes, c_args: avx512_args) objs += iavf_avx512_lib.extract_objects('iavf_rxtx_vec_avx512.c')
drivers/net/intel/iavf/version.map +14 -0
@@ -17,3 +17,17 @@ EXPERIMENTAL { # added in 21.11 rte_pmd_ifd_dynflag_proto_xtr_ipsec_crypto_said_mask; }; + +INTERNAL { + global: + + iavf_aq_send_msg_to_pf; + iavf_clean_arq_element; + iavf_init_adminq; + iavf_set_mac_type; + iavf_shutdown_adminq; + iavf_vf_parse_hw_config; + iavf_vf_reset; + + local: *; +};
drivers/net/intel/ice/meson.build +3 -4
@@ -18,7 +18,7 @@ sources = files( testpmd_sources = files('ice_testpmd.c') -deps += ['hash', 'net', 'common_iavf'] +deps += ['hash', 'net', 'net_iavf'] includes += include_directories('base') if arch_subdir == 'x86'
@@ -30,7 +30,7 @@ if arch_subdir == 'x86' ice_avx2_lib = static_library('ice_avx2_lib', 'ice_rxtx_vec_avx2.c', - dependencies: [static_rte_ethdev, static_rte_kvargs, static_rte_hash], + dependencies: [static_rte_ethdev, static_rte_hash], include_directories: includes, c_args: [cflags, '-mavx2']) objs += ice_avx2_lib.extract_objects('ice_rxtx_vec_avx2.c')
@@ -43,8 +43,7 @@ if arch_subdir == 'x86' endif ice_avx512_lib = static_library('ice_avx512_lib', 'ice_rxtx_vec_avx512.c', - dependencies: [static_rte_ethdev, - static_rte_kvargs, static_rte_hash], + dependencies: [static_rte_ethdev, static_rte_hash], include_directories: includes, c_args: avx512_args) objs += ice_avx512_lib.extract_objects('ice_rxtx_vec_avx512.c')
drivers/net/intel/idpf/meson.build +1 -1
@@ -7,7 +7,7 @@ if is_windows subdir_done() endif -includes += include_directories('../../../common/iavf') +includes += include_directories('../iavf/base') sources = files( 'idpf_common_device.c',
Signature · 1 line
2.43.0
RE: [PATCH v5 3/4] drivers: move iavf common folder to iavf net
Quoted 324 lines
The common/iavf driver folder contains the base code for the iavf driver, which is also linked against by the ice driver and others. However, there is no need for this to be in common, and we can move it to the
net/intel/iavfas a base code driver. This involves updating dependencies that were on common/iavf to net/iavfSigned-off-by Bruce Richardson <[email protected]>--- devtools/libabigail.abignore | 1 + doc/guides/rel_notes/release_25_03.rst | 5 ++++- drivers/common/iavf/version.map | 13 ------------- drivers/common/meson.build | 1 - .../{common/iavf => net/intel/iavf/base}/README | 0 .../iavf => net/intel/iavf/base}/iavf_adminq.c | 0 .../iavf => net/intel/iavf/base}/iavf_adminq.h | 0 .../iavf => net/intel/iavf/base}/iavf_adminq_cmd.h | 0 .../iavf => net/intel/iavf/base}/iavf_alloc.h | 0 .../iavf => net/intel/iavf/base}/iavf_common.c | 0 .../iavf => net/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 .../iavf => net/intel/iavf/base}/iavf_prototype.h | 0 .../iavf => net/intel/iavf/base}/iavf_register.h | 0 .../iavf => net/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 | 7 +++---- drivers/net/intel/idpf/meson.build | 2 +- 24 files changed, 32 insertions(+), 24 deletions(-) delete mode 100644 drivers/common/iavf/version.map 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 (100%) 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%)
devtools/libabigail.abignore +1
-0@@ -23,6 +23,7 @@ ; This is not a libabigail rule (see check-abi.sh). ; This is used for driver removal and other special cases like mlx glue libs. ; +; SKIP_LIBRARY=librte_common_iavf ; SKIP_LIBRARY=librte_common_idpf ; SKIP_LIBRARY=librte_common_mlx5_glue ; SKIP_LIBRARY=librte_net_mlx4_gluedoc/guides/rel_notes/release_25_03.rst +0
-0@@ -182,9 +182,12 @@ API Changes ``-Denable_drivers=net/intel/e1000``. * The driver ``common/idpf`` has been merged into the ``net/intel/idpf``driver.
doc/guides/rel_notes/release_25_03.rst +1
-1- This change should have no impact to end applications, but, + Similarly, the ``common/iavf`` driver has been merged into the``net/intel/iavf`` driver.
+ These changes should have no impact to end applications, but, when specifying the ``idpf`` or ``cpfl`` net drivers to meson via ``-
Denable_drivers`` option,
there is no longer any need to also specify the ``common/idpf`` driver.doc/guides/rel_notes/release_25_03.rst +2
-0+ In the same way, when specifying the ``iavf`` or ``ice`` net drivers, + there is no need to also specify the ``common/iavf`` driver. Note, however, ``net/intel/cpfl`` driver now depends upon the``net/intel/idpf`` driver.
drivers/common/iavf/version.map deleted +0
-13@@ -1,13 +0,0 @@ -INTERNAL { - global: - - iavf_aq_send_msg_to_pf; - iavf_clean_arq_element; - iavf_init_adminq; - iavf_set_mac_type; - iavf_shutdown_adminq; - iavf_vf_parse_hw_config; - iavf_vf_reset; - - local: *; -};drivers/common/meson.build +0
-1@@ -5,7 +5,6 @@ std_deps = ['eal'] drivers = [ 'cpt', 'dpaax', - 'iavf', 'ionic', 'mvep', 'octeontx',drivers/net/intel/iavf/base/README renamed from drivers/common/iavf/README +0
-0drivers/net/intel/iavf/base/iavf_adminq.c renamed from drivers/common/iavf/iavf_adminq.c +0
-0drivers/net/intel/iavf/base/iavf_adminq.h renamed from drivers/common/iavf/iavf_adminq.h +0
-0drivers/net/intel/iavf/base/iavf_adminq_cmd.h renamed from drivers/common/iavf/iavf_adminq_cmd.h +0
-0drivers/net/intel/iavf/base/iavf_alloc.h renamed from drivers/common/iavf/iavf_alloc.h +0
-0drivers/net/intel/iavf/base/iavf_common.c renamed from drivers/common/iavf/iavf_common.c +0
-0drivers/net/intel/iavf/base/iavf_devids.h renamed from drivers/common/iavf/iavf_devids.h +0
-0drivers/net/intel/iavf/base/iavf_impl.c renamed from drivers/common/iavf/iavf_impl.c +0
-0drivers/net/intel/iavf/base/iavf_osdep.h renamed from drivers/common/iavf/iavf_osdep.h +0
-0drivers/net/intel/iavf/base/iavf_prototype.h renamed from drivers/common/iavf/iavf_prototype.h +0
-0drivers/net/intel/iavf/base/iavf_register.h renamed from drivers/common/iavf/iavf_register.h +0
-0drivers/net/intel/iavf/base/iavf_status.h renamed from drivers/common/iavf/iavf_status.h +0
-0drivers/net/intel/iavf/base/iavf_type.h renamed from drivers/common/iavf/iavf_type.h +0
-0drivers/net/intel/iavf/base/meson.build renamed from drivers/common/iavf/meson.build +0
-0drivers/net/intel/iavf/base/virtchnl.h renamed from drivers/common/iavf/virtchnl.h +0
-0drivers/net/intel/iavf/base/virtchnl_inline_ipsec.h renamed from drivers/common/iavf/virtchnl_inline_ipsec.h +0
-0drivers/net/intel/iavf/meson.build +8
-3@@ -7,9 +7,13 @@ endif testpmd_sources = files('iavf_testpmd.c') -deps += ['common_iavf', 'security', 'cryptodev'] +deps += ['security', 'cryptodev'] sources = files( + 'base/iavf_adminq.c', + 'base/iavf_common.c', + 'base/iavf_impl.c', + 'iavf_ethdev.c', 'iavf_rxtx.c', 'iavf_vchnl.c',@@ -20,8 +24,9 @@ sources = files( 'iavf_ipsec_crypto.c', 'iavf_fsub.c', ) +includes += include_directories('base') -if arch_subdir == 'x86' and is_variable('static_rte_common_iavf') +if arch_subdir == 'x86' sources += files('iavf_rxtx_vec_sse.c') if is_windows and cc.get_id() != 'clang'@@ -30,7 +35,7 @@ if arch_subdir == 'x86' and is_variable('static_rte_common_iavf') iavf_avx2_lib = static_library('iavf_avx2_lib', 'iavf_rxtx_vec_avx2.c', - dependencies: [static_rte_ethdev, static_rte_common_iavf], + dependencies: [static_rte_ethdev], include_directories: includes, c_args: [cflags, '-mavx2'])objs += iavf_avx2_lib.extract_objects('iavf_rxtx_vec_avx2.c')drivers/net/intel/iavf/meson.build +1
-1@@ -43,7 +48,7 @@ if arch_subdir == 'x86' and is_variable('static_rte_common_iavf') endif iavf_avx512_lib = static_library('iavf_avx512_lib', 'iavf_rxtx_vec_avx512.c', - dependencies: [static_rte_ethdev, static_rte_common_iavf], + dependencies: [static_rte_ethdev], include_directories: includes, c_args: avx512_args)objs += iavf_avx512_lib.extract_objects('iavf_rxtx_vec_avx512.c')drivers/net/intel/iavf/version.map +14
-0@@ -17,3 +17,17 @@ EXPERIMENTAL { # added in 21.11 rte_pmd_ifd_dynflag_proto_xtr_ipsec_crypto_said_mask; }; + +INTERNAL { + global: + + iavf_aq_send_msg_to_pf; + iavf_clean_arq_element; + iavf_init_adminq; + iavf_set_mac_type; + iavf_shutdown_adminq; + iavf_vf_parse_hw_config; + iavf_vf_reset; + + local: *; +};drivers/net/intel/ice/meson.build +3
-4@@ -18,7 +18,7 @@ sources = files( testpmd_sources = files('ice_testpmd.c') -deps += ['hash', 'net', 'common_iavf'] +deps += ['hash', 'net', 'net_iavf'] includes += include_directories('base') if arch_subdir == 'x86'@@ -30,7 +30,7 @@ if arch_subdir == 'x86' ice_avx2_lib = static_library('ice_avx2_lib', 'ice_rxtx_vec_avx2.c', - dependencies: [static_rte_ethdev, static_rte_kvargs, static_rte_hash], + dependencies: [static_rte_ethdev, static_rte_hash], include_directories: includes, c_args: [cflags, '-mavx2']) objs += ice_avx2_lib.extract_objects('ice_rxtx_vec_avx2.c')@@ -43,8 +43,7 @@ if arch_subdir == 'x86' endif ice_avx512_lib = static_library('ice_avx512_lib', 'ice_rxtx_vec_avx512.c', - dependencies: [static_rte_ethdev, - static_rte_kvargs, static_rte_hash], + dependencies: [static_rte_ethdev, static_rte_hash], include_directories: includes, c_args: avx512_args) objs += ice_avx512_lib.extract_objects('ice_rxtx_vec_avx512.c')drivers/net/intel/idpf/meson.build +1
-2@@ -7,7 +7,7 @@ if is_windows subdir_done() endif -includes += include_directories('../../../common/iavf') +includes += include_directories('../iavf/base') sources = files( 'idpf_common_device.c', --
Quoted 1 line
2.43.0
Patch looks good to me Bruce.
PATCH v5 4/4 net/intel: allow building ice driver without iavf
In reply to Bruce RichardsonThe ice PMD relies on a number of functions from the iavf base code, which can be got by linking against that iavf driver. However, since only three C files are necessary here, we can allow ice to be built independently of iavf by including the base files directly in cases where iavf is not part of the build. If it is part of the build, the dependency remains as now.
--- drivers/net/intel/iavf/base/iavf_prototype.h | 8 ++++++++ drivers/net/intel/ice/meson.build | 13 ++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-)
drivers/net/intel/iavf/base/iavf_prototype.h +8 -0
@@ -11,6 +11,14 @@#include <rte_compat.h> +/* functions only need exporting if this is being built into +* iavf driver itself. If included in ice driver, then no export +*/ +#ifndef RTE_NET_IAVF +#undef __rte_internal +#define __rte_internal +#endif +/* Prototypes for shared code functions that are not in * the standard function pointer structures. These are * mostly because they are needed even before the init
drivers/net/intel/ice/meson.build +12 -1
@@ -18,9 +18,20 @@ sources = files( testpmd_sources = files('ice_testpmd.c') -deps += ['hash', 'net', 'net_iavf'] +deps += ['hash', 'net'] includes += include_directories('base') +if dpdk_conf.has('RTE_NET_IAVF') + deps += 'net_iavf' +else + includes += include_directories('../iavf/base') + sources += files( + '../iavf/base/iavf_adminq.c', + '../iavf/base/iavf_common.c', + '../iavf/base/iavf_impl.c', + ) +endif + if arch_subdir == 'x86' sources += files('ice_rxtx_vec_sse.c')
Signature · 1 line
2.43.0
RE: [PATCH v5 4/4] net/intel: allow building ice driver without iavf
Quoted 61 lines
The ice PMD relies on a number of functions from the iavf base code, which can be got by linking against that iavf driver. However, since only three C files are necessary here, we can allow ice to be built independently of iavf by including the base files directly in cases where iavf is not part of the build. If it is part of the build, the dependency remains as now.
Signed-off-by Bruce Richardson <[email protected]>--- drivers/net/intel/iavf/base/iavf_prototype.h | 8 ++++++++ drivers/net/intel/ice/meson.build | 13 ++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-)drivers/net/intel/iavf/base/iavf_prototype.h +8
-0@@ -11,6 +11,14 @@#include <rte_compat.h> +/* functions only need exporting if this is being built into +* iavf driver itself. If included in ice driver, then no export +*/ +#ifndef RTE_NET_IAVF +#undef __rte_internal +#define __rte_internal +#endif +/* Prototypes for shared code functions that are not in * the standard function pointer structures. These are * mostly because they are needed even before the init drivers/net/intel/ice/meson.build +12
-2@@ -18,9 +18,20 @@ sources = files( testpmd_sources = files('ice_testpmd.c') -deps += ['hash', 'net', 'net_iavf'] +deps += ['hash', 'net'] includes += include_directories('base') +if dpdk_conf.has('RTE_NET_IAVF') + deps += 'net_iavf' +else + includes += include_directories('../iavf/base') + sources += files( + '../iavf/base/iavf_adminq.c', + '../iavf/base/iavf_common.c', + '../iavf/base/iavf_impl.c', + ) +endif + if arch_subdir == 'x86' sources += files('ice_rxtx_vec_sse.c') --
Quoted 1 line
2.43.0
Checks out ok for me, looks good.
Quoted 26 lines · Bruce Richardson
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.
v5: rebase on top of next-net-intel tree
v4: fix meson indentation issue flagged bycheck-meson.py
v3: add libabigail exclusions for removed libs
v2: include Release note updates
Quoted 6 lines
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
Series applied to dpdk-next-net-intel
/Bruce