@@ -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 ;
@@ -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.
deleted file mode 100644
@@ -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: *;
-};
@@ -5,7 +5,6 @@ std_deps = ['eal']
drivers = [
'cpt',
'dpaax',
- 'iavf',
'ionic',
'mvep',
'octeontx',
similarity index 100%
rename from drivers/common/iavf/README
rename to drivers/net/intel/iavf/base/README
similarity index 100%
rename from drivers/common/iavf/iavf_adminq.c
rename to drivers/net/intel/iavf/base/iavf_adminq.c
similarity index 100%
rename from drivers/common/iavf/iavf_adminq.h
rename to drivers/net/intel/iavf/base/iavf_adminq.h
similarity index 100%
rename from drivers/common/iavf/iavf_adminq_cmd.h
rename to drivers/net/intel/iavf/base/iavf_adminq_cmd.h
similarity index 100%
rename from drivers/common/iavf/iavf_alloc.h
rename to drivers/net/intel/iavf/base/iavf_alloc.h
similarity index 100%
rename from drivers/common/iavf/iavf_common.c
rename to drivers/net/intel/iavf/base/iavf_common.c
similarity index 100%
rename from drivers/common/iavf/iavf_devids.h
rename to drivers/net/intel/iavf/base/iavf_devids.h
similarity index 100%
rename from drivers/common/iavf/iavf_impl.c
rename to drivers/net/intel/iavf/base/iavf_impl.c
similarity index 100%
rename from drivers/common/iavf/iavf_osdep.h
rename to drivers/net/intel/iavf/base/iavf_osdep.h
similarity index 100%
rename from drivers/common/iavf/iavf_prototype.h
rename to drivers/net/intel/iavf/base/iavf_prototype.h
similarity index 100%
rename from drivers/common/iavf/iavf_register.h
rename to drivers/net/intel/iavf/base/iavf_register.h
similarity index 100%
rename from drivers/common/iavf/iavf_status.h
rename to drivers/net/intel/iavf/base/iavf_status.h
similarity index 100%
rename from drivers/common/iavf/iavf_type.h
rename to drivers/net/intel/iavf/base/iavf_type.h
similarity index 100%
rename from drivers/common/iavf/meson.build
rename to drivers/net/intel/iavf/base/meson.build
similarity index 100%
rename from drivers/common/iavf/virtchnl.h
rename to drivers/net/intel/iavf/base/virtchnl.h
similarity index 100%
rename from drivers/common/iavf/virtchnl_inline_ipsec.h
rename to drivers/net/intel/iavf/base/virtchnl_inline_ipsec.h
@@ -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')
@@ -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: *;
+};
@@ -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')
@@ -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',