Skip to contentSkip to conversation

Reduce code duplication across Intel NIC drivers

RFC PATCH In review Bruce Richardson 8 participants 206 messages Nov 22, 2024 – Jan 28, 2025 Page 4 of 6

Subsystems (2)
lore
Share & tools
lore
#132 lore raw

RFC PATCH 1/1 net: move intel drivers to intel subdirectory

In reply to Bruce Richardson

Consolidate all Intel HW NIC drivers into a driver/net/intel This matches the layout used for drivers in the kernel, and potentially enabling easier sharing among drivers.

---
 drivers/meson.build                           |  6 +++++-
 drivers/net/{ => intel}/cpfl/cpfl_actions.h   |  0
 drivers/net/{ => intel}/cpfl/cpfl_controlq.c  |  0
 drivers/net/{ => intel}/cpfl/cpfl_controlq.h  |  0
 drivers/net/{ => intel}/cpfl/cpfl_cpchnl.h    |  0
 drivers/net/{ => intel}/cpfl/cpfl_ethdev.c    |  0
 drivers/net/{ => intel}/cpfl/cpfl_ethdev.h    |  0
 drivers/net/{ => intel}/cpfl/cpfl_flow.c      |  0
 drivers/net/{ => intel}/cpfl/cpfl_flow.h      |  0
 .../{ => intel}/cpfl/cpfl_flow_engine_fxp.c   |  0
 .../net/{ => intel}/cpfl/cpfl_flow_parser.c   |  0
 .../net/{ => intel}/cpfl/cpfl_flow_parser.h   |  0
 drivers/net/{ => intel}/cpfl/cpfl_fxp_rule.c  |  0
 drivers/net/{ => intel}/cpfl/cpfl_fxp_rule.h  |  0
 drivers/net/{ => intel}/cpfl/cpfl_logs.h      |  0
 .../net/{ => intel}/cpfl/cpfl_representor.c   |  0
 .../net/{ => intel}/cpfl/cpfl_representor.h   |  0
 drivers/net/{ => intel}/cpfl/cpfl_rules.c     |  0
 drivers/net/{ => intel}/cpfl/cpfl_rules.h     |  0
 drivers/net/{ => intel}/cpfl/cpfl_rxtx.c      |  0
 drivers/net/{ => intel}/cpfl/cpfl_rxtx.h      |  0
 .../{ => intel}/cpfl/cpfl_rxtx_vec_common.h   |  0
 drivers/net/{ => intel}/cpfl/cpfl_vchnl.c     |  0
 drivers/net/{ => intel}/cpfl/meson.build      |  0
 drivers/net/{ => intel}/e1000/base/README     |  0
 .../e1000/base/e1000_80003es2lan.c            |  0
 .../e1000/base/e1000_80003es2lan.h            |  0
 .../net/{ => intel}/e1000/base/e1000_82540.c  |  0
 .../net/{ => intel}/e1000/base/e1000_82541.c  |  0
 .../net/{ => intel}/e1000/base/e1000_82541.h  |  0
 .../net/{ => intel}/e1000/base/e1000_82542.c  |  0
 .../net/{ => intel}/e1000/base/e1000_82543.c  |  0
 .../net/{ => intel}/e1000/base/e1000_82543.h  |  0
 .../net/{ => intel}/e1000/base/e1000_82571.c  |  0
 .../net/{ => intel}/e1000/base/e1000_82571.h  |  0
 .../net/{ => intel}/e1000/base/e1000_82575.c  |  0
 .../net/{ => intel}/e1000/base/e1000_82575.h  |  0
 .../net/{ => intel}/e1000/base/e1000_api.c    |  0
 .../net/{ => intel}/e1000/base/e1000_api.h    |  0
 .../net/{ => intel}/e1000/base/e1000_base.c   |  0
 .../net/{ => intel}/e1000/base/e1000_base.h   |  0
 .../{ => intel}/e1000/base/e1000_defines.h    |  0
 drivers/net/{ => intel}/e1000/base/e1000_hw.h |  0
 .../net/{ => intel}/e1000/base/e1000_i210.c   |  0
 .../net/{ => intel}/e1000/base/e1000_i210.h   |  0
 .../{ => intel}/e1000/base/e1000_ich8lan.c    |  0
 .../{ => intel}/e1000/base/e1000_ich8lan.h    |  0
 .../net/{ => intel}/e1000/base/e1000_mac.c    |  0
 .../net/{ => intel}/e1000/base/e1000_mac.h    |  0
 .../net/{ => intel}/e1000/base/e1000_manage.c |  0
 .../net/{ => intel}/e1000/base/e1000_manage.h |  0
 .../net/{ => intel}/e1000/base/e1000_mbx.c    |  0
 .../net/{ => intel}/e1000/base/e1000_mbx.h    |  0
 .../net/{ => intel}/e1000/base/e1000_nvm.c    |  0
 .../net/{ => intel}/e1000/base/e1000_nvm.h    |  0
 .../net/{ => intel}/e1000/base/e1000_osdep.c  |  0
 .../net/{ => intel}/e1000/base/e1000_osdep.h  |  0
 .../net/{ => intel}/e1000/base/e1000_phy.c    |  0
 .../net/{ => intel}/e1000/base/e1000_phy.h    |  0
 .../net/{ => intel}/e1000/base/e1000_regs.h   |  0
 drivers/net/{ => intel}/e1000/base/e1000_vf.c |  0
 drivers/net/{ => intel}/e1000/base/e1000_vf.h |  0
 .../net/{ => intel}/e1000/base/meson.build    |  0
 drivers/net/{ => intel}/e1000/e1000_ethdev.h  |  0
 drivers/net/{ => intel}/e1000/e1000_logs.c    |  0
 drivers/net/{ => intel}/e1000/e1000_logs.h    |  0
 drivers/net/{ => intel}/e1000/em_ethdev.c     |  0
 drivers/net/{ => intel}/e1000/em_rxtx.c       |  0
 drivers/net/{ => intel}/e1000/igb_ethdev.c    |  0
 drivers/net/{ => intel}/e1000/igb_flow.c      |  0
 drivers/net/{ => intel}/e1000/igb_pf.c        |  0
 drivers/net/{ => intel}/e1000/igb_regs.h      |  0
 drivers/net/{ => intel}/e1000/igb_rxtx.c      |  0
 drivers/net/{ => intel}/e1000/meson.build     |  0
 .../net/{ => intel}/fm10k/base/fm10k_api.c    |  0
 .../net/{ => intel}/fm10k/base/fm10k_api.h    |  0
 .../net/{ => intel}/fm10k/base/fm10k_common.c |  0
 .../net/{ => intel}/fm10k/base/fm10k_common.h |  0
 .../net/{ => intel}/fm10k/base/fm10k_mbx.c    |  0
 .../net/{ => intel}/fm10k/base/fm10k_mbx.h    |  0
 .../net/{ => intel}/fm10k/base/fm10k_osdep.h  |  0
 drivers/net/{ => intel}/fm10k/base/fm10k_pf.c |  0
 drivers/net/{ => intel}/fm10k/base/fm10k_pf.h |  0
 .../net/{ => intel}/fm10k/base/fm10k_tlv.c    |  0
 .../net/{ => intel}/fm10k/base/fm10k_tlv.h    |  0
 .../net/{ => intel}/fm10k/base/fm10k_type.h   |  0
 drivers/net/{ => intel}/fm10k/base/fm10k_vf.c |  0
 drivers/net/{ => intel}/fm10k/base/fm10k_vf.h |  0
 .../net/{ => intel}/fm10k/base/meson.build    |  0
 drivers/net/{ => intel}/fm10k/fm10k.h         |  0
 drivers/net/{ => intel}/fm10k/fm10k_ethdev.c  |  0
 drivers/net/{ => intel}/fm10k/fm10k_logs.h    |  0
 drivers/net/{ => intel}/fm10k/fm10k_rxtx.c    |  0
 .../net/{ => intel}/fm10k/fm10k_rxtx_vec.c    |  0
 drivers/net/{ => intel}/fm10k/meson.build     |  0
 drivers/net/{ => intel}/i40e/base/README      |  0
 .../net/{ => intel}/i40e/base/i40e_adminq.c   |  0
 .../net/{ => intel}/i40e/base/i40e_adminq.h   |  0
 .../{ => intel}/i40e/base/i40e_adminq_cmd.h   |  0
 .../net/{ => intel}/i40e/base/i40e_alloc.h    |  0
 .../net/{ => intel}/i40e/base/i40e_common.c   |  0
 drivers/net/{ => intel}/i40e/base/i40e_dcb.c  |  0
 drivers/net/{ => intel}/i40e/base/i40e_dcb.h  |  0
 .../net/{ => intel}/i40e/base/i40e_devids.h   |  0
 drivers/net/{ => intel}/i40e/base/i40e_diag.c |  0
 drivers/net/{ => intel}/i40e/base/i40e_diag.h |  0
 drivers/net/{ => intel}/i40e/base/i40e_hmc.c  |  0
 drivers/net/{ => intel}/i40e/base/i40e_hmc.h  |  0
 .../net/{ => intel}/i40e/base/i40e_lan_hmc.c  |  0
 .../net/{ => intel}/i40e/base/i40e_lan_hmc.h  |  0
 drivers/net/{ => intel}/i40e/base/i40e_nvm.c  |  0
 .../net/{ => intel}/i40e/base/i40e_osdep.h    |  0
 .../{ => intel}/i40e/base/i40e_prototype.h    |  0
 .../net/{ => intel}/i40e/base/i40e_register.h |  0
 .../net/{ => intel}/i40e/base/i40e_status.h   |  0
 drivers/net/{ => intel}/i40e/base/i40e_type.h |  0
 drivers/net/{ => intel}/i40e/base/meson.build |  0
 drivers/net/{ => intel}/i40e/base/virtchnl.h  |  0
 drivers/net/{ => intel}/i40e/i40e_ethdev.c    |  0
 drivers/net/{ => intel}/i40e/i40e_ethdev.h    |  0
 drivers/net/{ => intel}/i40e/i40e_fdir.c      |  0
 drivers/net/{ => intel}/i40e/i40e_flow.c      |  0
 drivers/net/{ => intel}/i40e/i40e_hash.c      |  0
 drivers/net/{ => intel}/i40e/i40e_hash.h      |  0
 drivers/net/{ => intel}/i40e/i40e_logs.h      |  0
 drivers/net/{ => intel}/i40e/i40e_pf.c        |  0
 drivers/net/{ => intel}/i40e/i40e_pf.h        |  0
 .../i40e/i40e_recycle_mbufs_vec_common.c      |  0
 drivers/net/{ => intel}/i40e/i40e_regs.h      |  0
 drivers/net/{ => intel}/i40e/i40e_rxtx.c      |  0
 drivers/net/{ => intel}/i40e/i40e_rxtx.h      |  0
 .../{ => intel}/i40e/i40e_rxtx_common_avx.h   |  0
 .../{ => intel}/i40e/i40e_rxtx_vec_altivec.c  |  0
 .../net/{ => intel}/i40e/i40e_rxtx_vec_avx2.c |  0
 .../{ => intel}/i40e/i40e_rxtx_vec_avx512.c   |  0
 .../{ => intel}/i40e/i40e_rxtx_vec_common.h   |  0
 .../net/{ => intel}/i40e/i40e_rxtx_vec_neon.c |  0
 .../net/{ => intel}/i40e/i40e_rxtx_vec_sse.c  |  0
 drivers/net/{ => intel}/i40e/i40e_testpmd.c   |  0
 drivers/net/{ => intel}/i40e/i40e_tm.c        |  0
 .../{ => intel}/i40e/i40e_vf_representor.c    |  0
 drivers/net/{ => intel}/i40e/meson.build      |  0
 drivers/net/{ => intel}/i40e/rte_pmd_i40e.c   |  0
 drivers/net/{ => intel}/i40e/rte_pmd_i40e.h   |  0
 drivers/net/{ => intel}/i40e/version.map      |  0
 drivers/net/{ => intel}/iavf/iavf.h           |  0
 drivers/net/{ => intel}/iavf/iavf_ethdev.c    |  0
 drivers/net/{ => intel}/iavf/iavf_fdir.c      |  0
 drivers/net/{ => intel}/iavf/iavf_fsub.c      |  0
 .../net/{ => intel}/iavf/iavf_generic_flow.c  |  0
 .../net/{ => intel}/iavf/iavf_generic_flow.h  |  0
 drivers/net/{ => intel}/iavf/iavf_hash.c      |  0
 .../net/{ => intel}/iavf/iavf_ipsec_crypto.c  |  0
 .../net/{ => intel}/iavf/iavf_ipsec_crypto.h  |  0
 .../iavf/iavf_ipsec_crypto_capabilities.h     |  0
 drivers/net/{ => intel}/iavf/iavf_log.h       |  0
 drivers/net/{ => intel}/iavf/iavf_rxtx.c      |  0
 drivers/net/{ => intel}/iavf/iavf_rxtx.h      |  0
 .../net/{ => intel}/iavf/iavf_rxtx_vec_avx2.c |  0
 .../{ => intel}/iavf/iavf_rxtx_vec_avx512.c   |  0
 .../{ => intel}/iavf/iavf_rxtx_vec_common.h   |  0
 .../net/{ => intel}/iavf/iavf_rxtx_vec_neon.c |  0
 .../net/{ => intel}/iavf/iavf_rxtx_vec_sse.c  |  0
 drivers/net/{ => intel}/iavf/iavf_testpmd.c   |  0
 drivers/net/{ => intel}/iavf/iavf_tm.c        |  0
 drivers/net/{ => intel}/iavf/iavf_vchnl.c     |  0
 drivers/net/{ => intel}/iavf/meson.build      |  2 +-
 drivers/net/{ => intel}/iavf/rte_pmd_iavf.h   |  0
 drivers/net/{ => intel}/iavf/version.map      |  0
 drivers/net/{ => intel}/ice/base/README       |  0
 drivers/net/{ => intel}/ice/base/ice_acl.c    |  0
 drivers/net/{ => intel}/ice/base/ice_acl.h    |  0
 .../net/{ => intel}/ice/base/ice_acl_ctrl.c   |  0
 .../net/{ => intel}/ice/base/ice_adminq_cmd.h |  0
 drivers/net/{ => intel}/ice/base/ice_alloc.h  |  0
 drivers/net/{ => intel}/ice/base/ice_bitops.h |  0
 .../net/{ => intel}/ice/base/ice_bst_tcam.c   |  0
 .../net/{ => intel}/ice/base/ice_bst_tcam.h   |  0
 .../net/{ => intel}/ice/base/ice_cgu_regs.h   |  0
 drivers/net/{ => intel}/ice/base/ice_common.c |  0
 drivers/net/{ => intel}/ice/base/ice_common.h |  0
 .../net/{ => intel}/ice/base/ice_controlq.c   |  0
 .../net/{ => intel}/ice/base/ice_controlq.h   |  0
 drivers/net/{ => intel}/ice/base/ice_dcb.c    |  0
 drivers/net/{ => intel}/ice/base/ice_dcb.h    |  0
 drivers/net/{ => intel}/ice/base/ice_ddp.c    |  0
 drivers/net/{ => intel}/ice/base/ice_ddp.h    |  0
 drivers/net/{ => intel}/ice/base/ice_defs.h   |  0
 drivers/net/{ => intel}/ice/base/ice_devids.h |  0
 drivers/net/{ => intel}/ice/base/ice_fdir.c   |  0
 drivers/net/{ => intel}/ice/base/ice_fdir.h   |  0
 .../net/{ => intel}/ice/base/ice_flex_pipe.c  |  0
 .../net/{ => intel}/ice/base/ice_flex_pipe.h  |  0
 .../net/{ => intel}/ice/base/ice_flex_type.h  |  0
 drivers/net/{ => intel}/ice/base/ice_flg_rd.c |  0
 drivers/net/{ => intel}/ice/base/ice_flg_rd.h |  0
 drivers/net/{ => intel}/ice/base/ice_flow.c   |  0
 drivers/net/{ => intel}/ice/base/ice_flow.h   |  0
 drivers/net/{ => intel}/ice/base/ice_fwlog.c  |  0
 drivers/net/{ => intel}/ice/base/ice_fwlog.h  |  0
 .../net/{ => intel}/ice/base/ice_hw_autogen.h |  0
 drivers/net/{ => intel}/ice/base/ice_imem.c   |  0
 drivers/net/{ => intel}/ice/base/ice_imem.h   |  0
 .../net/{ => intel}/ice/base/ice_lan_tx_rx.h  |  0
 .../net/{ => intel}/ice/base/ice_metainit.c   |  0
 .../net/{ => intel}/ice/base/ice_metainit.h   |  0
 drivers/net/{ => intel}/ice/base/ice_mk_grp.c |  0
 drivers/net/{ => intel}/ice/base/ice_mk_grp.h |  0
 drivers/net/{ => intel}/ice/base/ice_nvm.c    |  0
 drivers/net/{ => intel}/ice/base/ice_nvm.h    |  0
 drivers/net/{ => intel}/ice/base/ice_osdep.h  |  0
 drivers/net/{ => intel}/ice/base/ice_parser.c |  0
 drivers/net/{ => intel}/ice/base/ice_parser.h |  0
 .../net/{ => intel}/ice/base/ice_parser_rt.c  |  0
 .../net/{ => intel}/ice/base/ice_parser_rt.h  |  0
 .../{ => intel}/ice/base/ice_parser_util.h    |  0
 drivers/net/{ => intel}/ice/base/ice_pg_cam.c |  0
 drivers/net/{ => intel}/ice/base/ice_pg_cam.h |  0
 .../net/{ => intel}/ice/base/ice_phy_regs.h   |  0
 .../net/{ => intel}/ice/base/ice_proto_grp.c  |  0
 .../net/{ => intel}/ice/base/ice_proto_grp.h  |  0
 .../{ => intel}/ice/base/ice_protocol_type.h  |  0
 .../net/{ => intel}/ice/base/ice_ptp_consts.h |  0
 drivers/net/{ => intel}/ice/base/ice_ptp_hw.c |  0
 drivers/net/{ => intel}/ice/base/ice_ptp_hw.h |  0
 .../net/{ => intel}/ice/base/ice_ptype_mk.c   |  0
 .../net/{ => intel}/ice/base/ice_ptype_mk.h   |  0
 .../net/{ => intel}/ice/base/ice_sbq_cmd.h    |  0
 drivers/net/{ => intel}/ice/base/ice_sched.c  |  0
 drivers/net/{ => intel}/ice/base/ice_sched.h  |  0
 drivers/net/{ => intel}/ice/base/ice_status.h |  0
 drivers/net/{ => intel}/ice/base/ice_switch.c |  0
 drivers/net/{ => intel}/ice/base/ice_switch.h |  0
 drivers/net/{ => intel}/ice/base/ice_tmatch.h |  0
 drivers/net/{ => intel}/ice/base/ice_type.h   |  0
 drivers/net/{ => intel}/ice/base/ice_vf_mbx.c |  0
 drivers/net/{ => intel}/ice/base/ice_vf_mbx.h |  0
 .../net/{ => intel}/ice/base/ice_vlan_mode.c  |  0
 .../net/{ => intel}/ice/base/ice_vlan_mode.h  |  0
 drivers/net/{ => intel}/ice/base/ice_xlt_kb.c |  0
 drivers/net/{ => intel}/ice/base/ice_xlt_kb.h |  0
 drivers/net/{ => intel}/ice/base/meson.build  |  0
 drivers/net/{ => intel}/ice/ice_acl_filter.c  |  0
 drivers/net/{ => intel}/ice/ice_dcf.c         |  0
 drivers/net/{ => intel}/ice/ice_dcf.h         |  0
 drivers/net/{ => intel}/ice/ice_dcf_ethdev.c  |  0
 drivers/net/{ => intel}/ice/ice_dcf_ethdev.h  |  0
 drivers/net/{ => intel}/ice/ice_dcf_parent.c  |  0
 drivers/net/{ => intel}/ice/ice_dcf_sched.c   |  0
 .../{ => intel}/ice/ice_dcf_vf_representor.c  |  0
 drivers/net/{ => intel}/ice/ice_diagnose.c    |  0
 drivers/net/{ => intel}/ice/ice_ethdev.c      |  0
 drivers/net/{ => intel}/ice/ice_ethdev.h      |  0
 drivers/net/{ => intel}/ice/ice_fdir_filter.c |  0
 .../net/{ => intel}/ice/ice_generic_flow.c    |  0
 .../net/{ => intel}/ice/ice_generic_flow.h    |  0
 drivers/net/{ => intel}/ice/ice_hash.c        |  0
 drivers/net/{ => intel}/ice/ice_logs.h        |  0
 drivers/net/{ => intel}/ice/ice_rxtx.c        |  0
 drivers/net/{ => intel}/ice/ice_rxtx.h        |  0
 .../net/{ => intel}/ice/ice_rxtx_common_avx.h |  0
 .../net/{ => intel}/ice/ice_rxtx_vec_avx2.c   |  0
 .../net/{ => intel}/ice/ice_rxtx_vec_avx512.c |  0
 .../net/{ => intel}/ice/ice_rxtx_vec_common.h |  0
 .../net/{ => intel}/ice/ice_rxtx_vec_sse.c    |  0
 .../net/{ => intel}/ice/ice_switch_filter.c   |  0
 drivers/net/{ => intel}/ice/ice_testpmd.c     |  0
 drivers/net/{ => intel}/ice/ice_tm.c          |  0
 drivers/net/{ => intel}/ice/meson.build       |  2 +-
 drivers/net/{ => intel}/ice/version.map       |  0
 drivers/net/{ => intel}/idpf/idpf_ethdev.c    |  0
 drivers/net/{ => intel}/idpf/idpf_ethdev.h    |  0
 drivers/net/{ => intel}/idpf/idpf_logs.h      |  0
 drivers/net/{ => intel}/idpf/idpf_rxtx.c      |  0
 drivers/net/{ => intel}/idpf/idpf_rxtx.h      |  0
 .../{ => intel}/idpf/idpf_rxtx_vec_common.h   |  0
 drivers/net/{ => intel}/idpf/meson.build      |  0
 drivers/net/{ => intel}/igc/base/README       |  0
 drivers/net/{ => intel}/igc/base/igc_82571.h  |  0
 drivers/net/{ => intel}/igc/base/igc_82575.h  |  0
 drivers/net/{ => intel}/igc/base/igc_api.c    |  0
 drivers/net/{ => intel}/igc/base/igc_api.h    |  0
 drivers/net/{ => intel}/igc/base/igc_base.c   |  0
 drivers/net/{ => intel}/igc/base/igc_base.h   |  0
 .../net/{ => intel}/igc/base/igc_defines.h    |  0
 drivers/net/{ => intel}/igc/base/igc_hw.h     |  0
 drivers/net/{ => intel}/igc/base/igc_i225.c   |  0
 drivers/net/{ => intel}/igc/base/igc_i225.h   |  0
 .../net/{ => intel}/igc/base/igc_ich8lan.h    |  0
 drivers/net/{ => intel}/igc/base/igc_mac.c    |  0
 drivers/net/{ => intel}/igc/base/igc_mac.h    |  0
 drivers/net/{ => intel}/igc/base/igc_manage.c |  0
 drivers/net/{ => intel}/igc/base/igc_manage.h |  0
 drivers/net/{ => intel}/igc/base/igc_nvm.c    |  0
 drivers/net/{ => intel}/igc/base/igc_nvm.h    |  0
 drivers/net/{ => intel}/igc/base/igc_osdep.c  |  0
 drivers/net/{ => intel}/igc/base/igc_osdep.h  |  0
 drivers/net/{ => intel}/igc/base/igc_phy.c    |  0
 drivers/net/{ => intel}/igc/base/igc_phy.h    |  0
 drivers/net/{ => intel}/igc/base/igc_regs.h   |  0
 drivers/net/{ => intel}/igc/base/meson.build  |  0
 drivers/net/{ => intel}/igc/igc_ethdev.c      |  0
 drivers/net/{ => intel}/igc/igc_ethdev.h      |  0
 drivers/net/{ => intel}/igc/igc_filter.c      |  0
 drivers/net/{ => intel}/igc/igc_filter.h      |  0
 drivers/net/{ => intel}/igc/igc_flow.c        |  0
 drivers/net/{ => intel}/igc/igc_flow.h        |  0
 drivers/net/{ => intel}/igc/igc_logs.c        |  0
 drivers/net/{ => intel}/igc/igc_logs.h        |  0
 drivers/net/{ => intel}/igc/igc_txrx.c        |  0
 drivers/net/{ => intel}/igc/igc_txrx.h        |  0
 drivers/net/{ => intel}/igc/meson.build       |  0
 .../net/{ => intel}/ipn3ke/ipn3ke_ethdev.c    |  0
 .../net/{ => intel}/ipn3ke/ipn3ke_ethdev.h    |  0
 drivers/net/{ => intel}/ipn3ke/ipn3ke_flow.c  |  0
 drivers/net/{ => intel}/ipn3ke/ipn3ke_flow.h  |  0
 drivers/net/{ => intel}/ipn3ke/ipn3ke_logs.h  |  0
 .../{ => intel}/ipn3ke/ipn3ke_rawdev_api.h    |  0
 .../{ => intel}/ipn3ke/ipn3ke_representor.c   |  0
 drivers/net/{ => intel}/ipn3ke/ipn3ke_tm.c    |  0
 drivers/net/{ => intel}/ipn3ke/meson.build    |  2 +-
 drivers/net/{ => intel}/ipn3ke/version.map    |  0
 drivers/net/{ => intel}/ixgbe/base/README     |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_82598.c  |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_82598.h  |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_82599.c  |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_82599.h  |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_api.c    |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_api.h    |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_common.c |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_common.h |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_dcb.c    |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_dcb.h    |  0
 .../{ => intel}/ixgbe/base/ixgbe_dcb_82598.c  |  0
 .../{ => intel}/ixgbe/base/ixgbe_dcb_82598.h  |  0
 .../{ => intel}/ixgbe/base/ixgbe_dcb_82599.c  |  0
 .../{ => intel}/ixgbe/base/ixgbe_dcb_82599.h  |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_e610.c   |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_e610.h   |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_hv_vf.c  |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_hv_vf.h  |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_mbx.c    |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_mbx.h    |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_osdep.c  |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_osdep.h  |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_phy.c    |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_phy.h    |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_type.h   |  0
 .../{ => intel}/ixgbe/base/ixgbe_type_e610.h  |  0
 drivers/net/{ => intel}/ixgbe/base/ixgbe_vf.c |  0
 drivers/net/{ => intel}/ixgbe/base/ixgbe_vf.h |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_x540.c   |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_x540.h   |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_x550.c   |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_x550.h   |  0
 .../net/{ => intel}/ixgbe/base/meson.build    |  0
 .../{ => intel}/ixgbe/ixgbe_82599_bypass.c    |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_bypass.c  |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_bypass.h  |  0
 .../net/{ => intel}/ixgbe/ixgbe_bypass_api.h  |  0
 .../{ => intel}/ixgbe/ixgbe_bypass_defines.h  |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_ethdev.c  |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_ethdev.h  |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_fdir.c    |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_flow.c    |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_ipsec.c   |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_ipsec.h   |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_logs.h    |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_pf.c      |  0
 .../ixgbe/ixgbe_recycle_mbufs_vec_common.c    |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_regs.h    |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_rxtx.c    |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_rxtx.h    |  0
 .../{ => intel}/ixgbe/ixgbe_rxtx_vec_common.h |  0
 .../{ => intel}/ixgbe/ixgbe_rxtx_vec_neon.c   |  0
 .../{ => intel}/ixgbe/ixgbe_rxtx_vec_sse.c    |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_testpmd.c |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_tm.c      |  0
 .../{ => intel}/ixgbe/ixgbe_vf_representor.c  |  0
 drivers/net/{ => intel}/ixgbe/meson.build     |  0
 drivers/net/{ => intel}/ixgbe/rte_pmd_ixgbe.c |  0
 drivers/net/{ => intel}/ixgbe/rte_pmd_ixgbe.h |  0
 drivers/net/{ => intel}/ixgbe/version.map     |  0
 drivers/net/meson.build                       | 20 +++++++++----------
 384 files changed, 18 insertions(+), 14 deletions(-)
 rename drivers/net/{ => intel}/cpfl/cpfl_actions.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_controlq.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_controlq.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_cpchnl.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_ethdev.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_ethdev.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_flow.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_flow.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_flow_engine_fxp.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_flow_parser.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_flow_parser.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_fxp_rule.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_fxp_rule.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_logs.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_representor.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_representor.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_rules.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_rules.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_rxtx.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_rxtx.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_rxtx_vec_common.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_vchnl.c (100%)
 rename drivers/net/{ => intel}/cpfl/meson.build (100%)
 rename drivers/net/{ => intel}/e1000/base/README (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_80003es2lan.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_80003es2lan.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82540.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82541.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82541.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82542.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82543.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82543.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82571.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82571.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82575.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82575.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_api.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_api.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_base.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_base.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_defines.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_hw.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_i210.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_i210.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_ich8lan.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_ich8lan.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_mac.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_mac.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_manage.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_manage.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_mbx.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_mbx.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_nvm.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_nvm.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_osdep.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_osdep.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_phy.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_phy.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_regs.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_vf.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_vf.h (100%)
 rename drivers/net/{ => intel}/e1000/base/meson.build (100%)
 rename drivers/net/{ => intel}/e1000/e1000_ethdev.h (100%)
 rename drivers/net/{ => intel}/e1000/e1000_logs.c (100%)
 rename drivers/net/{ => intel}/e1000/e1000_logs.h (100%)
 rename drivers/net/{ => intel}/e1000/em_ethdev.c (100%)
 rename drivers/net/{ => intel}/e1000/em_rxtx.c (100%)
 rename drivers/net/{ => intel}/e1000/igb_ethdev.c (100%)
 rename drivers/net/{ => intel}/e1000/igb_flow.c (100%)
 rename drivers/net/{ => intel}/e1000/igb_pf.c (100%)
 rename drivers/net/{ => intel}/e1000/igb_regs.h (100%)
 rename drivers/net/{ => intel}/e1000/igb_rxtx.c (100%)
 rename drivers/net/{ => intel}/e1000/meson.build (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_api.c (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_api.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_common.c (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_common.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_mbx.c (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_mbx.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_osdep.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_pf.c (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_pf.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_tlv.c (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_tlv.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_type.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_vf.c (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_vf.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/meson.build (100%)
 rename drivers/net/{ => intel}/fm10k/fm10k.h (100%)
 rename drivers/net/{ => intel}/fm10k/fm10k_ethdev.c (100%)
 rename drivers/net/{ => intel}/fm10k/fm10k_logs.h (100%)
 rename drivers/net/{ => intel}/fm10k/fm10k_rxtx.c (100%)
 rename drivers/net/{ => intel}/fm10k/fm10k_rxtx_vec.c (100%)
 rename drivers/net/{ => intel}/fm10k/meson.build (100%)
 rename drivers/net/{ => intel}/i40e/base/README (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_adminq.c (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_adminq.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_adminq_cmd.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_alloc.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_common.c (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_dcb.c (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_dcb.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_devids.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_diag.c (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_diag.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_hmc.c (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_hmc.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_lan_hmc.c (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_lan_hmc.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_nvm.c (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_osdep.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_prototype.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_register.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_status.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_type.h (100%)
 rename drivers/net/{ => intel}/i40e/base/meson.build (100%)
 rename drivers/net/{ => intel}/i40e/base/virtchnl.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_ethdev.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_ethdev.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_fdir.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_flow.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_hash.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_hash.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_logs.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_pf.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_pf.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_recycle_mbufs_vec_common.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_regs.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx_common_avx.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx_vec_altivec.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx_vec_avx2.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx_vec_avx512.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx_vec_common.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx_vec_neon.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx_vec_sse.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_testpmd.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_tm.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_vf_representor.c (100%)
 rename drivers/net/{ => intel}/i40e/meson.build (100%)
 rename drivers/net/{ => intel}/i40e/rte_pmd_i40e.c (100%)
 rename drivers/net/{ => intel}/i40e/rte_pmd_i40e.h (100%)
 rename drivers/net/{ => intel}/i40e/version.map (100%)
 rename drivers/net/{ => intel}/iavf/iavf.h (100%)
 rename drivers/net/{ => intel}/iavf/iavf_ethdev.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_fdir.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_fsub.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_generic_flow.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_generic_flow.h (100%)
 rename drivers/net/{ => intel}/iavf/iavf_hash.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_ipsec_crypto.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_ipsec_crypto.h (100%)
 rename drivers/net/{ => intel}/iavf/iavf_ipsec_crypto_capabilities.h (100%)
 rename drivers/net/{ => intel}/iavf/iavf_log.h (100%)
 rename drivers/net/{ => intel}/iavf/iavf_rxtx.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_rxtx.h (100%)
 rename drivers/net/{ => intel}/iavf/iavf_rxtx_vec_avx2.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_rxtx_vec_avx512.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_rxtx_vec_common.h (100%)
 rename drivers/net/{ => intel}/iavf/iavf_rxtx_vec_neon.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_rxtx_vec_sse.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_testpmd.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_tm.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_vchnl.c (100%)
 rename drivers/net/{ => intel}/iavf/meson.build (96%)
 rename drivers/net/{ => intel}/iavf/rte_pmd_iavf.h (100%)
 rename drivers/net/{ => intel}/iavf/version.map (100%)
 rename drivers/net/{ => intel}/ice/base/README (100%)
 rename drivers/net/{ => intel}/ice/base/ice_acl.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_acl.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_acl_ctrl.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_adminq_cmd.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_alloc.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_bitops.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_bst_tcam.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_bst_tcam.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_cgu_regs.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_common.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_common.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_controlq.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_controlq.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_dcb.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_dcb.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_ddp.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_ddp.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_defs.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_devids.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_fdir.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_fdir.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_flex_pipe.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_flex_pipe.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_flex_type.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_flg_rd.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_flg_rd.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_flow.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_flow.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_fwlog.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_fwlog.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_hw_autogen.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_imem.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_imem.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_lan_tx_rx.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_metainit.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_metainit.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_mk_grp.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_mk_grp.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_nvm.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_nvm.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_osdep.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_parser.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_parser.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_parser_rt.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_parser_rt.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_parser_util.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_pg_cam.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_pg_cam.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_phy_regs.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_proto_grp.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_proto_grp.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_protocol_type.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_ptp_consts.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_ptp_hw.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_ptp_hw.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_ptype_mk.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_ptype_mk.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_sbq_cmd.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_sched.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_sched.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_status.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_switch.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_switch.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_tmatch.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_type.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_vf_mbx.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_vf_mbx.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_vlan_mode.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_vlan_mode.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_xlt_kb.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_xlt_kb.h (100%)
 rename drivers/net/{ => intel}/ice/base/meson.build (100%)
 rename drivers/net/{ => intel}/ice/ice_acl_filter.c (100%)
 rename drivers/net/{ => intel}/ice/ice_dcf.c (100%)
 rename drivers/net/{ => intel}/ice/ice_dcf.h (100%)
 rename drivers/net/{ => intel}/ice/ice_dcf_ethdev.c (100%)
 rename drivers/net/{ => intel}/ice/ice_dcf_ethdev.h (100%)
 rename drivers/net/{ => intel}/ice/ice_dcf_parent.c (100%)
 rename drivers/net/{ => intel}/ice/ice_dcf_sched.c (100%)
 rename drivers/net/{ => intel}/ice/ice_dcf_vf_representor.c (100%)
 rename drivers/net/{ => intel}/ice/ice_diagnose.c (100%)
 rename drivers/net/{ => intel}/ice/ice_ethdev.c (100%)
 rename drivers/net/{ => intel}/ice/ice_ethdev.h (100%)
 rename drivers/net/{ => intel}/ice/ice_fdir_filter.c (100%)
 rename drivers/net/{ => intel}/ice/ice_generic_flow.c (100%)
 rename drivers/net/{ => intel}/ice/ice_generic_flow.h (100%)
 rename drivers/net/{ => intel}/ice/ice_hash.c (100%)
 rename drivers/net/{ => intel}/ice/ice_logs.h (100%)
 rename drivers/net/{ => intel}/ice/ice_rxtx.c (100%)
 rename drivers/net/{ => intel}/ice/ice_rxtx.h (100%)
 rename drivers/net/{ => intel}/ice/ice_rxtx_common_avx.h (100%)
 rename drivers/net/{ => intel}/ice/ice_rxtx_vec_avx2.c (100%)
 rename drivers/net/{ => intel}/ice/ice_rxtx_vec_avx512.c (100%)
 rename drivers/net/{ => intel}/ice/ice_rxtx_vec_common.h (100%)
 rename drivers/net/{ => intel}/ice/ice_rxtx_vec_sse.c (100%)
 rename drivers/net/{ => intel}/ice/ice_switch_filter.c (100%)
 rename drivers/net/{ => intel}/ice/ice_testpmd.c (100%)
 rename drivers/net/{ => intel}/ice/ice_tm.c (100%)
 rename drivers/net/{ => intel}/ice/meson.build (96%)
 rename drivers/net/{ => intel}/ice/version.map (100%)
 rename drivers/net/{ => intel}/idpf/idpf_ethdev.c (100%)
 rename drivers/net/{ => intel}/idpf/idpf_ethdev.h (100%)
 rename drivers/net/{ => intel}/idpf/idpf_logs.h (100%)
 rename drivers/net/{ => intel}/idpf/idpf_rxtx.c (100%)
 rename drivers/net/{ => intel}/idpf/idpf_rxtx.h (100%)
 rename drivers/net/{ => intel}/idpf/idpf_rxtx_vec_common.h (100%)
 rename drivers/net/{ => intel}/idpf/meson.build (100%)
 rename drivers/net/{ => intel}/igc/base/README (100%)
 rename drivers/net/{ => intel}/igc/base/igc_82571.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_82575.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_api.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_api.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_base.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_base.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_defines.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_hw.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_i225.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_i225.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_ich8lan.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_mac.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_mac.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_manage.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_manage.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_nvm.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_nvm.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_osdep.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_osdep.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_phy.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_phy.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_regs.h (100%)
 rename drivers/net/{ => intel}/igc/base/meson.build (100%)
 rename drivers/net/{ => intel}/igc/igc_ethdev.c (100%)
 rename drivers/net/{ => intel}/igc/igc_ethdev.h (100%)
 rename drivers/net/{ => intel}/igc/igc_filter.c (100%)
 rename drivers/net/{ => intel}/igc/igc_filter.h (100%)
 rename drivers/net/{ => intel}/igc/igc_flow.c (100%)
 rename drivers/net/{ => intel}/igc/igc_flow.h (100%)
 rename drivers/net/{ => intel}/igc/igc_logs.c (100%)
 rename drivers/net/{ => intel}/igc/igc_logs.h (100%)
 rename drivers/net/{ => intel}/igc/igc_txrx.c (100%)
 rename drivers/net/{ => intel}/igc/igc_txrx.h (100%)
 rename drivers/net/{ => intel}/igc/meson.build (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_ethdev.c (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_ethdev.h (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_flow.c (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_flow.h (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_logs.h (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_rawdev_api.h (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_representor.c (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_tm.c (100%)
 rename drivers/net/{ => intel}/ipn3ke/meson.build (91%)
 rename drivers/net/{ => intel}/ipn3ke/version.map (100%)
 rename drivers/net/{ => intel}/ixgbe/base/README (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_82598.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_82598.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_82599.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_82599.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_api.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_api.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_common.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_common.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb_82598.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb_82598.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb_82599.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb_82599.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_e610.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_e610.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_hv_vf.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_hv_vf.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_mbx.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_mbx.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_osdep.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_osdep.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_phy.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_phy.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_type.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_type_e610.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_vf.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_vf.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_x540.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_x540.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_x550.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_x550.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/meson.build (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_82599_bypass.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_bypass.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_bypass.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_bypass_api.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_bypass_defines.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_ethdev.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_ethdev.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_fdir.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_flow.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_ipsec.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_ipsec.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_logs.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_pf.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_recycle_mbufs_vec_common.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_regs.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_rxtx.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_rxtx.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_rxtx_vec_common.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_rxtx_vec_neon.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_rxtx_vec_sse.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_testpmd.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_tm.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_vf_representor.c (100%)
 rename drivers/net/{ => intel}/ixgbe/meson.build (100%)
 rename drivers/net/{ => intel}/ixgbe/rte_pmd_ixgbe.c (100%)
 rename drivers/net/{ => intel}/ixgbe/rte_pmd_ixgbe.h (100%)
 rename drivers/net/{ => intel}/ixgbe/version.map (100%)
drivers/meson.build +5 -1
index 495e21b54a..89545e618e 100644
@@ -47,7 +47,7 @@ enable_drivers = run_command(list_dir_globs, enable_drivers, check: true).stdout
 require_drivers = true
 if enable_drivers.length() == 0
     require_drivers = false
-    enable_drivers = run_command(list_dir_globs, '*/*', check: true).stdout().split()
+    enable_drivers = run_command(list_dir_globs, '*/*,*/*/*', check: true).stdout().split()
 endif
 
 # these drivers must always be enabled, otherwise the build breaks
@@ -143,6 +143,10 @@ foreach subpath:subdirs
         testpmd_sources = []
         require_iova_in_mbuf = true
 
+        if name.contains('/')
+            name = name.split('/')[1]
+        endif
+
         if not enable_drivers.contains(drv_path)
             build = false
             reason = 'not in enabled drivers build config'
drivers/net/intel/cpfl/cpfl_actions.h renamed from drivers/net/cpfl/cpfl_actions.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_actions.h
rename to drivers/net/intel/cpfl/cpfl_actions.h
drivers/net/intel/cpfl/cpfl_controlq.c renamed from drivers/net/cpfl/cpfl_controlq.c +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_controlq.c
rename to drivers/net/intel/cpfl/cpfl_controlq.c
drivers/net/intel/cpfl/cpfl_controlq.h renamed from drivers/net/cpfl/cpfl_controlq.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_controlq.h
rename to drivers/net/intel/cpfl/cpfl_controlq.h
drivers/net/intel/cpfl/cpfl_cpchnl.h renamed from drivers/net/cpfl/cpfl_cpchnl.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_cpchnl.h
rename to drivers/net/intel/cpfl/cpfl_cpchnl.h
drivers/net/intel/cpfl/cpfl_ethdev.c renamed from drivers/net/cpfl/cpfl_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_ethdev.c
rename to drivers/net/intel/cpfl/cpfl_ethdev.c
drivers/net/intel/cpfl/cpfl_ethdev.h renamed from drivers/net/cpfl/cpfl_ethdev.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_ethdev.h
rename to drivers/net/intel/cpfl/cpfl_ethdev.h
drivers/net/intel/cpfl/cpfl_flow.c renamed from drivers/net/cpfl/cpfl_flow.c +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_flow.c
rename to drivers/net/intel/cpfl/cpfl_flow.c
drivers/net/intel/cpfl/cpfl_flow.h renamed from drivers/net/cpfl/cpfl_flow.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_flow.h
rename to drivers/net/intel/cpfl/cpfl_flow.h
drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c renamed from drivers/net/cpfl/cpfl_flow_engine_fxp.c +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_flow_engine_fxp.c
rename to drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c
drivers/net/intel/cpfl/cpfl_flow_parser.c renamed from drivers/net/cpfl/cpfl_flow_parser.c +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_flow_parser.c
rename to drivers/net/intel/cpfl/cpfl_flow_parser.c
drivers/net/intel/cpfl/cpfl_flow_parser.h renamed from drivers/net/cpfl/cpfl_flow_parser.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_flow_parser.h
rename to drivers/net/intel/cpfl/cpfl_flow_parser.h
drivers/net/intel/cpfl/cpfl_fxp_rule.c renamed from drivers/net/cpfl/cpfl_fxp_rule.c +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_fxp_rule.c
rename to drivers/net/intel/cpfl/cpfl_fxp_rule.c
drivers/net/intel/cpfl/cpfl_fxp_rule.h renamed from drivers/net/cpfl/cpfl_fxp_rule.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_fxp_rule.h
rename to drivers/net/intel/cpfl/cpfl_fxp_rule.h
drivers/net/intel/cpfl/cpfl_logs.h renamed from drivers/net/cpfl/cpfl_logs.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_logs.h
rename to drivers/net/intel/cpfl/cpfl_logs.h
drivers/net/intel/cpfl/cpfl_representor.c renamed from drivers/net/cpfl/cpfl_representor.c +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_representor.c
rename to drivers/net/intel/cpfl/cpfl_representor.c
drivers/net/intel/cpfl/cpfl_representor.h renamed from drivers/net/cpfl/cpfl_representor.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_representor.h
rename to drivers/net/intel/cpfl/cpfl_representor.h
drivers/net/intel/cpfl/cpfl_rules.c renamed from drivers/net/cpfl/cpfl_rules.c +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_rules.c
rename to drivers/net/intel/cpfl/cpfl_rules.c
drivers/net/intel/cpfl/cpfl_rules.h renamed from drivers/net/cpfl/cpfl_rules.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_rules.h
rename to drivers/net/intel/cpfl/cpfl_rules.h
drivers/net/intel/cpfl/cpfl_rxtx.c renamed from drivers/net/cpfl/cpfl_rxtx.c +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_rxtx.c
rename to drivers/net/intel/cpfl/cpfl_rxtx.c
drivers/net/intel/cpfl/cpfl_rxtx.h renamed from drivers/net/cpfl/cpfl_rxtx.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_rxtx.h
rename to drivers/net/intel/cpfl/cpfl_rxtx.h
drivers/net/intel/cpfl/cpfl_rxtx_vec_common.h renamed from drivers/net/cpfl/cpfl_rxtx_vec_common.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_rxtx_vec_common.h
rename to drivers/net/intel/cpfl/cpfl_rxtx_vec_common.h
drivers/net/intel/cpfl/cpfl_vchnl.c renamed from drivers/net/cpfl/cpfl_vchnl.c +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_vchnl.c
rename to drivers/net/intel/cpfl/cpfl_vchnl.c
drivers/net/intel/cpfl/meson.build renamed from drivers/net/cpfl/meson.build +0 -0
similarity index 100%
rename from drivers/net/cpfl/meson.build
rename to drivers/net/intel/cpfl/meson.build
drivers/net/intel/e1000/base/README renamed from drivers/net/e1000/base/README +0 -0
similarity index 100%
rename from drivers/net/e1000/base/README
rename to drivers/net/intel/e1000/base/README
drivers/net/intel/e1000/base/e1000_80003es2lan.c renamed from drivers/net/e1000/base/e1000_80003es2lan.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_80003es2lan.c
rename to drivers/net/intel/e1000/base/e1000_80003es2lan.c
drivers/net/intel/e1000/base/e1000_80003es2lan.h renamed from drivers/net/e1000/base/e1000_80003es2lan.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_80003es2lan.h
rename to drivers/net/intel/e1000/base/e1000_80003es2lan.h
drivers/net/intel/e1000/base/e1000_82540.c renamed from drivers/net/e1000/base/e1000_82540.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_82540.c
rename to drivers/net/intel/e1000/base/e1000_82540.c
drivers/net/intel/e1000/base/e1000_82541.c renamed from drivers/net/e1000/base/e1000_82541.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_82541.c
rename to drivers/net/intel/e1000/base/e1000_82541.c
drivers/net/intel/e1000/base/e1000_82541.h renamed from drivers/net/e1000/base/e1000_82541.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_82541.h
rename to drivers/net/intel/e1000/base/e1000_82541.h
drivers/net/intel/e1000/base/e1000_82542.c renamed from drivers/net/e1000/base/e1000_82542.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_82542.c
rename to drivers/net/intel/e1000/base/e1000_82542.c
drivers/net/intel/e1000/base/e1000_82543.c renamed from drivers/net/e1000/base/e1000_82543.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_82543.c
rename to drivers/net/intel/e1000/base/e1000_82543.c
drivers/net/intel/e1000/base/e1000_82543.h renamed from drivers/net/e1000/base/e1000_82543.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_82543.h
rename to drivers/net/intel/e1000/base/e1000_82543.h
drivers/net/intel/e1000/base/e1000_82571.c renamed from drivers/net/e1000/base/e1000_82571.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_82571.c
rename to drivers/net/intel/e1000/base/e1000_82571.c
drivers/net/intel/e1000/base/e1000_82571.h renamed from drivers/net/e1000/base/e1000_82571.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_82571.h
rename to drivers/net/intel/e1000/base/e1000_82571.h
drivers/net/intel/e1000/base/e1000_82575.c renamed from drivers/net/e1000/base/e1000_82575.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_82575.c
rename to drivers/net/intel/e1000/base/e1000_82575.c
drivers/net/intel/e1000/base/e1000_82575.h renamed from drivers/net/e1000/base/e1000_82575.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_82575.h
rename to drivers/net/intel/e1000/base/e1000_82575.h
drivers/net/intel/e1000/base/e1000_api.c renamed from drivers/net/e1000/base/e1000_api.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_api.c
rename to drivers/net/intel/e1000/base/e1000_api.c
drivers/net/intel/e1000/base/e1000_api.h renamed from drivers/net/e1000/base/e1000_api.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_api.h
rename to drivers/net/intel/e1000/base/e1000_api.h
drivers/net/intel/e1000/base/e1000_base.c renamed from drivers/net/e1000/base/e1000_base.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_base.c
rename to drivers/net/intel/e1000/base/e1000_base.c
drivers/net/intel/e1000/base/e1000_base.h renamed from drivers/net/e1000/base/e1000_base.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_base.h
rename to drivers/net/intel/e1000/base/e1000_base.h
drivers/net/intel/e1000/base/e1000_defines.h renamed from drivers/net/e1000/base/e1000_defines.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_defines.h
rename to drivers/net/intel/e1000/base/e1000_defines.h
drivers/net/intel/e1000/base/e1000_hw.h renamed from drivers/net/e1000/base/e1000_hw.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_hw.h
rename to drivers/net/intel/e1000/base/e1000_hw.h
drivers/net/intel/e1000/base/e1000_i210.c renamed from drivers/net/e1000/base/e1000_i210.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_i210.c
rename to drivers/net/intel/e1000/base/e1000_i210.c
drivers/net/intel/e1000/base/e1000_i210.h renamed from drivers/net/e1000/base/e1000_i210.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_i210.h
rename to drivers/net/intel/e1000/base/e1000_i210.h
drivers/net/intel/e1000/base/e1000_ich8lan.c renamed from drivers/net/e1000/base/e1000_ich8lan.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_ich8lan.c
rename to drivers/net/intel/e1000/base/e1000_ich8lan.c
drivers/net/intel/e1000/base/e1000_ich8lan.h renamed from drivers/net/e1000/base/e1000_ich8lan.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_ich8lan.h
rename to drivers/net/intel/e1000/base/e1000_ich8lan.h
drivers/net/intel/e1000/base/e1000_mac.c renamed from drivers/net/e1000/base/e1000_mac.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_mac.c
rename to drivers/net/intel/e1000/base/e1000_mac.c
drivers/net/intel/e1000/base/e1000_mac.h renamed from drivers/net/e1000/base/e1000_mac.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_mac.h
rename to drivers/net/intel/e1000/base/e1000_mac.h
drivers/net/intel/e1000/base/e1000_manage.c renamed from drivers/net/e1000/base/e1000_manage.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_manage.c
rename to drivers/net/intel/e1000/base/e1000_manage.c
drivers/net/intel/e1000/base/e1000_manage.h renamed from drivers/net/e1000/base/e1000_manage.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_manage.h
rename to drivers/net/intel/e1000/base/e1000_manage.h
drivers/net/intel/e1000/base/e1000_mbx.c renamed from drivers/net/e1000/base/e1000_mbx.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_mbx.c
rename to drivers/net/intel/e1000/base/e1000_mbx.c
drivers/net/intel/e1000/base/e1000_mbx.h renamed from drivers/net/e1000/base/e1000_mbx.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_mbx.h
rename to drivers/net/intel/e1000/base/e1000_mbx.h
drivers/net/intel/e1000/base/e1000_nvm.c renamed from drivers/net/e1000/base/e1000_nvm.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_nvm.c
rename to drivers/net/intel/e1000/base/e1000_nvm.c
drivers/net/intel/e1000/base/e1000_nvm.h renamed from drivers/net/e1000/base/e1000_nvm.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_nvm.h
rename to drivers/net/intel/e1000/base/e1000_nvm.h
drivers/net/intel/e1000/base/e1000_osdep.c renamed from drivers/net/e1000/base/e1000_osdep.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_osdep.c
rename to drivers/net/intel/e1000/base/e1000_osdep.c
drivers/net/intel/e1000/base/e1000_osdep.h renamed from drivers/net/e1000/base/e1000_osdep.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_osdep.h
rename to drivers/net/intel/e1000/base/e1000_osdep.h
drivers/net/intel/e1000/base/e1000_phy.c renamed from drivers/net/e1000/base/e1000_phy.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_phy.c
rename to drivers/net/intel/e1000/base/e1000_phy.c
drivers/net/intel/e1000/base/e1000_phy.h renamed from drivers/net/e1000/base/e1000_phy.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_phy.h
rename to drivers/net/intel/e1000/base/e1000_phy.h
drivers/net/intel/e1000/base/e1000_regs.h renamed from drivers/net/e1000/base/e1000_regs.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_regs.h
rename to drivers/net/intel/e1000/base/e1000_regs.h
drivers/net/intel/e1000/base/e1000_vf.c renamed from drivers/net/e1000/base/e1000_vf.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_vf.c
rename to drivers/net/intel/e1000/base/e1000_vf.c
drivers/net/intel/e1000/base/e1000_vf.h renamed from drivers/net/e1000/base/e1000_vf.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_vf.h
rename to drivers/net/intel/e1000/base/e1000_vf.h
drivers/net/intel/e1000/base/meson.build renamed from drivers/net/e1000/base/meson.build +0 -0
similarity index 100%
rename from drivers/net/e1000/base/meson.build
rename to drivers/net/intel/e1000/base/meson.build
drivers/net/intel/e1000/e1000_ethdev.h renamed from drivers/net/e1000/e1000_ethdev.h +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_ethdev.h
rename to drivers/net/intel/e1000/e1000_ethdev.h
drivers/net/intel/e1000/e1000_logs.c renamed from drivers/net/e1000/e1000_logs.c +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_logs.c
rename to drivers/net/intel/e1000/e1000_logs.c
drivers/net/intel/e1000/e1000_logs.h renamed from drivers/net/e1000/e1000_logs.h +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_logs.h
rename to drivers/net/intel/e1000/e1000_logs.h
drivers/net/intel/e1000/em_ethdev.c renamed from drivers/net/e1000/em_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/e1000/em_ethdev.c
rename to drivers/net/intel/e1000/em_ethdev.c
drivers/net/intel/e1000/em_rxtx.c renamed from drivers/net/e1000/em_rxtx.c +0 -0
similarity index 100%
rename from drivers/net/e1000/em_rxtx.c
rename to drivers/net/intel/e1000/em_rxtx.c
drivers/net/intel/e1000/igb_ethdev.c renamed from drivers/net/e1000/igb_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/e1000/igb_ethdev.c
rename to drivers/net/intel/e1000/igb_ethdev.c
drivers/net/intel/e1000/igb_flow.c renamed from drivers/net/e1000/igb_flow.c +0 -0
similarity index 100%
rename from drivers/net/e1000/igb_flow.c
rename to drivers/net/intel/e1000/igb_flow.c
drivers/net/intel/e1000/igb_pf.c renamed from drivers/net/e1000/igb_pf.c +0 -0
similarity index 100%
rename from drivers/net/e1000/igb_pf.c
rename to drivers/net/intel/e1000/igb_pf.c
drivers/net/intel/e1000/igb_regs.h renamed from drivers/net/e1000/igb_regs.h +0 -0
similarity index 100%
rename from drivers/net/e1000/igb_regs.h
rename to drivers/net/intel/e1000/igb_regs.h
drivers/net/intel/e1000/igb_rxtx.c renamed from drivers/net/e1000/igb_rxtx.c +0 -0
similarity index 100%
rename from drivers/net/e1000/igb_rxtx.c
rename to drivers/net/intel/e1000/igb_rxtx.c
drivers/net/intel/e1000/meson.build renamed from drivers/net/e1000/meson.build +0 -0
similarity index 100%
rename from drivers/net/e1000/meson.build
rename to drivers/net/intel/e1000/meson.build
drivers/net/intel/fm10k/base/fm10k_api.c renamed from drivers/net/fm10k/base/fm10k_api.c +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_api.c
rename to drivers/net/intel/fm10k/base/fm10k_api.c
drivers/net/intel/fm10k/base/fm10k_api.h renamed from drivers/net/fm10k/base/fm10k_api.h +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_api.h
rename to drivers/net/intel/fm10k/base/fm10k_api.h
drivers/net/intel/fm10k/base/fm10k_common.c renamed from drivers/net/fm10k/base/fm10k_common.c +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_common.c
rename to drivers/net/intel/fm10k/base/fm10k_common.c
drivers/net/intel/fm10k/base/fm10k_common.h renamed from drivers/net/fm10k/base/fm10k_common.h +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_common.h
rename to drivers/net/intel/fm10k/base/fm10k_common.h
drivers/net/intel/fm10k/base/fm10k_mbx.c renamed from drivers/net/fm10k/base/fm10k_mbx.c +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_mbx.c
rename to drivers/net/intel/fm10k/base/fm10k_mbx.c
drivers/net/intel/fm10k/base/fm10k_mbx.h renamed from drivers/net/fm10k/base/fm10k_mbx.h +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_mbx.h
rename to drivers/net/intel/fm10k/base/fm10k_mbx.h
drivers/net/intel/fm10k/base/fm10k_osdep.h renamed from drivers/net/fm10k/base/fm10k_osdep.h +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_osdep.h
rename to drivers/net/intel/fm10k/base/fm10k_osdep.h
drivers/net/intel/fm10k/base/fm10k_pf.c renamed from drivers/net/fm10k/base/fm10k_pf.c +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_pf.c
rename to drivers/net/intel/fm10k/base/fm10k_pf.c
drivers/net/intel/fm10k/base/fm10k_pf.h renamed from drivers/net/fm10k/base/fm10k_pf.h +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_pf.h
rename to drivers/net/intel/fm10k/base/fm10k_pf.h
drivers/net/intel/fm10k/base/fm10k_tlv.c renamed from drivers/net/fm10k/base/fm10k_tlv.c +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_tlv.c
rename to drivers/net/intel/fm10k/base/fm10k_tlv.c
drivers/net/intel/fm10k/base/fm10k_tlv.h renamed from drivers/net/fm10k/base/fm10k_tlv.h +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_tlv.h
rename to drivers/net/intel/fm10k/base/fm10k_tlv.h
drivers/net/intel/fm10k/base/fm10k_type.h renamed from drivers/net/fm10k/base/fm10k_type.h +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_type.h
rename to drivers/net/intel/fm10k/base/fm10k_type.h
drivers/net/intel/fm10k/base/fm10k_vf.c renamed from drivers/net/fm10k/base/fm10k_vf.c +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_vf.c
rename to drivers/net/intel/fm10k/base/fm10k_vf.c
drivers/net/intel/fm10k/base/fm10k_vf.h renamed from drivers/net/fm10k/base/fm10k_vf.h +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_vf.h
rename to drivers/net/intel/fm10k/base/fm10k_vf.h
drivers/net/intel/fm10k/base/meson.build renamed from drivers/net/fm10k/base/meson.build +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/meson.build
rename to drivers/net/intel/fm10k/base/meson.build
drivers/net/intel/fm10k/fm10k.h renamed from drivers/net/fm10k/fm10k.h +0 -0
similarity index 100%
rename from drivers/net/fm10k/fm10k.h
rename to drivers/net/intel/fm10k/fm10k.h
drivers/net/intel/fm10k/fm10k_ethdev.c renamed from drivers/net/fm10k/fm10k_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/fm10k/fm10k_ethdev.c
rename to drivers/net/intel/fm10k/fm10k_ethdev.c
drivers/net/intel/fm10k/fm10k_logs.h renamed from drivers/net/fm10k/fm10k_logs.h +0 -0
similarity index 100%
rename from drivers/net/fm10k/fm10k_logs.h
rename to drivers/net/intel/fm10k/fm10k_logs.h
drivers/net/intel/fm10k/fm10k_rxtx.c renamed from drivers/net/fm10k/fm10k_rxtx.c +0 -0
similarity index 100%
rename from drivers/net/fm10k/fm10k_rxtx.c
rename to drivers/net/intel/fm10k/fm10k_rxtx.c
drivers/net/intel/fm10k/fm10k_rxtx_vec.c renamed from drivers/net/fm10k/fm10k_rxtx_vec.c +0 -0
similarity index 100%
rename from drivers/net/fm10k/fm10k_rxtx_vec.c
rename to drivers/net/intel/fm10k/fm10k_rxtx_vec.c
drivers/net/intel/fm10k/meson.build renamed from drivers/net/fm10k/meson.build +0 -0
similarity index 100%
rename from drivers/net/fm10k/meson.build
rename to drivers/net/intel/fm10k/meson.build
drivers/net/intel/i40e/base/README renamed from drivers/net/i40e/base/README +0 -0
similarity index 100%
rename from drivers/net/i40e/base/README
rename to drivers/net/intel/i40e/base/README
drivers/net/intel/i40e/base/i40e_adminq.c renamed from drivers/net/i40e/base/i40e_adminq.c +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_adminq.c
rename to drivers/net/intel/i40e/base/i40e_adminq.c
drivers/net/intel/i40e/base/i40e_adminq.h renamed from drivers/net/i40e/base/i40e_adminq.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_adminq.h
rename to drivers/net/intel/i40e/base/i40e_adminq.h
drivers/net/intel/i40e/base/i40e_adminq_cmd.h renamed from drivers/net/i40e/base/i40e_adminq_cmd.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_adminq_cmd.h
rename to drivers/net/intel/i40e/base/i40e_adminq_cmd.h
drivers/net/intel/i40e/base/i40e_alloc.h renamed from drivers/net/i40e/base/i40e_alloc.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_alloc.h
rename to drivers/net/intel/i40e/base/i40e_alloc.h
drivers/net/intel/i40e/base/i40e_common.c renamed from drivers/net/i40e/base/i40e_common.c +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_common.c
rename to drivers/net/intel/i40e/base/i40e_common.c
drivers/net/intel/i40e/base/i40e_dcb.c renamed from drivers/net/i40e/base/i40e_dcb.c +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_dcb.c
rename to drivers/net/intel/i40e/base/i40e_dcb.c
drivers/net/intel/i40e/base/i40e_dcb.h renamed from drivers/net/i40e/base/i40e_dcb.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_dcb.h
rename to drivers/net/intel/i40e/base/i40e_dcb.h
drivers/net/intel/i40e/base/i40e_devids.h renamed from drivers/net/i40e/base/i40e_devids.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_devids.h
rename to drivers/net/intel/i40e/base/i40e_devids.h
drivers/net/intel/i40e/base/i40e_diag.c renamed from drivers/net/i40e/base/i40e_diag.c +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_diag.c
rename to drivers/net/intel/i40e/base/i40e_diag.c
drivers/net/intel/i40e/base/i40e_diag.h renamed from drivers/net/i40e/base/i40e_diag.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_diag.h
rename to drivers/net/intel/i40e/base/i40e_diag.h
drivers/net/intel/i40e/base/i40e_hmc.c renamed from drivers/net/i40e/base/i40e_hmc.c +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_hmc.c
rename to drivers/net/intel/i40e/base/i40e_hmc.c
drivers/net/intel/i40e/base/i40e_hmc.h renamed from drivers/net/i40e/base/i40e_hmc.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_hmc.h
rename to drivers/net/intel/i40e/base/i40e_hmc.h
drivers/net/intel/i40e/base/i40e_lan_hmc.c renamed from drivers/net/i40e/base/i40e_lan_hmc.c +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_lan_hmc.c
rename to drivers/net/intel/i40e/base/i40e_lan_hmc.c
drivers/net/intel/i40e/base/i40e_lan_hmc.h renamed from drivers/net/i40e/base/i40e_lan_hmc.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_lan_hmc.h
rename to drivers/net/intel/i40e/base/i40e_lan_hmc.h
drivers/net/intel/i40e/base/i40e_nvm.c renamed from drivers/net/i40e/base/i40e_nvm.c +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_nvm.c
rename to drivers/net/intel/i40e/base/i40e_nvm.c
drivers/net/intel/i40e/base/i40e_osdep.h renamed from drivers/net/i40e/base/i40e_osdep.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_osdep.h
rename to drivers/net/intel/i40e/base/i40e_osdep.h
drivers/net/intel/i40e/base/i40e_prototype.h renamed from drivers/net/i40e/base/i40e_prototype.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_prototype.h
rename to drivers/net/intel/i40e/base/i40e_prototype.h
drivers/net/intel/i40e/base/i40e_register.h renamed from drivers/net/i40e/base/i40e_register.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_register.h
rename to drivers/net/intel/i40e/base/i40e_register.h
drivers/net/intel/i40e/base/i40e_status.h renamed from drivers/net/i40e/base/i40e_status.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_status.h
rename to drivers/net/intel/i40e/base/i40e_status.h
drivers/net/intel/i40e/base/i40e_type.h renamed from drivers/net/i40e/base/i40e_type.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_type.h
rename to drivers/net/intel/i40e/base/i40e_type.h
drivers/net/intel/i40e/base/meson.build renamed from drivers/net/i40e/base/meson.build +0 -0
similarity index 100%
rename from drivers/net/i40e/base/meson.build
rename to drivers/net/intel/i40e/base/meson.build
drivers/net/intel/i40e/base/virtchnl.h renamed from drivers/net/i40e/base/virtchnl.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/virtchnl.h
rename to drivers/net/intel/i40e/base/virtchnl.h
drivers/net/intel/i40e/i40e_ethdev.c renamed from drivers/net/i40e/i40e_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_ethdev.c
rename to drivers/net/intel/i40e/i40e_ethdev.c
drivers/net/intel/i40e/i40e_ethdev.h renamed from drivers/net/i40e/i40e_ethdev.h +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_ethdev.h
rename to drivers/net/intel/i40e/i40e_ethdev.h
drivers/net/intel/i40e/i40e_fdir.c renamed from drivers/net/i40e/i40e_fdir.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_fdir.c
rename to drivers/net/intel/i40e/i40e_fdir.c
drivers/net/intel/i40e/i40e_flow.c renamed from drivers/net/i40e/i40e_flow.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_flow.c
rename to drivers/net/intel/i40e/i40e_flow.c
drivers/net/intel/i40e/i40e_hash.c renamed from drivers/net/i40e/i40e_hash.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_hash.c
rename to drivers/net/intel/i40e/i40e_hash.c
drivers/net/intel/i40e/i40e_hash.h renamed from drivers/net/i40e/i40e_hash.h +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_hash.h
rename to drivers/net/intel/i40e/i40e_hash.h
drivers/net/intel/i40e/i40e_logs.h renamed from drivers/net/i40e/i40e_logs.h +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_logs.h
rename to drivers/net/intel/i40e/i40e_logs.h
drivers/net/intel/i40e/i40e_pf.c renamed from drivers/net/i40e/i40e_pf.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_pf.c
rename to drivers/net/intel/i40e/i40e_pf.c
drivers/net/intel/i40e/i40e_pf.h renamed from drivers/net/i40e/i40e_pf.h +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_pf.h
rename to drivers/net/intel/i40e/i40e_pf.h
drivers/net/intel/i40e/i40e_recycle_mbufs_vec_common.c renamed from drivers/net/i40e/i40e_recycle_mbufs_vec_common.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_recycle_mbufs_vec_common.c
rename to drivers/net/intel/i40e/i40e_recycle_mbufs_vec_common.c
drivers/net/intel/i40e/i40e_regs.h renamed from drivers/net/i40e/i40e_regs.h +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_regs.h
rename to drivers/net/intel/i40e/i40e_regs.h
drivers/net/intel/i40e/i40e_rxtx.c renamed from drivers/net/i40e/i40e_rxtx.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_rxtx.c
rename to drivers/net/intel/i40e/i40e_rxtx.c
drivers/net/intel/i40e/i40e_rxtx.h renamed from drivers/net/i40e/i40e_rxtx.h +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_rxtx.h
rename to drivers/net/intel/i40e/i40e_rxtx.h
drivers/net/intel/i40e/i40e_rxtx_common_avx.h renamed from drivers/net/i40e/i40e_rxtx_common_avx.h +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_rxtx_common_avx.h
rename to drivers/net/intel/i40e/i40e_rxtx_common_avx.h
drivers/net/intel/i40e/i40e_rxtx_vec_altivec.c renamed from drivers/net/i40e/i40e_rxtx_vec_altivec.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_rxtx_vec_altivec.c
rename to drivers/net/intel/i40e/i40e_rxtx_vec_altivec.c
drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c renamed from drivers/net/i40e/i40e_rxtx_vec_avx2.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_rxtx_vec_avx2.c
rename to drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c
drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c renamed from drivers/net/i40e/i40e_rxtx_vec_avx512.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_rxtx_vec_avx512.c
rename to drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c
drivers/net/intel/i40e/i40e_rxtx_vec_common.h renamed from drivers/net/i40e/i40e_rxtx_vec_common.h +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_rxtx_vec_common.h
rename to drivers/net/intel/i40e/i40e_rxtx_vec_common.h
drivers/net/intel/i40e/i40e_rxtx_vec_neon.c renamed from drivers/net/i40e/i40e_rxtx_vec_neon.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_rxtx_vec_neon.c
rename to drivers/net/intel/i40e/i40e_rxtx_vec_neon.c
drivers/net/intel/i40e/i40e_rxtx_vec_sse.c renamed from drivers/net/i40e/i40e_rxtx_vec_sse.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_rxtx_vec_sse.c
rename to drivers/net/intel/i40e/i40e_rxtx_vec_sse.c
drivers/net/intel/i40e/i40e_testpmd.c renamed from drivers/net/i40e/i40e_testpmd.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_testpmd.c
rename to drivers/net/intel/i40e/i40e_testpmd.c
drivers/net/intel/i40e/i40e_tm.c renamed from drivers/net/i40e/i40e_tm.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_tm.c
rename to drivers/net/intel/i40e/i40e_tm.c
drivers/net/intel/i40e/i40e_vf_representor.c renamed from drivers/net/i40e/i40e_vf_representor.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_vf_representor.c
rename to drivers/net/intel/i40e/i40e_vf_representor.c
drivers/net/intel/i40e/meson.build renamed from drivers/net/i40e/meson.build +0 -0
similarity index 100%
rename from drivers/net/i40e/meson.build
rename to drivers/net/intel/i40e/meson.build
drivers/net/intel/i40e/rte_pmd_i40e.c renamed from drivers/net/i40e/rte_pmd_i40e.c +0 -0
similarity index 100%
rename from drivers/net/i40e/rte_pmd_i40e.c
rename to drivers/net/intel/i40e/rte_pmd_i40e.c
drivers/net/intel/i40e/rte_pmd_i40e.h renamed from drivers/net/i40e/rte_pmd_i40e.h +0 -0
similarity index 100%
rename from drivers/net/i40e/rte_pmd_i40e.h
rename to drivers/net/intel/i40e/rte_pmd_i40e.h
drivers/net/intel/i40e/version.map renamed from drivers/net/i40e/version.map +0 -0
similarity index 100%
rename from drivers/net/i40e/version.map
rename to drivers/net/intel/i40e/version.map
drivers/net/intel/iavf/iavf.h renamed from drivers/net/iavf/iavf.h +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf.h
rename to drivers/net/intel/iavf/iavf.h
drivers/net/intel/iavf/iavf_ethdev.c renamed from drivers/net/iavf/iavf_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_ethdev.c
rename to drivers/net/intel/iavf/iavf_ethdev.c
drivers/net/intel/iavf/iavf_fdir.c renamed from drivers/net/iavf/iavf_fdir.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_fdir.c
rename to drivers/net/intel/iavf/iavf_fdir.c
drivers/net/intel/iavf/iavf_fsub.c renamed from drivers/net/iavf/iavf_fsub.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_fsub.c
rename to drivers/net/intel/iavf/iavf_fsub.c
drivers/net/intel/iavf/iavf_generic_flow.c renamed from drivers/net/iavf/iavf_generic_flow.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_generic_flow.c
rename to drivers/net/intel/iavf/iavf_generic_flow.c
drivers/net/intel/iavf/iavf_generic_flow.h renamed from drivers/net/iavf/iavf_generic_flow.h +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_generic_flow.h
rename to drivers/net/intel/iavf/iavf_generic_flow.h
drivers/net/intel/iavf/iavf_hash.c renamed from drivers/net/iavf/iavf_hash.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_hash.c
rename to drivers/net/intel/iavf/iavf_hash.c
drivers/net/intel/iavf/iavf_ipsec_crypto.c renamed from drivers/net/iavf/iavf_ipsec_crypto.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_ipsec_crypto.c
rename to drivers/net/intel/iavf/iavf_ipsec_crypto.c
drivers/net/intel/iavf/iavf_ipsec_crypto.h renamed from drivers/net/iavf/iavf_ipsec_crypto.h +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_ipsec_crypto.h
rename to drivers/net/intel/iavf/iavf_ipsec_crypto.h
drivers/net/intel/iavf/iavf_ipsec_crypto_capabilities.h renamed from drivers/net/iavf/iavf_ipsec_crypto_capabilities.h +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_ipsec_crypto_capabilities.h
rename to drivers/net/intel/iavf/iavf_ipsec_crypto_capabilities.h
drivers/net/intel/iavf/iavf_log.h renamed from drivers/net/iavf/iavf_log.h +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_log.h
rename to drivers/net/intel/iavf/iavf_log.h
drivers/net/intel/iavf/iavf_rxtx.c renamed from drivers/net/iavf/iavf_rxtx.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_rxtx.c
rename to drivers/net/intel/iavf/iavf_rxtx.c
drivers/net/intel/iavf/iavf_rxtx.h renamed from drivers/net/iavf/iavf_rxtx.h +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_rxtx.h
rename to drivers/net/intel/iavf/iavf_rxtx.h
drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c renamed from drivers/net/iavf/iavf_rxtx_vec_avx2.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_rxtx_vec_avx2.c
rename to drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c
drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c renamed from drivers/net/iavf/iavf_rxtx_vec_avx512.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_rxtx_vec_avx512.c
rename to drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c
drivers/net/intel/iavf/iavf_rxtx_vec_common.h renamed from drivers/net/iavf/iavf_rxtx_vec_common.h +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_rxtx_vec_common.h
rename to drivers/net/intel/iavf/iavf_rxtx_vec_common.h
drivers/net/intel/iavf/iavf_rxtx_vec_neon.c renamed from drivers/net/iavf/iavf_rxtx_vec_neon.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_rxtx_vec_neon.c
rename to drivers/net/intel/iavf/iavf_rxtx_vec_neon.c
drivers/net/intel/iavf/iavf_rxtx_vec_sse.c renamed from drivers/net/iavf/iavf_rxtx_vec_sse.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_rxtx_vec_sse.c
rename to drivers/net/intel/iavf/iavf_rxtx_vec_sse.c
drivers/net/intel/iavf/iavf_testpmd.c renamed from drivers/net/iavf/iavf_testpmd.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_testpmd.c
rename to drivers/net/intel/iavf/iavf_testpmd.c
drivers/net/intel/iavf/iavf_tm.c renamed from drivers/net/iavf/iavf_tm.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_tm.c
rename to drivers/net/intel/iavf/iavf_tm.c
drivers/net/intel/iavf/iavf_vchnl.c renamed from drivers/net/iavf/iavf_vchnl.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_vchnl.c
rename to drivers/net/intel/iavf/iavf_vchnl.c
drivers/net/intel/iavf/meson.build renamed from drivers/net/iavf/meson.build +1 -1
similarity index 96%
rename from drivers/net/iavf/meson.build
rename to drivers/net/intel/iavf/meson.build
index b48bb83438..33b70c18f4 100644
@@ -5,7 +5,7 @@ if dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0
     subdir_done()
 endif
 
-includes += include_directories('../../common/iavf')
+includes += include_directories('../../../common/iavf')
 
 testpmd_sources = files('iavf_testpmd.c')
 
drivers/net/intel/iavf/rte_pmd_iavf.h renamed from drivers/net/iavf/rte_pmd_iavf.h +0 -0
similarity index 100%
rename from drivers/net/iavf/rte_pmd_iavf.h
rename to drivers/net/intel/iavf/rte_pmd_iavf.h
drivers/net/intel/iavf/version.map renamed from drivers/net/iavf/version.map +0 -0
similarity index 100%
rename from drivers/net/iavf/version.map
rename to drivers/net/intel/iavf/version.map
drivers/net/intel/ice/base/README renamed from drivers/net/ice/base/README +0 -0
similarity index 100%
rename from drivers/net/ice/base/README
rename to drivers/net/intel/ice/base/README
drivers/net/intel/ice/base/ice_acl.c renamed from drivers/net/ice/base/ice_acl.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_acl.c
rename to drivers/net/intel/ice/base/ice_acl.c
drivers/net/intel/ice/base/ice_acl.h renamed from drivers/net/ice/base/ice_acl.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_acl.h
rename to drivers/net/intel/ice/base/ice_acl.h
drivers/net/intel/ice/base/ice_acl_ctrl.c renamed from drivers/net/ice/base/ice_acl_ctrl.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_acl_ctrl.c
rename to drivers/net/intel/ice/base/ice_acl_ctrl.c
drivers/net/intel/ice/base/ice_adminq_cmd.h renamed from drivers/net/ice/base/ice_adminq_cmd.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_adminq_cmd.h
rename to drivers/net/intel/ice/base/ice_adminq_cmd.h
drivers/net/intel/ice/base/ice_alloc.h renamed from drivers/net/ice/base/ice_alloc.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_alloc.h
rename to drivers/net/intel/ice/base/ice_alloc.h
drivers/net/intel/ice/base/ice_bitops.h renamed from drivers/net/ice/base/ice_bitops.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_bitops.h
rename to drivers/net/intel/ice/base/ice_bitops.h
drivers/net/intel/ice/base/ice_bst_tcam.c renamed from drivers/net/ice/base/ice_bst_tcam.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_bst_tcam.c
rename to drivers/net/intel/ice/base/ice_bst_tcam.c
drivers/net/intel/ice/base/ice_bst_tcam.h renamed from drivers/net/ice/base/ice_bst_tcam.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_bst_tcam.h
rename to drivers/net/intel/ice/base/ice_bst_tcam.h
drivers/net/intel/ice/base/ice_cgu_regs.h renamed from drivers/net/ice/base/ice_cgu_regs.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_cgu_regs.h
rename to drivers/net/intel/ice/base/ice_cgu_regs.h
drivers/net/intel/ice/base/ice_common.c renamed from drivers/net/ice/base/ice_common.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_common.c
rename to drivers/net/intel/ice/base/ice_common.c
drivers/net/intel/ice/base/ice_common.h renamed from drivers/net/ice/base/ice_common.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_common.h
rename to drivers/net/intel/ice/base/ice_common.h
drivers/net/intel/ice/base/ice_controlq.c renamed from drivers/net/ice/base/ice_controlq.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_controlq.c
rename to drivers/net/intel/ice/base/ice_controlq.c
drivers/net/intel/ice/base/ice_controlq.h renamed from drivers/net/ice/base/ice_controlq.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_controlq.h
rename to drivers/net/intel/ice/base/ice_controlq.h
drivers/net/intel/ice/base/ice_dcb.c renamed from drivers/net/ice/base/ice_dcb.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_dcb.c
rename to drivers/net/intel/ice/base/ice_dcb.c
drivers/net/intel/ice/base/ice_dcb.h renamed from drivers/net/ice/base/ice_dcb.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_dcb.h
rename to drivers/net/intel/ice/base/ice_dcb.h
drivers/net/intel/ice/base/ice_ddp.c renamed from drivers/net/ice/base/ice_ddp.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_ddp.c
rename to drivers/net/intel/ice/base/ice_ddp.c
drivers/net/intel/ice/base/ice_ddp.h renamed from drivers/net/ice/base/ice_ddp.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_ddp.h
rename to drivers/net/intel/ice/base/ice_ddp.h
drivers/net/intel/ice/base/ice_defs.h renamed from drivers/net/ice/base/ice_defs.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_defs.h
rename to drivers/net/intel/ice/base/ice_defs.h
drivers/net/intel/ice/base/ice_devids.h renamed from drivers/net/ice/base/ice_devids.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_devids.h
rename to drivers/net/intel/ice/base/ice_devids.h
drivers/net/intel/ice/base/ice_fdir.c renamed from drivers/net/ice/base/ice_fdir.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_fdir.c
rename to drivers/net/intel/ice/base/ice_fdir.c
drivers/net/intel/ice/base/ice_fdir.h renamed from drivers/net/ice/base/ice_fdir.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_fdir.h
rename to drivers/net/intel/ice/base/ice_fdir.h
drivers/net/intel/ice/base/ice_flex_pipe.c renamed from drivers/net/ice/base/ice_flex_pipe.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_flex_pipe.c
rename to drivers/net/intel/ice/base/ice_flex_pipe.c
drivers/net/intel/ice/base/ice_flex_pipe.h renamed from drivers/net/ice/base/ice_flex_pipe.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_flex_pipe.h
rename to drivers/net/intel/ice/base/ice_flex_pipe.h
drivers/net/intel/ice/base/ice_flex_type.h renamed from drivers/net/ice/base/ice_flex_type.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_flex_type.h
rename to drivers/net/intel/ice/base/ice_flex_type.h
drivers/net/intel/ice/base/ice_flg_rd.c renamed from drivers/net/ice/base/ice_flg_rd.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_flg_rd.c
rename to drivers/net/intel/ice/base/ice_flg_rd.c
drivers/net/intel/ice/base/ice_flg_rd.h renamed from drivers/net/ice/base/ice_flg_rd.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_flg_rd.h
rename to drivers/net/intel/ice/base/ice_flg_rd.h
drivers/net/intel/ice/base/ice_flow.c renamed from drivers/net/ice/base/ice_flow.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_flow.c
rename to drivers/net/intel/ice/base/ice_flow.c
drivers/net/intel/ice/base/ice_flow.h renamed from drivers/net/ice/base/ice_flow.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_flow.h
rename to drivers/net/intel/ice/base/ice_flow.h
drivers/net/intel/ice/base/ice_fwlog.c renamed from drivers/net/ice/base/ice_fwlog.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_fwlog.c
rename to drivers/net/intel/ice/base/ice_fwlog.c
drivers/net/intel/ice/base/ice_fwlog.h renamed from drivers/net/ice/base/ice_fwlog.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_fwlog.h
rename to drivers/net/intel/ice/base/ice_fwlog.h
drivers/net/intel/ice/base/ice_hw_autogen.h renamed from drivers/net/ice/base/ice_hw_autogen.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_hw_autogen.h
rename to drivers/net/intel/ice/base/ice_hw_autogen.h
drivers/net/intel/ice/base/ice_imem.c renamed from drivers/net/ice/base/ice_imem.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_imem.c
rename to drivers/net/intel/ice/base/ice_imem.c
drivers/net/intel/ice/base/ice_imem.h renamed from drivers/net/ice/base/ice_imem.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_imem.h
rename to drivers/net/intel/ice/base/ice_imem.h
drivers/net/intel/ice/base/ice_lan_tx_rx.h renamed from drivers/net/ice/base/ice_lan_tx_rx.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_lan_tx_rx.h
rename to drivers/net/intel/ice/base/ice_lan_tx_rx.h
drivers/net/intel/ice/base/ice_metainit.c renamed from drivers/net/ice/base/ice_metainit.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_metainit.c
rename to drivers/net/intel/ice/base/ice_metainit.c
drivers/net/intel/ice/base/ice_metainit.h renamed from drivers/net/ice/base/ice_metainit.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_metainit.h
rename to drivers/net/intel/ice/base/ice_metainit.h
drivers/net/intel/ice/base/ice_mk_grp.c renamed from drivers/net/ice/base/ice_mk_grp.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_mk_grp.c
rename to drivers/net/intel/ice/base/ice_mk_grp.c
drivers/net/intel/ice/base/ice_mk_grp.h renamed from drivers/net/ice/base/ice_mk_grp.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_mk_grp.h
rename to drivers/net/intel/ice/base/ice_mk_grp.h
drivers/net/intel/ice/base/ice_nvm.c renamed from drivers/net/ice/base/ice_nvm.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_nvm.c
rename to drivers/net/intel/ice/base/ice_nvm.c
drivers/net/intel/ice/base/ice_nvm.h renamed from drivers/net/ice/base/ice_nvm.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_nvm.h
rename to drivers/net/intel/ice/base/ice_nvm.h
drivers/net/intel/ice/base/ice_osdep.h renamed from drivers/net/ice/base/ice_osdep.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_osdep.h
rename to drivers/net/intel/ice/base/ice_osdep.h
drivers/net/intel/ice/base/ice_parser.c renamed from drivers/net/ice/base/ice_parser.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_parser.c
rename to drivers/net/intel/ice/base/ice_parser.c
drivers/net/intel/ice/base/ice_parser.h renamed from drivers/net/ice/base/ice_parser.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_parser.h
rename to drivers/net/intel/ice/base/ice_parser.h
drivers/net/intel/ice/base/ice_parser_rt.c renamed from drivers/net/ice/base/ice_parser_rt.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_parser_rt.c
rename to drivers/net/intel/ice/base/ice_parser_rt.c
drivers/net/intel/ice/base/ice_parser_rt.h renamed from drivers/net/ice/base/ice_parser_rt.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_parser_rt.h
rename to drivers/net/intel/ice/base/ice_parser_rt.h
drivers/net/intel/ice/base/ice_parser_util.h renamed from drivers/net/ice/base/ice_parser_util.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_parser_util.h
rename to drivers/net/intel/ice/base/ice_parser_util.h
drivers/net/intel/ice/base/ice_pg_cam.c renamed from drivers/net/ice/base/ice_pg_cam.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_pg_cam.c
rename to drivers/net/intel/ice/base/ice_pg_cam.c
drivers/net/intel/ice/base/ice_pg_cam.h renamed from drivers/net/ice/base/ice_pg_cam.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_pg_cam.h
rename to drivers/net/intel/ice/base/ice_pg_cam.h
drivers/net/intel/ice/base/ice_phy_regs.h renamed from drivers/net/ice/base/ice_phy_regs.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_phy_regs.h
rename to drivers/net/intel/ice/base/ice_phy_regs.h
drivers/net/intel/ice/base/ice_proto_grp.c renamed from drivers/net/ice/base/ice_proto_grp.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_proto_grp.c
rename to drivers/net/intel/ice/base/ice_proto_grp.c
drivers/net/intel/ice/base/ice_proto_grp.h renamed from drivers/net/ice/base/ice_proto_grp.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_proto_grp.h
rename to drivers/net/intel/ice/base/ice_proto_grp.h
drivers/net/intel/ice/base/ice_protocol_type.h renamed from drivers/net/ice/base/ice_protocol_type.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_protocol_type.h
rename to drivers/net/intel/ice/base/ice_protocol_type.h
drivers/net/intel/ice/base/ice_ptp_consts.h renamed from drivers/net/ice/base/ice_ptp_consts.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_ptp_consts.h
rename to drivers/net/intel/ice/base/ice_ptp_consts.h
drivers/net/intel/ice/base/ice_ptp_hw.c renamed from drivers/net/ice/base/ice_ptp_hw.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_ptp_hw.c
rename to drivers/net/intel/ice/base/ice_ptp_hw.c
drivers/net/intel/ice/base/ice_ptp_hw.h renamed from drivers/net/ice/base/ice_ptp_hw.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_ptp_hw.h
rename to drivers/net/intel/ice/base/ice_ptp_hw.h
drivers/net/intel/ice/base/ice_ptype_mk.c renamed from drivers/net/ice/base/ice_ptype_mk.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_ptype_mk.c
rename to drivers/net/intel/ice/base/ice_ptype_mk.c
drivers/net/intel/ice/base/ice_ptype_mk.h renamed from drivers/net/ice/base/ice_ptype_mk.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_ptype_mk.h
rename to drivers/net/intel/ice/base/ice_ptype_mk.h
drivers/net/intel/ice/base/ice_sbq_cmd.h renamed from drivers/net/ice/base/ice_sbq_cmd.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_sbq_cmd.h
rename to drivers/net/intel/ice/base/ice_sbq_cmd.h
drivers/net/intel/ice/base/ice_sched.c renamed from drivers/net/ice/base/ice_sched.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_sched.c
rename to drivers/net/intel/ice/base/ice_sched.c
drivers/net/intel/ice/base/ice_sched.h renamed from drivers/net/ice/base/ice_sched.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_sched.h
rename to drivers/net/intel/ice/base/ice_sched.h
drivers/net/intel/ice/base/ice_status.h renamed from drivers/net/ice/base/ice_status.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_status.h
rename to drivers/net/intel/ice/base/ice_status.h
drivers/net/intel/ice/base/ice_switch.c renamed from drivers/net/ice/base/ice_switch.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_switch.c
rename to drivers/net/intel/ice/base/ice_switch.c
drivers/net/intel/ice/base/ice_switch.h renamed from drivers/net/ice/base/ice_switch.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_switch.h
rename to drivers/net/intel/ice/base/ice_switch.h
drivers/net/intel/ice/base/ice_tmatch.h renamed from drivers/net/ice/base/ice_tmatch.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_tmatch.h
rename to drivers/net/intel/ice/base/ice_tmatch.h
drivers/net/intel/ice/base/ice_type.h renamed from drivers/net/ice/base/ice_type.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_type.h
rename to drivers/net/intel/ice/base/ice_type.h
drivers/net/intel/ice/base/ice_vf_mbx.c renamed from drivers/net/ice/base/ice_vf_mbx.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_vf_mbx.c
rename to drivers/net/intel/ice/base/ice_vf_mbx.c
drivers/net/intel/ice/base/ice_vf_mbx.h renamed from drivers/net/ice/base/ice_vf_mbx.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_vf_mbx.h
rename to drivers/net/intel/ice/base/ice_vf_mbx.h
drivers/net/intel/ice/base/ice_vlan_mode.c renamed from drivers/net/ice/base/ice_vlan_mode.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_vlan_mode.c
rename to drivers/net/intel/ice/base/ice_vlan_mode.c
drivers/net/intel/ice/base/ice_vlan_mode.h renamed from drivers/net/ice/base/ice_vlan_mode.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_vlan_mode.h
rename to drivers/net/intel/ice/base/ice_vlan_mode.h
drivers/net/intel/ice/base/ice_xlt_kb.c renamed from drivers/net/ice/base/ice_xlt_kb.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_xlt_kb.c
rename to drivers/net/intel/ice/base/ice_xlt_kb.c
drivers/net/intel/ice/base/ice_xlt_kb.h renamed from drivers/net/ice/base/ice_xlt_kb.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_xlt_kb.h
rename to drivers/net/intel/ice/base/ice_xlt_kb.h
drivers/net/intel/ice/base/meson.build renamed from drivers/net/ice/base/meson.build +0 -0
similarity index 100%
rename from drivers/net/ice/base/meson.build
rename to drivers/net/intel/ice/base/meson.build
drivers/net/intel/ice/ice_acl_filter.c renamed from drivers/net/ice/ice_acl_filter.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_acl_filter.c
rename to drivers/net/intel/ice/ice_acl_filter.c
drivers/net/intel/ice/ice_dcf.c renamed from drivers/net/ice/ice_dcf.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_dcf.c
rename to drivers/net/intel/ice/ice_dcf.c
drivers/net/intel/ice/ice_dcf.h renamed from drivers/net/ice/ice_dcf.h +0 -0
similarity index 100%
rename from drivers/net/ice/ice_dcf.h
rename to drivers/net/intel/ice/ice_dcf.h
drivers/net/intel/ice/ice_dcf_ethdev.c renamed from drivers/net/ice/ice_dcf_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_dcf_ethdev.c
rename to drivers/net/intel/ice/ice_dcf_ethdev.c
drivers/net/intel/ice/ice_dcf_ethdev.h renamed from drivers/net/ice/ice_dcf_ethdev.h +0 -0
similarity index 100%
rename from drivers/net/ice/ice_dcf_ethdev.h
rename to drivers/net/intel/ice/ice_dcf_ethdev.h
drivers/net/intel/ice/ice_dcf_parent.c renamed from drivers/net/ice/ice_dcf_parent.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_dcf_parent.c
rename to drivers/net/intel/ice/ice_dcf_parent.c
drivers/net/intel/ice/ice_dcf_sched.c renamed from drivers/net/ice/ice_dcf_sched.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_dcf_sched.c
rename to drivers/net/intel/ice/ice_dcf_sched.c
drivers/net/intel/ice/ice_dcf_vf_representor.c renamed from drivers/net/ice/ice_dcf_vf_representor.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_dcf_vf_representor.c
rename to drivers/net/intel/ice/ice_dcf_vf_representor.c
drivers/net/intel/ice/ice_diagnose.c renamed from drivers/net/ice/ice_diagnose.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_diagnose.c
rename to drivers/net/intel/ice/ice_diagnose.c
drivers/net/intel/ice/ice_ethdev.c renamed from drivers/net/ice/ice_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_ethdev.c
rename to drivers/net/intel/ice/ice_ethdev.c
drivers/net/intel/ice/ice_ethdev.h renamed from drivers/net/ice/ice_ethdev.h +0 -0
similarity index 100%
rename from drivers/net/ice/ice_ethdev.h
rename to drivers/net/intel/ice/ice_ethdev.h
drivers/net/intel/ice/ice_fdir_filter.c renamed from drivers/net/ice/ice_fdir_filter.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_fdir_filter.c
rename to drivers/net/intel/ice/ice_fdir_filter.c
drivers/net/intel/ice/ice_generic_flow.c renamed from drivers/net/ice/ice_generic_flow.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_generic_flow.c
rename to drivers/net/intel/ice/ice_generic_flow.c
drivers/net/intel/ice/ice_generic_flow.h renamed from drivers/net/ice/ice_generic_flow.h +0 -0
similarity index 100%
rename from drivers/net/ice/ice_generic_flow.h
rename to drivers/net/intel/ice/ice_generic_flow.h
drivers/net/intel/ice/ice_hash.c renamed from drivers/net/ice/ice_hash.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_hash.c
rename to drivers/net/intel/ice/ice_hash.c
drivers/net/intel/ice/ice_logs.h renamed from drivers/net/ice/ice_logs.h +0 -0
similarity index 100%
rename from drivers/net/ice/ice_logs.h
rename to drivers/net/intel/ice/ice_logs.h
drivers/net/intel/ice/ice_rxtx.c renamed from drivers/net/ice/ice_rxtx.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_rxtx.c
rename to drivers/net/intel/ice/ice_rxtx.c
drivers/net/intel/ice/ice_rxtx.h renamed from drivers/net/ice/ice_rxtx.h +0 -0
similarity index 100%
rename from drivers/net/ice/ice_rxtx.h
rename to drivers/net/intel/ice/ice_rxtx.h
drivers/net/intel/ice/ice_rxtx_common_avx.h renamed from drivers/net/ice/ice_rxtx_common_avx.h +0 -0
similarity index 100%
rename from drivers/net/ice/ice_rxtx_common_avx.h
rename to drivers/net/intel/ice/ice_rxtx_common_avx.h
drivers/net/intel/ice/ice_rxtx_vec_avx2.c renamed from drivers/net/ice/ice_rxtx_vec_avx2.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_rxtx_vec_avx2.c
rename to drivers/net/intel/ice/ice_rxtx_vec_avx2.c
drivers/net/intel/ice/ice_rxtx_vec_avx512.c renamed from drivers/net/ice/ice_rxtx_vec_avx512.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_rxtx_vec_avx512.c
rename to drivers/net/intel/ice/ice_rxtx_vec_avx512.c
drivers/net/intel/ice/ice_rxtx_vec_common.h renamed from drivers/net/ice/ice_rxtx_vec_common.h +0 -0
similarity index 100%
rename from drivers/net/ice/ice_rxtx_vec_common.h
rename to drivers/net/intel/ice/ice_rxtx_vec_common.h
drivers/net/intel/ice/ice_rxtx_vec_sse.c renamed from drivers/net/ice/ice_rxtx_vec_sse.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_rxtx_vec_sse.c
rename to drivers/net/intel/ice/ice_rxtx_vec_sse.c
drivers/net/intel/ice/ice_switch_filter.c renamed from drivers/net/ice/ice_switch_filter.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_switch_filter.c
rename to drivers/net/intel/ice/ice_switch_filter.c
drivers/net/intel/ice/ice_testpmd.c renamed from drivers/net/ice/ice_testpmd.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_testpmd.c
rename to drivers/net/intel/ice/ice_testpmd.c
drivers/net/intel/ice/ice_tm.c renamed from drivers/net/ice/ice_tm.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_tm.c
rename to drivers/net/intel/ice/ice_tm.c
drivers/net/intel/ice/meson.build renamed from drivers/net/ice/meson.build +1 -1
similarity index 96%
rename from drivers/net/ice/meson.build
rename to drivers/net/intel/ice/meson.build
index 1c9dc0cc6d..01df52b387 100644
@@ -19,7 +19,7 @@ sources = files(
 testpmd_sources = files('ice_testpmd.c')
 
 deps += ['hash', 'net', 'common_iavf']
-includes += include_directories('base', '../../common/iavf')
+includes += include_directories('base', '../../../common/iavf')
 
 if arch_subdir == 'x86'
     sources += files('ice_rxtx_vec_sse.c')
drivers/net/intel/ice/version.map renamed from drivers/net/ice/version.map +0 -0
similarity index 100%
rename from drivers/net/ice/version.map
rename to drivers/net/intel/ice/version.map
drivers/net/intel/idpf/idpf_ethdev.c renamed from drivers/net/idpf/idpf_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/idpf/idpf_ethdev.c
rename to drivers/net/intel/idpf/idpf_ethdev.c
drivers/net/intel/idpf/idpf_ethdev.h renamed from drivers/net/idpf/idpf_ethdev.h +0 -0
similarity index 100%
rename from drivers/net/idpf/idpf_ethdev.h
rename to drivers/net/intel/idpf/idpf_ethdev.h
drivers/net/intel/idpf/idpf_logs.h renamed from drivers/net/idpf/idpf_logs.h +0 -0
similarity index 100%
rename from drivers/net/idpf/idpf_logs.h
rename to drivers/net/intel/idpf/idpf_logs.h
drivers/net/intel/idpf/idpf_rxtx.c renamed from drivers/net/idpf/idpf_rxtx.c +0 -0
similarity index 100%
rename from drivers/net/idpf/idpf_rxtx.c
rename to drivers/net/intel/idpf/idpf_rxtx.c
drivers/net/intel/idpf/idpf_rxtx.h renamed from drivers/net/idpf/idpf_rxtx.h +0 -0
similarity index 100%
rename from drivers/net/idpf/idpf_rxtx.h
rename to drivers/net/intel/idpf/idpf_rxtx.h
drivers/net/intel/idpf/idpf_rxtx_vec_common.h renamed from drivers/net/idpf/idpf_rxtx_vec_common.h +0 -0
similarity index 100%
rename from drivers/net/idpf/idpf_rxtx_vec_common.h
rename to drivers/net/intel/idpf/idpf_rxtx_vec_common.h
drivers/net/intel/idpf/meson.build renamed from drivers/net/idpf/meson.build +0 -0
similarity index 100%
rename from drivers/net/idpf/meson.build
rename to drivers/net/intel/idpf/meson.build
drivers/net/intel/igc/base/README renamed from drivers/net/igc/base/README +0 -0
similarity index 100%
rename from drivers/net/igc/base/README
rename to drivers/net/intel/igc/base/README
drivers/net/intel/igc/base/igc_82571.h renamed from drivers/net/igc/base/igc_82571.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_82571.h
rename to drivers/net/intel/igc/base/igc_82571.h
drivers/net/intel/igc/base/igc_82575.h renamed from drivers/net/igc/base/igc_82575.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_82575.h
rename to drivers/net/intel/igc/base/igc_82575.h
drivers/net/intel/igc/base/igc_api.c renamed from drivers/net/igc/base/igc_api.c +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_api.c
rename to drivers/net/intel/igc/base/igc_api.c
drivers/net/intel/igc/base/igc_api.h renamed from drivers/net/igc/base/igc_api.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_api.h
rename to drivers/net/intel/igc/base/igc_api.h
drivers/net/intel/igc/base/igc_base.c renamed from drivers/net/igc/base/igc_base.c +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_base.c
rename to drivers/net/intel/igc/base/igc_base.c
drivers/net/intel/igc/base/igc_base.h renamed from drivers/net/igc/base/igc_base.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_base.h
rename to drivers/net/intel/igc/base/igc_base.h
drivers/net/intel/igc/base/igc_defines.h renamed from drivers/net/igc/base/igc_defines.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_defines.h
rename to drivers/net/intel/igc/base/igc_defines.h
drivers/net/intel/igc/base/igc_hw.h renamed from drivers/net/igc/base/igc_hw.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_hw.h
rename to drivers/net/intel/igc/base/igc_hw.h
drivers/net/intel/igc/base/igc_i225.c renamed from drivers/net/igc/base/igc_i225.c +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_i225.c
rename to drivers/net/intel/igc/base/igc_i225.c
drivers/net/intel/igc/base/igc_i225.h renamed from drivers/net/igc/base/igc_i225.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_i225.h
rename to drivers/net/intel/igc/base/igc_i225.h
drivers/net/intel/igc/base/igc_ich8lan.h renamed from drivers/net/igc/base/igc_ich8lan.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_ich8lan.h
rename to drivers/net/intel/igc/base/igc_ich8lan.h
drivers/net/intel/igc/base/igc_mac.c renamed from drivers/net/igc/base/igc_mac.c +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_mac.c
rename to drivers/net/intel/igc/base/igc_mac.c
drivers/net/intel/igc/base/igc_mac.h renamed from drivers/net/igc/base/igc_mac.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_mac.h
rename to drivers/net/intel/igc/base/igc_mac.h
drivers/net/intel/igc/base/igc_manage.c renamed from drivers/net/igc/base/igc_manage.c +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_manage.c
rename to drivers/net/intel/igc/base/igc_manage.c
drivers/net/intel/igc/base/igc_manage.h renamed from drivers/net/igc/base/igc_manage.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_manage.h
rename to drivers/net/intel/igc/base/igc_manage.h
drivers/net/intel/igc/base/igc_nvm.c renamed from drivers/net/igc/base/igc_nvm.c +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_nvm.c
rename to drivers/net/intel/igc/base/igc_nvm.c
drivers/net/intel/igc/base/igc_nvm.h renamed from drivers/net/igc/base/igc_nvm.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_nvm.h
rename to drivers/net/intel/igc/base/igc_nvm.h
drivers/net/intel/igc/base/igc_osdep.c renamed from drivers/net/igc/base/igc_osdep.c +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_osdep.c
rename to drivers/net/intel/igc/base/igc_osdep.c
drivers/net/intel/igc/base/igc_osdep.h renamed from drivers/net/igc/base/igc_osdep.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_osdep.h
rename to drivers/net/intel/igc/base/igc_osdep.h
drivers/net/intel/igc/base/igc_phy.c renamed from drivers/net/igc/base/igc_phy.c +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_phy.c
rename to drivers/net/intel/igc/base/igc_phy.c
drivers/net/intel/igc/base/igc_phy.h renamed from drivers/net/igc/base/igc_phy.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_phy.h
rename to drivers/net/intel/igc/base/igc_phy.h
drivers/net/intel/igc/base/igc_regs.h renamed from drivers/net/igc/base/igc_regs.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_regs.h
rename to drivers/net/intel/igc/base/igc_regs.h
drivers/net/intel/igc/base/meson.build renamed from drivers/net/igc/base/meson.build +0 -0
similarity index 100%
rename from drivers/net/igc/base/meson.build
rename to drivers/net/intel/igc/base/meson.build
drivers/net/intel/igc/igc_ethdev.c renamed from drivers/net/igc/igc_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/igc/igc_ethdev.c
rename to drivers/net/intel/igc/igc_ethdev.c
drivers/net/intel/igc/igc_ethdev.h renamed from drivers/net/igc/igc_ethdev.h +0 -0
similarity index 100%
rename from drivers/net/igc/igc_ethdev.h
rename to drivers/net/intel/igc/igc_ethdev.h
drivers/net/intel/igc/igc_filter.c renamed from drivers/net/igc/igc_filter.c +0 -0
similarity index 100%
rename from drivers/net/igc/igc_filter.c
rename to drivers/net/intel/igc/igc_filter.c
drivers/net/intel/igc/igc_filter.h renamed from drivers/net/igc/igc_filter.h +0 -0
similarity index 100%
rename from drivers/net/igc/igc_filter.h
rename to drivers/net/intel/igc/igc_filter.h
drivers/net/intel/igc/igc_flow.c renamed from drivers/net/igc/igc_flow.c +0 -0
similarity index 100%
rename from drivers/net/igc/igc_flow.c
rename to drivers/net/intel/igc/igc_flow.c
drivers/net/intel/igc/igc_flow.h renamed from drivers/net/igc/igc_flow.h +0 -0
similarity index 100%
rename from drivers/net/igc/igc_flow.h
rename to drivers/net/intel/igc/igc_flow.h
drivers/net/intel/igc/igc_logs.c renamed from drivers/net/igc/igc_logs.c +0 -0
similarity index 100%
rename from drivers/net/igc/igc_logs.c
rename to drivers/net/intel/igc/igc_logs.c
drivers/net/intel/igc/igc_logs.h renamed from drivers/net/igc/igc_logs.h +0 -0
similarity index 100%
rename from drivers/net/igc/igc_logs.h
rename to drivers/net/intel/igc/igc_logs.h
drivers/net/intel/igc/igc_txrx.c renamed from drivers/net/igc/igc_txrx.c +0 -0
similarity index 100%
rename from drivers/net/igc/igc_txrx.c
rename to drivers/net/intel/igc/igc_txrx.c
drivers/net/intel/igc/igc_txrx.h renamed from drivers/net/igc/igc_txrx.h +0 -0
similarity index 100%
rename from drivers/net/igc/igc_txrx.h
rename to drivers/net/intel/igc/igc_txrx.h
drivers/net/intel/igc/meson.build renamed from drivers/net/igc/meson.build +0 -0
similarity index 100%
rename from drivers/net/igc/meson.build
rename to drivers/net/intel/igc/meson.build
drivers/net/intel/ipn3ke/ipn3ke_ethdev.c renamed from drivers/net/ipn3ke/ipn3ke_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/ipn3ke/ipn3ke_ethdev.c
rename to drivers/net/intel/ipn3ke/ipn3ke_ethdev.c
drivers/net/intel/ipn3ke/ipn3ke_ethdev.h renamed from drivers/net/ipn3ke/ipn3ke_ethdev.h +0 -0
similarity index 100%
rename from drivers/net/ipn3ke/ipn3ke_ethdev.h
rename to drivers/net/intel/ipn3ke/ipn3ke_ethdev.h
drivers/net/intel/ipn3ke/ipn3ke_flow.c renamed from drivers/net/ipn3ke/ipn3ke_flow.c +0 -0
similarity index 100%
rename from drivers/net/ipn3ke/ipn3ke_flow.c
rename to drivers/net/intel/ipn3ke/ipn3ke_flow.c
drivers/net/intel/ipn3ke/ipn3ke_flow.h renamed from drivers/net/ipn3ke/ipn3ke_flow.h +0 -0
similarity index 100%
rename from drivers/net/ipn3ke/ipn3ke_flow.h
rename to drivers/net/intel/ipn3ke/ipn3ke_flow.h
drivers/net/intel/ipn3ke/ipn3ke_logs.h renamed from drivers/net/ipn3ke/ipn3ke_logs.h +0 -0
similarity index 100%
rename from drivers/net/ipn3ke/ipn3ke_logs.h
rename to drivers/net/intel/ipn3ke/ipn3ke_logs.h
drivers/net/intel/ipn3ke/ipn3ke_rawdev_api.h renamed from drivers/net/ipn3ke/ipn3ke_rawdev_api.h +0 -0
similarity index 100%
rename from drivers/net/ipn3ke/ipn3ke_rawdev_api.h
rename to drivers/net/intel/ipn3ke/ipn3ke_rawdev_api.h
drivers/net/intel/ipn3ke/ipn3ke_representor.c renamed from drivers/net/ipn3ke/ipn3ke_representor.c +0 -0
similarity index 100%
rename from drivers/net/ipn3ke/ipn3ke_representor.c
rename to drivers/net/intel/ipn3ke/ipn3ke_representor.c
drivers/net/intel/ipn3ke/ipn3ke_tm.c renamed from drivers/net/ipn3ke/ipn3ke_tm.c +0 -0
similarity index 100%
rename from drivers/net/ipn3ke/ipn3ke_tm.c
rename to drivers/net/intel/ipn3ke/ipn3ke_tm.c
drivers/net/intel/ipn3ke/meson.build renamed from drivers/net/ipn3ke/meson.build +1 -1
similarity index 91%
rename from drivers/net/ipn3ke/meson.build
rename to drivers/net/intel/ipn3ke/meson.build
index 464bdbd8b6..23c4d36b4f 100644
@@ -21,7 +21,7 @@ if not has_libfdt
     subdir_done()
 endif
 
-includes += include_directories('../../raw/ifpga')
+includes += include_directories('../../../raw/ifpga')
 
 sources += files(
         'ipn3ke_ethdev.c',
drivers/net/intel/ipn3ke/version.map renamed from drivers/net/ipn3ke/version.map +0 -0
similarity index 100%
rename from drivers/net/ipn3ke/version.map
rename to drivers/net/intel/ipn3ke/version.map
drivers/net/intel/ixgbe/base/README renamed from drivers/net/ixgbe/base/README +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/README
rename to drivers/net/intel/ixgbe/base/README
drivers/net/intel/ixgbe/base/ixgbe_82598.c renamed from drivers/net/ixgbe/base/ixgbe_82598.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_82598.c
rename to drivers/net/intel/ixgbe/base/ixgbe_82598.c
drivers/net/intel/ixgbe/base/ixgbe_82598.h renamed from drivers/net/ixgbe/base/ixgbe_82598.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_82598.h
rename to drivers/net/intel/ixgbe/base/ixgbe_82598.h
drivers/net/intel/ixgbe/base/ixgbe_82599.c renamed from drivers/net/ixgbe/base/ixgbe_82599.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_82599.c
rename to drivers/net/intel/ixgbe/base/ixgbe_82599.c
drivers/net/intel/ixgbe/base/ixgbe_82599.h renamed from drivers/net/ixgbe/base/ixgbe_82599.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_82599.h
rename to drivers/net/intel/ixgbe/base/ixgbe_82599.h
drivers/net/intel/ixgbe/base/ixgbe_api.c renamed from drivers/net/ixgbe/base/ixgbe_api.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_api.c
rename to drivers/net/intel/ixgbe/base/ixgbe_api.c
drivers/net/intel/ixgbe/base/ixgbe_api.h renamed from drivers/net/ixgbe/base/ixgbe_api.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_api.h
rename to drivers/net/intel/ixgbe/base/ixgbe_api.h
drivers/net/intel/ixgbe/base/ixgbe_common.c renamed from drivers/net/ixgbe/base/ixgbe_common.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_common.c
rename to drivers/net/intel/ixgbe/base/ixgbe_common.c
drivers/net/intel/ixgbe/base/ixgbe_common.h renamed from drivers/net/ixgbe/base/ixgbe_common.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_common.h
rename to drivers/net/intel/ixgbe/base/ixgbe_common.h
drivers/net/intel/ixgbe/base/ixgbe_dcb.c renamed from drivers/net/ixgbe/base/ixgbe_dcb.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_dcb.c
rename to drivers/net/intel/ixgbe/base/ixgbe_dcb.c
drivers/net/intel/ixgbe/base/ixgbe_dcb.h renamed from drivers/net/ixgbe/base/ixgbe_dcb.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_dcb.h
rename to drivers/net/intel/ixgbe/base/ixgbe_dcb.h
drivers/net/intel/ixgbe/base/ixgbe_dcb_82598.c renamed from drivers/net/ixgbe/base/ixgbe_dcb_82598.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_dcb_82598.c
rename to drivers/net/intel/ixgbe/base/ixgbe_dcb_82598.c
drivers/net/intel/ixgbe/base/ixgbe_dcb_82598.h renamed from drivers/net/ixgbe/base/ixgbe_dcb_82598.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_dcb_82598.h
rename to drivers/net/intel/ixgbe/base/ixgbe_dcb_82598.h
drivers/net/intel/ixgbe/base/ixgbe_dcb_82599.c renamed from drivers/net/ixgbe/base/ixgbe_dcb_82599.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_dcb_82599.c
rename to drivers/net/intel/ixgbe/base/ixgbe_dcb_82599.c
drivers/net/intel/ixgbe/base/ixgbe_dcb_82599.h renamed from drivers/net/ixgbe/base/ixgbe_dcb_82599.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_dcb_82599.h
rename to drivers/net/intel/ixgbe/base/ixgbe_dcb_82599.h
drivers/net/intel/ixgbe/base/ixgbe_e610.c renamed from drivers/net/ixgbe/base/ixgbe_e610.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_e610.c
rename to drivers/net/intel/ixgbe/base/ixgbe_e610.c
drivers/net/intel/ixgbe/base/ixgbe_e610.h renamed from drivers/net/ixgbe/base/ixgbe_e610.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_e610.h
rename to drivers/net/intel/ixgbe/base/ixgbe_e610.h
drivers/net/intel/ixgbe/base/ixgbe_hv_vf.c renamed from drivers/net/ixgbe/base/ixgbe_hv_vf.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_hv_vf.c
rename to drivers/net/intel/ixgbe/base/ixgbe_hv_vf.c
drivers/net/intel/ixgbe/base/ixgbe_hv_vf.h renamed from drivers/net/ixgbe/base/ixgbe_hv_vf.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_hv_vf.h
rename to drivers/net/intel/ixgbe/base/ixgbe_hv_vf.h
drivers/net/intel/ixgbe/base/ixgbe_mbx.c renamed from drivers/net/ixgbe/base/ixgbe_mbx.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_mbx.c
rename to drivers/net/intel/ixgbe/base/ixgbe_mbx.c
drivers/net/intel/ixgbe/base/ixgbe_mbx.h renamed from drivers/net/ixgbe/base/ixgbe_mbx.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_mbx.h
rename to drivers/net/intel/ixgbe/base/ixgbe_mbx.h
drivers/net/intel/ixgbe/base/ixgbe_osdep.c renamed from drivers/net/ixgbe/base/ixgbe_osdep.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_osdep.c
rename to drivers/net/intel/ixgbe/base/ixgbe_osdep.c
drivers/net/intel/ixgbe/base/ixgbe_osdep.h renamed from drivers/net/ixgbe/base/ixgbe_osdep.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_osdep.h
rename to drivers/net/intel/ixgbe/base/ixgbe_osdep.h
drivers/net/intel/ixgbe/base/ixgbe_phy.c renamed from drivers/net/ixgbe/base/ixgbe_phy.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_phy.c
rename to drivers/net/intel/ixgbe/base/ixgbe_phy.c
drivers/net/intel/ixgbe/base/ixgbe_phy.h renamed from drivers/net/ixgbe/base/ixgbe_phy.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_phy.h
rename to drivers/net/intel/ixgbe/base/ixgbe_phy.h
drivers/net/intel/ixgbe/base/ixgbe_type.h renamed from drivers/net/ixgbe/base/ixgbe_type.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_type.h
rename to drivers/net/intel/ixgbe/base/ixgbe_type.h
drivers/net/intel/ixgbe/base/ixgbe_type_e610.h renamed from drivers/net/ixgbe/base/ixgbe_type_e610.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_type_e610.h
rename to drivers/net/intel/ixgbe/base/ixgbe_type_e610.h
drivers/net/intel/ixgbe/base/ixgbe_vf.c renamed from drivers/net/ixgbe/base/ixgbe_vf.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_vf.c
rename to drivers/net/intel/ixgbe/base/ixgbe_vf.c
drivers/net/intel/ixgbe/base/ixgbe_vf.h renamed from drivers/net/ixgbe/base/ixgbe_vf.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_vf.h
rename to drivers/net/intel/ixgbe/base/ixgbe_vf.h
drivers/net/intel/ixgbe/base/ixgbe_x540.c renamed from drivers/net/ixgbe/base/ixgbe_x540.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_x540.c
rename to drivers/net/intel/ixgbe/base/ixgbe_x540.c
drivers/net/intel/ixgbe/base/ixgbe_x540.h renamed from drivers/net/ixgbe/base/ixgbe_x540.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_x540.h
rename to drivers/net/intel/ixgbe/base/ixgbe_x540.h
drivers/net/intel/ixgbe/base/ixgbe_x550.c renamed from drivers/net/ixgbe/base/ixgbe_x550.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_x550.c
rename to drivers/net/intel/ixgbe/base/ixgbe_x550.c
drivers/net/intel/ixgbe/base/ixgbe_x550.h renamed from drivers/net/ixgbe/base/ixgbe_x550.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_x550.h
rename to drivers/net/intel/ixgbe/base/ixgbe_x550.h
drivers/net/intel/ixgbe/base/meson.build renamed from drivers/net/ixgbe/base/meson.build +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/meson.build
rename to drivers/net/intel/ixgbe/base/meson.build
drivers/net/intel/ixgbe/ixgbe_82599_bypass.c renamed from drivers/net/ixgbe/ixgbe_82599_bypass.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_82599_bypass.c
rename to drivers/net/intel/ixgbe/ixgbe_82599_bypass.c
drivers/net/intel/ixgbe/ixgbe_bypass.c renamed from drivers/net/ixgbe/ixgbe_bypass.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_bypass.c
rename to drivers/net/intel/ixgbe/ixgbe_bypass.c
drivers/net/intel/ixgbe/ixgbe_bypass.h renamed from drivers/net/ixgbe/ixgbe_bypass.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_bypass.h
rename to drivers/net/intel/ixgbe/ixgbe_bypass.h
drivers/net/intel/ixgbe/ixgbe_bypass_api.h renamed from drivers/net/ixgbe/ixgbe_bypass_api.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_bypass_api.h
rename to drivers/net/intel/ixgbe/ixgbe_bypass_api.h
drivers/net/intel/ixgbe/ixgbe_bypass_defines.h renamed from drivers/net/ixgbe/ixgbe_bypass_defines.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_bypass_defines.h
rename to drivers/net/intel/ixgbe/ixgbe_bypass_defines.h
drivers/net/intel/ixgbe/ixgbe_ethdev.c renamed from drivers/net/ixgbe/ixgbe_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_ethdev.c
rename to drivers/net/intel/ixgbe/ixgbe_ethdev.c
drivers/net/intel/ixgbe/ixgbe_ethdev.h renamed from drivers/net/ixgbe/ixgbe_ethdev.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_ethdev.h
rename to drivers/net/intel/ixgbe/ixgbe_ethdev.h
drivers/net/intel/ixgbe/ixgbe_fdir.c renamed from drivers/net/ixgbe/ixgbe_fdir.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_fdir.c
rename to drivers/net/intel/ixgbe/ixgbe_fdir.c
drivers/net/intel/ixgbe/ixgbe_flow.c renamed from drivers/net/ixgbe/ixgbe_flow.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_flow.c
rename to drivers/net/intel/ixgbe/ixgbe_flow.c
drivers/net/intel/ixgbe/ixgbe_ipsec.c renamed from drivers/net/ixgbe/ixgbe_ipsec.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_ipsec.c
rename to drivers/net/intel/ixgbe/ixgbe_ipsec.c
drivers/net/intel/ixgbe/ixgbe_ipsec.h renamed from drivers/net/ixgbe/ixgbe_ipsec.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_ipsec.h
rename to drivers/net/intel/ixgbe/ixgbe_ipsec.h
drivers/net/intel/ixgbe/ixgbe_logs.h renamed from drivers/net/ixgbe/ixgbe_logs.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_logs.h
rename to drivers/net/intel/ixgbe/ixgbe_logs.h
drivers/net/intel/ixgbe/ixgbe_pf.c renamed from drivers/net/ixgbe/ixgbe_pf.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_pf.c
rename to drivers/net/intel/ixgbe/ixgbe_pf.c
drivers/net/intel/ixgbe/ixgbe_recycle_mbufs_vec_common.c renamed from drivers/net/ixgbe/ixgbe_recycle_mbufs_vec_common.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_recycle_mbufs_vec_common.c
rename to drivers/net/intel/ixgbe/ixgbe_recycle_mbufs_vec_common.c
drivers/net/intel/ixgbe/ixgbe_regs.h renamed from drivers/net/ixgbe/ixgbe_regs.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_regs.h
rename to drivers/net/intel/ixgbe/ixgbe_regs.h
drivers/net/intel/ixgbe/ixgbe_rxtx.c renamed from drivers/net/ixgbe/ixgbe_rxtx.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_rxtx.c
rename to drivers/net/intel/ixgbe/ixgbe_rxtx.c
drivers/net/intel/ixgbe/ixgbe_rxtx.h renamed from drivers/net/ixgbe/ixgbe_rxtx.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_rxtx.h
rename to drivers/net/intel/ixgbe/ixgbe_rxtx.h
drivers/net/intel/ixgbe/ixgbe_rxtx_vec_common.h renamed from drivers/net/ixgbe/ixgbe_rxtx_vec_common.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
rename to drivers/net/intel/ixgbe/ixgbe_rxtx_vec_common.h
drivers/net/intel/ixgbe/ixgbe_rxtx_vec_neon.c renamed from drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c
rename to drivers/net/intel/ixgbe/ixgbe_rxtx_vec_neon.c
drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c renamed from drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
rename to drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c
drivers/net/intel/ixgbe/ixgbe_testpmd.c renamed from drivers/net/ixgbe/ixgbe_testpmd.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_testpmd.c
rename to drivers/net/intel/ixgbe/ixgbe_testpmd.c
drivers/net/intel/ixgbe/ixgbe_tm.c renamed from drivers/net/ixgbe/ixgbe_tm.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_tm.c
rename to drivers/net/intel/ixgbe/ixgbe_tm.c
drivers/net/intel/ixgbe/ixgbe_vf_representor.c renamed from drivers/net/ixgbe/ixgbe_vf_representor.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_vf_representor.c
rename to drivers/net/intel/ixgbe/ixgbe_vf_representor.c
drivers/net/intel/ixgbe/meson.build renamed from drivers/net/ixgbe/meson.build +0 -0
similarity index 100%
rename from drivers/net/ixgbe/meson.build
rename to drivers/net/intel/ixgbe/meson.build
drivers/net/intel/ixgbe/rte_pmd_ixgbe.c renamed from drivers/net/ixgbe/rte_pmd_ixgbe.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/rte_pmd_ixgbe.c
rename to drivers/net/intel/ixgbe/rte_pmd_ixgbe.c
drivers/net/intel/ixgbe/rte_pmd_ixgbe.h renamed from drivers/net/ixgbe/rte_pmd_ixgbe.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/rte_pmd_ixgbe.h
rename to drivers/net/intel/ixgbe/rte_pmd_ixgbe.h
drivers/net/intel/ixgbe/version.map renamed from drivers/net/ixgbe/version.map +0 -0
similarity index 100%
rename from drivers/net/ixgbe/version.map
rename to drivers/net/intel/ixgbe/version.map
drivers/net/meson.build +10 -10
index dafd637ba4..02a3f5a0b6 100644
@@ -13,28 +13,28 @@ drivers = [
         'bnxt',
         'bonding',
         'cnxk',
-        'cpfl',
         'cxgbe',
         'dpaa',
         'dpaa2',
-        'e1000',
         'ena',
         'enetc',
         'enetfec',
         'enic',
         'failsafe',
-        'fm10k',
         'gve',
         'hinic',
         'hns3',
-        'i40e',
-        'iavf',
-        'ice',
-        'idpf',
-        'igc',
+        'intel/cpfl',
+        'intel/e1000',
+        'intel/fm10k',
+        'intel/i40e',
+        'intel/iavf',
+        'intel/ice',
+        'intel/idpf',
+        'intel/igc',
+        'intel/ipn3ke',
+        'intel/ixgbe',
         'ionic',
-        'ipn3ke',
-        'ixgbe',
         'mana',
         'memif',
         'mlx4',
Signature · 1 line
2.43.0
#133 lore raw

Re: [RFC PATCH] net: move intel drivers to intel subdirectory

Quoted 6 lines · Bruce Richardson

Consolidate all Intel HW NIC drivers into a driver/net/intel This matches the layout used for drivers in the kernel, and potentially enabling easier sharing among drivers.

---

Apologies, I somehow missed one change when making this RFC. If anyone is testing it, to get a clean build apply the below 2 line change:

/Bruce

drivers/raw/ifpga/meson.build +2 -2
index 20dea23206..94f5afa08d 100644
@@ -18,7 +18,7 @@ sources = files('ifpga_rawdev.c', 'rte_pmd_ifpga.c', 'afu_pmd_core.c',
     'afu_pmd_he_hssi.c')
 
 includes += include_directories('base')
-includes += include_directories('../../net/ipn3ke')
-includes += include_directories('../../net/i40e')
+includes += include_directories('../../net/intel/ipn3ke')
+includes += include_directories('../../net/intel/i40e')
 
 headers = files('rte_pmd_ifpga.h')
#134 lore raw

Re: [RFC PATCH] net: move intel drivers to intel subdirectory

Quoted 10 lines · Bruce Richardson
Quoted 6 lines · Bruce Richardson

Consolidate all Intel HW NIC drivers into a driver/net/intel This matches the layout used for drivers in the kernel, and potentially enabling easier sharing among drivers.

---

Apologies, I somehow missed one change when making this RFC. If anyone is testing it, to get a clean build apply the below 2 line change:

Well.. this can only be noticed when building from scratch.

Quoted 8 lines

/Bruce

drivers/raw/ifpga/meson.build +0 -0
index 20dea23206..94f5afa08d 100644

drivers/raw/ifpga/meson.build sources = files('ifpga_rawdev.c', 'rte_pmd_ifpga.c', 'afu_pmd_core.c', · line 24

Quoted 9 lines
drivers/raw/ifpga/meson.build +2 -2
@@ -18,7 +18,7 @@ sources = files('ifpga_rawdev.c', 'rte_pmd_ifpga.c', 'afu_pmd_core.c',
     'afu_pmd_he_hssi.c')
 
 includes += include_directories('base')
-includes += include_directories('../../net/ipn3ke')
-includes += include_directories('../../net/i40e')
+includes += include_directories('../../net/intel/ipn3ke')
+includes += include_directories('../../net/intel/i40e')
 
 headers = files('rte_pmd_ifpga.h')

Are those include_directories() needed?
raw/ifpga is already flagged as depending on those drivers, and as a result their include path should already be pulled.

Signature · 1 line
David Marchand
#135 lore raw

Re: [RFC PATCH] net: move intel drivers to intel subdirectory

In reply to Bruce Richardson
Quoted 14 lines · Bruce Richardson
drivers/meson.build +1 -1
index 495e21b54a..89545e618e 100644
@@ -47,7 +47,7 @@ enable_drivers = run_command(list_dir_globs, enable_drivers, check: true).stdout
 require_drivers = true
 if enable_drivers.length() == 0
     require_drivers = false
-    enable_drivers = run_command(list_dir_globs, '*/*', check: true).stdout().split()
+    enable_drivers = run_command(list_dir_globs, '*/*,*/*/*', check: true).stdout().split()
 endif
 
 # these drivers must always be enabled, otherwise the build breaks

drivers/meson.build foreach subpath:subdirs · line 152

Quoted 10 lines
drivers/meson.build +4 -0
@@ -143,6 +143,10 @@ foreach subpath:subdirs
         testpmd_sources = []
         require_iova_in_mbuf = true
 
+        if name.contains('/')
+            name = name.split('/')[1]
+        endif
+
         if not enable_drivers.contains(drv_path)
             build = false
             reason = 'not in enabled drivers build config'

Nice trick.
This makes this move transparent when it comes to library names, dependency object name, log prefix etc...

We maintain consistency in git history, so check-git-log.sh may need some update to handle this special case (iow requiring, for example, net/i40e and not net/intel/i40e prefix for title of commits touching this driver).

Signature · 1 line
David Marchand
#136 lore raw
In reply to Bruce Richardson
Quoted 11 lines · Bruce Richardson
Quoted 8 lines · Bruce Richardson

This RFC attempts to reduce the amount of code duplication across a number of Intel NIC drivers, specifically: ixgbe, i40e, iavf, and ice.

The first patch extract a function from the Rx side, otherwise the majority of the changes are on the Tx side, leading to a converged Tx queue structure across the 4 drivers, and a large number of common functions.

Quoted 4 lines

When considering the changes in this patchset, I'm still not entirely satisfied with where to place the common code in the repo. Using the "drivers/common" seems wrong to me, as it's for code common across devices, and having a "_common_intel" (or common_intel) folder inside drivers/net

driver/common/intel is OK. I think.

Quoted 5 lines

seems a bit ugly to me.

What would people think of me taking a leaf out of the kernel directory structure playbook, and moving the intel drivers into a separate subdirectory "drivers/net/intel"? I've done up a prototype RFC patch for

I thought the reason for not keeping the company name was to - not change the directory structure
if NIC block is bought by another company (driver/net/bnxk was with Boradcom then moved to Marvell) or acquired by another company. (Cavium->Marvell)

Quoted 9 lines

this (which I will send out on this thread), and the changes to support that are very small. That then allows us to have a drivers/net/intel/common folder which seems rather neat to me. It also shortens the list of drivers directly in drivers/net by quite a bit, since there are quite a few intel drivers accumulated over the years. :-)

Thoughts, comments or objections?

/Bruce

#137 lore raw
Quoted 26 lines · Jerin Jacob
Quoted 11 lines · Bruce Richardson
Quoted 8 lines · Bruce Richardson

This RFC attempts to reduce the amount of code duplication across a number of Intel NIC drivers, specifically: ixgbe, i40e, iavf, and ice.

The first patch extract a function from the Rx side, otherwise the majority of the changes are on the Tx side, leading to a converged Tx queue structure across the 4 drivers, and a large number of common functions.

Quoted 4 lines

When considering the changes in this patchset, I'm still not entirely satisfied with where to place the common code in the repo. Using the "drivers/common" seems wrong to me, as it's for code common across devices, and having a "_common_intel" (or common_intel) folder inside drivers/net

driver/common/intel is OK. I think.

Quoted 5 lines

seems a bit ugly to me.

What would people think of me taking a leaf out of the kernel directory structure playbook, and moving the intel drivers into a separate subdirectory "drivers/net/intel"? I've done up a prototype RFC patch for

Quoted 7 lines

I thought the reason for not keeping the company name was to - not change the directory structure
if NIC block is bought by another company (driver/net/bnxk was with Boradcom then moved to Marvell) or acquired by another company. (Cavium->Marvell)

I hadn't thought of that.

However, in our case I believe the reason we don't use this scheme is that we a) never needed to and AFAIK b) it has never been proposed.

In practice, if we do this for the intel drivers, it does not need to be done by other vendors unless they want to do so, or have a lot of drivers in DPDK. Also, renaming vendor directories is not going to be a serious problem, so long as the underlying device directory name remains the same. For compatibility of output, my RFC patch strips off all paths but the last, so intel/i40e remains just "i40e" in terms of all generated objects.

/Bruce

#138 lore raw
Quoted 65 lines

From: Bruce Richardson [mailto:[email protected]]
Sent: Thursday, 16 January 2025 18.46

Quoted 5 lines · Jerin Jacob
Quoted 3 lines · Bruce Richardson
Quoted 1 line · Bruce Richardson

This RFC attempts to reduce the amount of code duplication across

a

Quoted 1 line
Quoted 1 line
Quoted 1 line

number of Intel NIC drivers, specifically: ixgbe, i40e, iavf, and

ice.

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

The first patch extract a function from the Rx side, otherwise

the

Quoted 1 line
Quoted 1 line
Quoted 1 line

majority of the changes are on the Tx side, leading to a

converged Tx

Quoted 1 line
Quoted 1 line
Quoted 1 line

queue structure across the 4 drivers, and a large number of

common

Quoted 4 lines
Quoted 4 lines
Quoted 2 lines

functions.

When considering the changes in this patchset, I'm still not

entirely

Quoted 1 line
Quoted 1 line

satisfied with where to place the common code in the repo. Using

the

Quoted 1 line
Quoted 1 line

"drivers/common" seems wrong to me, as it's for code common across

devices,

Quoted 1 line
Quoted 1 line

and having a "_common_intel" (or common_intel) folder inside

drivers/net

Quoted 6 lines

driver/common/intel is OK. I think.

Quoted 3 lines

seems a bit ugly to me.

What would people think of me taking a leaf out of the kernel

directory

Quoted 2 lines
Quoted 2 lines

structure playbook, and moving the intel drivers into a separate subdirectory "drivers/net/intel"? I've done up a prototype RFC

patch for

Quoted 8 lines

I thought the reason for not keeping the company name was to - not change the directory structure
if NIC block is bought by another company (driver/net/bnxk was with Boradcom then moved to Marvell) or acquired by another company. (Cavium->Marvell)

I hadn't thought of that.

However, in our case I believe the reason we don't use this scheme is that
we a) never needed to and AFAIK b) it has never been proposed.

In practice, if we do this for the intel drivers, it does not need to be
done by other vendors unless they want to do so, or have a lot of drivers
in DPDK. Also, renaming vendor directories is not going to be a serious problem, so long as the underlying device directory name remains the same.
For compatibility of output, my RFC patch strips off all paths but the last, so intel/i40e remains just "i40e" in terms of all generated objects.

Quoted 1 line

/Bruce

If we proceed with drivers/net/intel/i40e, will new patches be titled "net/intel/i40e: new feature", or still just "net/i40e: ..."?

The key is getting rid of code duplication, so either directory structure is fine with me, drivers/net/intel/common, or drivers/common/intel.

Considering Jerin's input about NICs getting new owner companies, I have a slight preference for Jerin's suggestion.

#139 lore raw
Quoted 65 lines · Morten Brørup
Quoted 65 lines

From: Bruce Richardson [mailto:[email protected]]
Sent: Thursday, 16 January 2025 18.46

Quoted 5 lines · Jerin Jacob
Quoted 3 lines · Bruce Richardson
Quoted 1 line · Bruce Richardson

This RFC attempts to reduce the amount of code duplication across

a

Quoted 1 line
Quoted 1 line
Quoted 1 line

number of Intel NIC drivers, specifically: ixgbe, i40e, iavf, and

ice.

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

The first patch extract a function from the Rx side, otherwise

the

Quoted 1 line
Quoted 1 line
Quoted 1 line

majority of the changes are on the Tx side, leading to a

converged Tx

Quoted 1 line
Quoted 1 line
Quoted 1 line

queue structure across the 4 drivers, and a large number of

common

Quoted 4 lines
Quoted 4 lines
Quoted 2 lines

functions.

When considering the changes in this patchset, I'm still not

entirely

Quoted 1 line
Quoted 1 line

satisfied with where to place the common code in the repo. Using

the

Quoted 1 line
Quoted 1 line

"drivers/common" seems wrong to me, as it's for code common across

devices,

Quoted 1 line
Quoted 1 line

and having a "_common_intel" (or common_intel) folder inside

drivers/net

Quoted 6 lines

driver/common/intel is OK. I think.

Quoted 3 lines

seems a bit ugly to me.

What would people think of me taking a leaf out of the kernel

directory

Quoted 2 lines
Quoted 2 lines

structure playbook, and moving the intel drivers into a separate subdirectory "drivers/net/intel"? I've done up a prototype RFC

patch for

Quoted 8 lines

I thought the reason for not keeping the company name was to - not change the directory structure
if NIC block is bought by another company (driver/net/bnxk was with Boradcom then moved to Marvell) or acquired by another company. (Cavium->Marvell)

I hadn't thought of that.

However, in our case I believe the reason we don't use this scheme is that
we a) never needed to and AFAIK b) it has never been proposed.

In practice, if we do this for the intel drivers, it does not need to be
done by other vendors unless they want to do so, or have a lot of drivers
in DPDK. Also, renaming vendor directories is not going to be a serious problem, so long as the underlying device directory name remains the same.
For compatibility of output, my RFC patch strips off all paths but the last, so intel/i40e remains just "i40e" in terms of all generated objects.

Quoted 8 lines
Quoted 1 line

/Bruce

If we proceed with drivers/net/intel/i40e, will new patches be titled "net/intel/i40e: new feature", or still just "net/i40e: ..."?

The key is getting rid of code duplication, so either directory structure is fine with me, drivers/net/intel/common, or drivers/common/intel.

Considering Jerin's input about NICs getting new owner companies, I have a slight preference for Jerin's suggestion.

For the second suggestion, drivers/common/intel wouldn't work as a name on it's own since it's too generic, and doesn't specify that this is common net driver code. So the resulting name would be "drivers/common/intel_net" or "intel_eth". My preference is definitely against using drivers/common, but I am ok to continue to use the "_common_intel" folder name in "net" as in the v4 patchset, or (my slight preference) to have "drivers/net/intel/common" folder with the other drivers moved to that "drivers/net/intel" folder too.

/Bruce

#140 lore raw

v5 cover Reduce code duplication across Intel NIC drivers

In reply to Bruce Richardson

This patchset attempts to reduce the amount of code duplication across a number of Intel NIC drivers, specifically: ixgbe, i40e, iavf, and ice. As part of this process of deduplication, and in preparation for further cleanup work, it moves all existing Intel drivers to a net/intel directory, with a "common" subdirectory being created there for the code shared between drivers.

The first deduplication patch extracts a function from the Rx side, otherwise the majority of the changes are on the Tx side, leading to a converged Tx queue structure across the 4 drivers, and a large number of common functions.

v4->v5:
* moved drivers to net/intel and rebased patchset with new paths.

v3->v4:
* Add patches 23 & 24 to set, to do a little more dedupliation on Rx side

v2->v3:
* Fix incorrect/unadjusted memset in patch 8, leading to incorrect threshold tracking in ixgbe.

v1->v2:
* Fix two additional checkpatch issues that were flagged.
* Added in patch 21, which performs additional cleanup that is possible once all vector drivers use the same mbuf free/release process. [This brings the patchset to having over twice as many lines removed as added (1887 vs 930), and close to having a net removal of 1kloc]

RFC->v1:
* Moved the location of the common code from "common/intel_eth" to "net/_common_intel", and added only ".." to the driver include path so that the paths included "_common_intel" in them, to make it clear it's not driver-local headers.
* Due to change in location, structure/fn prefix changes from "ieth" to "ci" for "common intel".
* Removed the seeming-arbitrary split of vector and non-vector code - since much of the code taken from vector files was scalar code which was used by the vector drivers.
* Split code into separate Rx and Tx files.
* Fixed multiple checkpatch issues (but not all).
* Attempted to improve name standardization, by using "_vec" as a common suffix for all vector-related fns and data. Previously, some names had "vec" in the middle, others had just "_v" suffix or full word "vector" as suffix.
* Other minor changes...

Bruce Richardson (25):
net: move intel drivers to intel subdirectory net/intel/common: add pkt reassembly fn for intel drivers net/intel/common: provide common Tx entry structures net/intel/common: add Tx mbuf ring replenish fn net/intel: align Tx queue struct field names net/intel: add prefix for driver-specific structs net/intel/common: merge ice and i40e Tx queue struct net/iavf: use common Tx queue structure net/ixgbe: convert Tx queue context cache field to ptr net/ixgbe: use common Tx queue structure net/intel/common: pack Tx queue structure net/intel/common: add post-Tx buffer free function net/intel/common: add Tx buffer free fn for AVX-512 net/iavf: use common Tx free fn for AVX-512 net/ice: move Tx queue mbuf cleanup fn to common net/i40e: use common Tx queue mbuf cleanup fn net/ixgbe: use common Tx queue mbuf cleanup fn net/iavf: use common Tx queue mbuf cleanup fn net/ice: use vector SW ring for all vector paths net/i40e: use vector SW ring for all vector paths net/iavf: use vector SW ring for all vector paths net/intel/common: remove unneeded code net/ixgbe: use common Tx backlog entry fn net/intel/common: create common mbuf initializer fn net/intel/common: extract common Rx vector criteria

 MAINTAINERS                                   |  20 +-
 devtools/check-git-log.sh                     |   4 +
 doc/api/doxy-api.conf.in                      |   6 +-
 drivers/meson.build                           |   6 +-
 drivers/net/i40e/i40e_rxtx_vec_common.h       | 263 -----------
 drivers/net/ice/ice_rxtx_vec_common.h         | 426 ------------------
 drivers/net/intel/common/rx.h                 | 112 +++++
 drivers/net/intel/common/tx.h                 | 249 ++++++++++
 drivers/net/{ => intel}/cpfl/cpfl_actions.h   |   0
 drivers/net/{ => intel}/cpfl/cpfl_controlq.c  |   0
 drivers/net/{ => intel}/cpfl/cpfl_controlq.h  |   0
 drivers/net/{ => intel}/cpfl/cpfl_cpchnl.h    |   0
 drivers/net/{ => intel}/cpfl/cpfl_ethdev.c    |   0
 drivers/net/{ => intel}/cpfl/cpfl_ethdev.h    |   0
 drivers/net/{ => intel}/cpfl/cpfl_flow.c      |   0
 drivers/net/{ => intel}/cpfl/cpfl_flow.h      |   0
 .../{ => intel}/cpfl/cpfl_flow_engine_fxp.c   |   0
 .../net/{ => intel}/cpfl/cpfl_flow_parser.c   |   0
 .../net/{ => intel}/cpfl/cpfl_flow_parser.h   |   0
 drivers/net/{ => intel}/cpfl/cpfl_fxp_rule.c  |   0
 drivers/net/{ => intel}/cpfl/cpfl_fxp_rule.h  |   0
 drivers/net/{ => intel}/cpfl/cpfl_logs.h      |   0
 .../net/{ => intel}/cpfl/cpfl_representor.c   |   0
 .../net/{ => intel}/cpfl/cpfl_representor.h   |   0
 drivers/net/{ => intel}/cpfl/cpfl_rules.c     |   0
 drivers/net/{ => intel}/cpfl/cpfl_rules.h     |   0
 drivers/net/{ => intel}/cpfl/cpfl_rxtx.c      |   0
 drivers/net/{ => intel}/cpfl/cpfl_rxtx.h      |   0
 .../{ => intel}/cpfl/cpfl_rxtx_vec_common.h   |   0
 drivers/net/{ => intel}/cpfl/cpfl_vchnl.c     |   0
 drivers/net/{ => intel}/cpfl/meson.build      |   0
 drivers/net/{ => intel}/e1000/base/README     |   0
 .../e1000/base/e1000_80003es2lan.c            |   0
 .../e1000/base/e1000_80003es2lan.h            |   0
 .../net/{ => intel}/e1000/base/e1000_82540.c  |   0
 .../net/{ => intel}/e1000/base/e1000_82541.c  |   0
 .../net/{ => intel}/e1000/base/e1000_82541.h  |   0
 .../net/{ => intel}/e1000/base/e1000_82542.c  |   0
 .../net/{ => intel}/e1000/base/e1000_82543.c  |   0
 .../net/{ => intel}/e1000/base/e1000_82543.h  |   0
 .../net/{ => intel}/e1000/base/e1000_82571.c  |   0
 .../net/{ => intel}/e1000/base/e1000_82571.h  |   0
 .../net/{ => intel}/e1000/base/e1000_82575.c  |   0
 .../net/{ => intel}/e1000/base/e1000_82575.h  |   0
 .../net/{ => intel}/e1000/base/e1000_api.c    |   0
 .../net/{ => intel}/e1000/base/e1000_api.h    |   0
 .../net/{ => intel}/e1000/base/e1000_base.c   |   0
 .../net/{ => intel}/e1000/base/e1000_base.h   |   0
 .../{ => intel}/e1000/base/e1000_defines.h    |   0
 drivers/net/{ => intel}/e1000/base/e1000_hw.h |   0
 .../net/{ => intel}/e1000/base/e1000_i210.c   |   0
 .../net/{ => intel}/e1000/base/e1000_i210.h   |   0
 .../{ => intel}/e1000/base/e1000_ich8lan.c    |   0
 .../{ => intel}/e1000/base/e1000_ich8lan.h    |   0
 .../net/{ => intel}/e1000/base/e1000_mac.c    |   0
 .../net/{ => intel}/e1000/base/e1000_mac.h    |   0
 .../net/{ => intel}/e1000/base/e1000_manage.c |   0
 .../net/{ => intel}/e1000/base/e1000_manage.h |   0
 .../net/{ => intel}/e1000/base/e1000_mbx.c    |   0
 .../net/{ => intel}/e1000/base/e1000_mbx.h    |   0
 .../net/{ => intel}/e1000/base/e1000_nvm.c    |   0
 .../net/{ => intel}/e1000/base/e1000_nvm.h    |   0
 .../net/{ => intel}/e1000/base/e1000_osdep.c  |   0
 .../net/{ => intel}/e1000/base/e1000_osdep.h  |   0
 .../net/{ => intel}/e1000/base/e1000_phy.c    |   0
 .../net/{ => intel}/e1000/base/e1000_phy.h    |   0
 .../net/{ => intel}/e1000/base/e1000_regs.h   |   0
 drivers/net/{ => intel}/e1000/base/e1000_vf.c |   0
 drivers/net/{ => intel}/e1000/base/e1000_vf.h |   0
 .../net/{ => intel}/e1000/base/meson.build    |   0
 drivers/net/{ => intel}/e1000/e1000_ethdev.h  |   0
 drivers/net/{ => intel}/e1000/e1000_logs.c    |   0
 drivers/net/{ => intel}/e1000/e1000_logs.h    |   0
 drivers/net/{ => intel}/e1000/em_ethdev.c     |   0
 drivers/net/{ => intel}/e1000/em_rxtx.c       |   0
 drivers/net/{ => intel}/e1000/igb_ethdev.c    |   0
 drivers/net/{ => intel}/e1000/igb_flow.c      |   0
 drivers/net/{ => intel}/e1000/igb_pf.c        |   0
 drivers/net/{ => intel}/e1000/igb_regs.h      |   0
 drivers/net/{ => intel}/e1000/igb_rxtx.c      |   0
 drivers/net/{ => intel}/e1000/meson.build     |   0
 .../net/{ => intel}/fm10k/base/fm10k_api.c    |   0
 .../net/{ => intel}/fm10k/base/fm10k_api.h    |   0
 .../net/{ => intel}/fm10k/base/fm10k_common.c |   0
 .../net/{ => intel}/fm10k/base/fm10k_common.h |   0
 .../net/{ => intel}/fm10k/base/fm10k_mbx.c    |   0
 .../net/{ => intel}/fm10k/base/fm10k_mbx.h    |   0
 .../net/{ => intel}/fm10k/base/fm10k_osdep.h  |   0
 drivers/net/{ => intel}/fm10k/base/fm10k_pf.c |   0
 drivers/net/{ => intel}/fm10k/base/fm10k_pf.h |   0
 .../net/{ => intel}/fm10k/base/fm10k_tlv.c    |   0
 .../net/{ => intel}/fm10k/base/fm10k_tlv.h    |   0
 .../net/{ => intel}/fm10k/base/fm10k_type.h   |   0
 drivers/net/{ => intel}/fm10k/base/fm10k_vf.c |   0
 drivers/net/{ => intel}/fm10k/base/fm10k_vf.h |   0
 .../net/{ => intel}/fm10k/base/meson.build    |   0
 drivers/net/{ => intel}/fm10k/fm10k.h         |   0
 drivers/net/{ => intel}/fm10k/fm10k_ethdev.c  |   0
 drivers/net/{ => intel}/fm10k/fm10k_logs.h    |   0
 drivers/net/{ => intel}/fm10k/fm10k_rxtx.c    |   0
 .../net/{ => intel}/fm10k/fm10k_rxtx_vec.c    |   0
 drivers/net/{ => intel}/fm10k/meson.build     |   0
 drivers/net/{ => intel}/i40e/base/README      |   0
 .../net/{ => intel}/i40e/base/i40e_adminq.c   |   0
 .../net/{ => intel}/i40e/base/i40e_adminq.h   |   0
 .../{ => intel}/i40e/base/i40e_adminq_cmd.h   |   0
 .../net/{ => intel}/i40e/base/i40e_alloc.h    |   0
 .../net/{ => intel}/i40e/base/i40e_common.c   |   0
 drivers/net/{ => intel}/i40e/base/i40e_dcb.c  |   0
 drivers/net/{ => intel}/i40e/base/i40e_dcb.h  |   0
 .../net/{ => intel}/i40e/base/i40e_devids.h   |   0
 drivers/net/{ => intel}/i40e/base/i40e_diag.c |   0
 drivers/net/{ => intel}/i40e/base/i40e_diag.h |   0
 drivers/net/{ => intel}/i40e/base/i40e_hmc.c  |   0
 drivers/net/{ => intel}/i40e/base/i40e_hmc.h  |   0
 .../net/{ => intel}/i40e/base/i40e_lan_hmc.c  |   0
 .../net/{ => intel}/i40e/base/i40e_lan_hmc.h  |   0
 drivers/net/{ => intel}/i40e/base/i40e_nvm.c  |   0
 .../net/{ => intel}/i40e/base/i40e_osdep.h    |   0
 .../{ => intel}/i40e/base/i40e_prototype.h    |   0
 .../net/{ => intel}/i40e/base/i40e_register.h |   0
 .../net/{ => intel}/i40e/base/i40e_status.h   |   0
 drivers/net/{ => intel}/i40e/base/i40e_type.h |   0
 drivers/net/{ => intel}/i40e/base/meson.build |   0
 drivers/net/{ => intel}/i40e/base/virtchnl.h  |   0
 drivers/net/{ => intel}/i40e/i40e_ethdev.c    |   4 +-
 drivers/net/{ => intel}/i40e/i40e_ethdev.h    |   8 +-
 drivers/net/{ => intel}/i40e/i40e_fdir.c      |  10 +-
 drivers/net/{ => intel}/i40e/i40e_flow.c      |   0
 drivers/net/{ => intel}/i40e/i40e_hash.c      |   0
 drivers/net/{ => intel}/i40e/i40e_hash.h      |   0
 drivers/net/{ => intel}/i40e/i40e_logs.h      |   0
 drivers/net/{ => intel}/i40e/i40e_pf.c        |   0
 drivers/net/{ => intel}/i40e/i40e_pf.h        |   0
 .../i40e/i40e_recycle_mbufs_vec_common.c      |   6 +-
 drivers/net/{ => intel}/i40e/i40e_regs.h      |   0
 drivers/net/{ => intel}/i40e/i40e_rxtx.c      | 192 +++-----
 drivers/net/{ => intel}/i40e/i40e_rxtx.h      |  61 +--
 .../{ => intel}/i40e/i40e_rxtx_common_avx.h   |   0
 .../{ => intel}/i40e/i40e_rxtx_vec_altivec.c  |  30 +-
 .../net/{ => intel}/i40e/i40e_rxtx_vec_avx2.c |  26 +-
 .../{ => intel}/i40e/i40e_rxtx_vec_avx512.c   | 144 +-----
 drivers/net/intel/i40e/i40e_rxtx_vec_common.h |  91 ++++
 .../net/{ => intel}/i40e/i40e_rxtx_vec_neon.c |  30 +-
 .../net/{ => intel}/i40e/i40e_rxtx_vec_sse.c  |  30 +-
 drivers/net/{ => intel}/i40e/i40e_testpmd.c   |   0
 drivers/net/{ => intel}/i40e/i40e_tm.c        |   0
 .../{ => intel}/i40e/i40e_vf_representor.c    |   0
 drivers/net/{ => intel}/i40e/meson.build      |   0
 drivers/net/{ => intel}/i40e/rte_pmd_i40e.c   |   0
 drivers/net/{ => intel}/i40e/rte_pmd_i40e.h   |   0
 drivers/net/{ => intel}/i40e/version.map      |   0
 drivers/net/{ => intel}/iavf/iavf.h           |   2 +-
 drivers/net/{ => intel}/iavf/iavf_ethdev.c    |   4 +-
 drivers/net/{ => intel}/iavf/iavf_fdir.c      |   0
 drivers/net/{ => intel}/iavf/iavf_fsub.c      |   0
 .../net/{ => intel}/iavf/iavf_generic_flow.c  |   0
 .../net/{ => intel}/iavf/iavf_generic_flow.h  |   0
 drivers/net/{ => intel}/iavf/iavf_hash.c      |   0
 .../net/{ => intel}/iavf/iavf_ipsec_crypto.c  |   0
 .../net/{ => intel}/iavf/iavf_ipsec_crypto.h  |   0
 .../iavf/iavf_ipsec_crypto_capabilities.h     |   0
 drivers/net/{ => intel}/iavf/iavf_log.h       |   0
 drivers/net/{ => intel}/iavf/iavf_rxtx.c      | 195 +++-----
 drivers/net/{ => intel}/iavf/iavf_rxtx.h      |  62 +--
 .../net/{ => intel}/iavf/iavf_rxtx_vec_avx2.c |  47 +-
 .../{ => intel}/iavf/iavf_rxtx_vec_avx512.c   | 214 ++-------
 .../{ => intel}/iavf/iavf_rxtx_vec_common.h   | 178 +-------
 .../net/{ => intel}/iavf/iavf_rxtx_vec_neon.c |   3 +-
 .../net/{ => intel}/iavf/iavf_rxtx_vec_sse.c  |  59 ++-
 drivers/net/{ => intel}/iavf/iavf_testpmd.c   |   0
 drivers/net/{ => intel}/iavf/iavf_tm.c        |   0
 drivers/net/{ => intel}/iavf/iavf_vchnl.c     |   8 +-
 drivers/net/{ => intel}/iavf/meson.build      |   7 +-
 drivers/net/{ => intel}/iavf/rte_pmd_iavf.h   |   0
 drivers/net/{ => intel}/iavf/version.map      |   0
 drivers/net/{ => intel}/ice/base/README       |   0
 drivers/net/{ => intel}/ice/base/ice_acl.c    |   0
 drivers/net/{ => intel}/ice/base/ice_acl.h    |   0
 .../net/{ => intel}/ice/base/ice_acl_ctrl.c   |   0
 .../net/{ => intel}/ice/base/ice_adminq_cmd.h |   0
 drivers/net/{ => intel}/ice/base/ice_alloc.h  |   0
 drivers/net/{ => intel}/ice/base/ice_bitops.h |   0
 .../net/{ => intel}/ice/base/ice_bst_tcam.c   |   0
 .../net/{ => intel}/ice/base/ice_bst_tcam.h   |   0
 .../net/{ => intel}/ice/base/ice_cgu_regs.h   |   0
 drivers/net/{ => intel}/ice/base/ice_common.c |   0
 drivers/net/{ => intel}/ice/base/ice_common.h |   0
 .../net/{ => intel}/ice/base/ice_controlq.c   |   0
 .../net/{ => intel}/ice/base/ice_controlq.h   |   0
 drivers/net/{ => intel}/ice/base/ice_dcb.c    |   0
 drivers/net/{ => intel}/ice/base/ice_dcb.h    |   0
 drivers/net/{ => intel}/ice/base/ice_ddp.c    |   0
 drivers/net/{ => intel}/ice/base/ice_ddp.h    |   0
 drivers/net/{ => intel}/ice/base/ice_defs.h   |   0
 drivers/net/{ => intel}/ice/base/ice_devids.h |   0
 drivers/net/{ => intel}/ice/base/ice_fdir.c   |   0
 drivers/net/{ => intel}/ice/base/ice_fdir.h   |   0
 .../net/{ => intel}/ice/base/ice_flex_pipe.c  |   0
 .../net/{ => intel}/ice/base/ice_flex_pipe.h  |   0
 .../net/{ => intel}/ice/base/ice_flex_type.h  |   0
 drivers/net/{ => intel}/ice/base/ice_flg_rd.c |   0
 drivers/net/{ => intel}/ice/base/ice_flg_rd.h |   0
 drivers/net/{ => intel}/ice/base/ice_flow.c   |   0
 drivers/net/{ => intel}/ice/base/ice_flow.h   |   0
 drivers/net/{ => intel}/ice/base/ice_fwlog.c  |   0
 drivers/net/{ => intel}/ice/base/ice_fwlog.h  |   0
 .../net/{ => intel}/ice/base/ice_hw_autogen.h |   0
 drivers/net/{ => intel}/ice/base/ice_imem.c   |   0
 drivers/net/{ => intel}/ice/base/ice_imem.h   |   0
 .../net/{ => intel}/ice/base/ice_lan_tx_rx.h  |   0
 .../net/{ => intel}/ice/base/ice_metainit.c   |   0
 .../net/{ => intel}/ice/base/ice_metainit.h   |   0
 drivers/net/{ => intel}/ice/base/ice_mk_grp.c |   0
 drivers/net/{ => intel}/ice/base/ice_mk_grp.h |   0
 drivers/net/{ => intel}/ice/base/ice_nvm.c    |   0
 drivers/net/{ => intel}/ice/base/ice_nvm.h    |   0
 drivers/net/{ => intel}/ice/base/ice_osdep.h  |   0
 drivers/net/{ => intel}/ice/base/ice_parser.c |   0
 drivers/net/{ => intel}/ice/base/ice_parser.h |   0
 .../net/{ => intel}/ice/base/ice_parser_rt.c  |   0
 .../net/{ => intel}/ice/base/ice_parser_rt.h  |   0
 .../{ => intel}/ice/base/ice_parser_util.h    |   0
 drivers/net/{ => intel}/ice/base/ice_pg_cam.c |   0
 drivers/net/{ => intel}/ice/base/ice_pg_cam.h |   0
 .../net/{ => intel}/ice/base/ice_phy_regs.h   |   0
 .../net/{ => intel}/ice/base/ice_proto_grp.c  |   0
 .../net/{ => intel}/ice/base/ice_proto_grp.h  |   0
 .../{ => intel}/ice/base/ice_protocol_type.h  |   0
 .../net/{ => intel}/ice/base/ice_ptp_consts.h |   0
 drivers/net/{ => intel}/ice/base/ice_ptp_hw.c |   0
 drivers/net/{ => intel}/ice/base/ice_ptp_hw.h |   0
 .../net/{ => intel}/ice/base/ice_ptype_mk.c   |   0
 .../net/{ => intel}/ice/base/ice_ptype_mk.h   |   0
 .../net/{ => intel}/ice/base/ice_sbq_cmd.h    |   0
 drivers/net/{ => intel}/ice/base/ice_sched.c  |   0
 drivers/net/{ => intel}/ice/base/ice_sched.h  |   0
 drivers/net/{ => intel}/ice/base/ice_status.h |   0
 drivers/net/{ => intel}/ice/base/ice_switch.c |   0
 drivers/net/{ => intel}/ice/base/ice_switch.h |   0
 drivers/net/{ => intel}/ice/base/ice_tmatch.h |   0
 drivers/net/{ => intel}/ice/base/ice_type.h   |   0
 drivers/net/{ => intel}/ice/base/ice_vf_mbx.c |   0
 drivers/net/{ => intel}/ice/base/ice_vf_mbx.h |   0
 .../net/{ => intel}/ice/base/ice_vlan_mode.c  |   0
 .../net/{ => intel}/ice/base/ice_vlan_mode.h  |   0
 drivers/net/{ => intel}/ice/base/ice_xlt_kb.c |   0
 drivers/net/{ => intel}/ice/base/ice_xlt_kb.h |   0
 drivers/net/{ => intel}/ice/base/meson.build  |   0
 drivers/net/{ => intel}/ice/ice_acl_filter.c  |   0
 drivers/net/{ => intel}/ice/ice_dcf.c         |   4 +-
 drivers/net/{ => intel}/ice/ice_dcf.h         |   0
 drivers/net/{ => intel}/ice/ice_dcf_ethdev.c  |  21 +-
 drivers/net/{ => intel}/ice/ice_dcf_ethdev.h  |   0
 drivers/net/{ => intel}/ice/ice_dcf_parent.c  |   0
 drivers/net/{ => intel}/ice/ice_dcf_sched.c   |   0
 .../{ => intel}/ice/ice_dcf_vf_representor.c  |   0
 drivers/net/{ => intel}/ice/ice_diagnose.c    |   2 +-
 drivers/net/{ => intel}/ice/ice_ethdev.c      |   2 +-
 drivers/net/{ => intel}/ice/ice_ethdev.h      |   7 +-
 drivers/net/{ => intel}/ice/ice_fdir_filter.c |   0
 .../net/{ => intel}/ice/ice_generic_flow.c    |   0
 .../net/{ => intel}/ice/ice_generic_flow.h    |   0
 drivers/net/{ => intel}/ice/ice_hash.c        |   0
 drivers/net/{ => intel}/ice/ice_logs.h        |   0
 drivers/net/{ => intel}/ice/ice_rxtx.c        | 163 +++----
 drivers/net/{ => intel}/ice/ice_rxtx.h        |  52 +--
 .../net/{ => intel}/ice/ice_rxtx_common_avx.h |   0
 .../net/{ => intel}/ice/ice_rxtx_vec_avx2.c   |  26 +-
 .../net/{ => intel}/ice/ice_rxtx_vec_avx512.c | 153 +------
 drivers/net/intel/ice/ice_rxtx_vec_common.h   | 222 +++++++++
 .../net/{ => intel}/ice/ice_rxtx_vec_sse.c    |  35 +-
 .../net/{ => intel}/ice/ice_switch_filter.c   |   0
 drivers/net/{ => intel}/ice/ice_testpmd.c     |   0
 drivers/net/{ => intel}/ice/ice_tm.c          |   0
 drivers/net/{ => intel}/ice/meson.build       |   2 +-
 drivers/net/{ => intel}/ice/version.map       |   0
 drivers/net/{ => intel}/idpf/idpf_ethdev.c    |   0
 drivers/net/{ => intel}/idpf/idpf_ethdev.h    |   0
 drivers/net/{ => intel}/idpf/idpf_logs.h      |   0
 drivers/net/{ => intel}/idpf/idpf_rxtx.c      |   0
 drivers/net/{ => intel}/idpf/idpf_rxtx.h      |   0
 .../{ => intel}/idpf/idpf_rxtx_vec_common.h   |   0
 drivers/net/{ => intel}/idpf/meson.build      |   0
 drivers/net/{ => intel}/igc/base/README       |   0
 drivers/net/{ => intel}/igc/base/igc_82571.h  |   0
 drivers/net/{ => intel}/igc/base/igc_82575.h  |   0
 drivers/net/{ => intel}/igc/base/igc_api.c    |   0
 drivers/net/{ => intel}/igc/base/igc_api.h    |   0
 drivers/net/{ => intel}/igc/base/igc_base.c   |   0
 drivers/net/{ => intel}/igc/base/igc_base.h   |   0
 .../net/{ => intel}/igc/base/igc_defines.h    |   0
 drivers/net/{ => intel}/igc/base/igc_hw.h     |   0
 drivers/net/{ => intel}/igc/base/igc_i225.c   |   0
 drivers/net/{ => intel}/igc/base/igc_i225.h   |   0
 .../net/{ => intel}/igc/base/igc_ich8lan.h    |   0
 drivers/net/{ => intel}/igc/base/igc_mac.c    |   0
 drivers/net/{ => intel}/igc/base/igc_mac.h    |   0
 drivers/net/{ => intel}/igc/base/igc_manage.c |   0
 drivers/net/{ => intel}/igc/base/igc_manage.h |   0
 drivers/net/{ => intel}/igc/base/igc_nvm.c    |   0
 drivers/net/{ => intel}/igc/base/igc_nvm.h    |   0
 drivers/net/{ => intel}/igc/base/igc_osdep.c  |   0
 drivers/net/{ => intel}/igc/base/igc_osdep.h  |   0
 drivers/net/{ => intel}/igc/base/igc_phy.c    |   0
 drivers/net/{ => intel}/igc/base/igc_phy.h    |   0
 drivers/net/{ => intel}/igc/base/igc_regs.h   |   0
 drivers/net/{ => intel}/igc/base/meson.build  |   0
 drivers/net/{ => intel}/igc/igc_ethdev.c      |   0
 drivers/net/{ => intel}/igc/igc_ethdev.h      |   0
 drivers/net/{ => intel}/igc/igc_filter.c      |   0
 drivers/net/{ => intel}/igc/igc_filter.h      |   0
 drivers/net/{ => intel}/igc/igc_flow.c        |   0
 drivers/net/{ => intel}/igc/igc_flow.h        |   0
 drivers/net/{ => intel}/igc/igc_logs.c        |   0
 drivers/net/{ => intel}/igc/igc_logs.h        |   0
 drivers/net/{ => intel}/igc/igc_txrx.c        |   0
 drivers/net/{ => intel}/igc/igc_txrx.h        |   0
 drivers/net/{ => intel}/igc/meson.build       |   0
 .../net/{ => intel}/ipn3ke/ipn3ke_ethdev.c    |   0
 .../net/{ => intel}/ipn3ke/ipn3ke_ethdev.h    |   0
 drivers/net/{ => intel}/ipn3ke/ipn3ke_flow.c  |   0
 drivers/net/{ => intel}/ipn3ke/ipn3ke_flow.h  |   0
 drivers/net/{ => intel}/ipn3ke/ipn3ke_logs.h  |   0
 .../{ => intel}/ipn3ke/ipn3ke_rawdev_api.h    |   0
 .../{ => intel}/ipn3ke/ipn3ke_representor.c   |   0
 drivers/net/{ => intel}/ipn3ke/ipn3ke_tm.c    |   0
 drivers/net/{ => intel}/ipn3ke/meson.build    |   2 +-
 drivers/net/{ => intel}/ipn3ke/version.map    |   0
 drivers/net/{ => intel}/ixgbe/base/README     |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_82598.c  |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_82598.h  |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_82599.c  |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_82599.h  |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_api.c    |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_api.h    |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_common.c |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_common.h |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_dcb.c    |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_dcb.h    |   0
 .../{ => intel}/ixgbe/base/ixgbe_dcb_82598.c  |   0
 .../{ => intel}/ixgbe/base/ixgbe_dcb_82598.h  |   0
 .../{ => intel}/ixgbe/base/ixgbe_dcb_82599.c  |   0
 .../{ => intel}/ixgbe/base/ixgbe_dcb_82599.h  |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_e610.c   |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_e610.h   |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_hv_vf.c  |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_hv_vf.h  |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_mbx.c    |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_mbx.h    |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_osdep.c  |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_osdep.h  |   2 +-
 .../net/{ => intel}/ixgbe/base/ixgbe_phy.c    |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_phy.h    |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_type.h   |   0
 .../{ => intel}/ixgbe/base/ixgbe_type_e610.h  |   0
 drivers/net/{ => intel}/ixgbe/base/ixgbe_vf.c |   0
 drivers/net/{ => intel}/ixgbe/base/ixgbe_vf.h |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_x540.c   |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_x540.h   |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_x550.c   |   0
 .../net/{ => intel}/ixgbe/base/ixgbe_x550.h   |   0
 .../net/{ => intel}/ixgbe/base/meson.build    |   0
 .../{ => intel}/ixgbe/ixgbe_82599_bypass.c    |   0
 drivers/net/{ => intel}/ixgbe/ixgbe_bypass.c  |   0
 drivers/net/{ => intel}/ixgbe/ixgbe_bypass.h  |   0
 .../net/{ => intel}/ixgbe/ixgbe_bypass_api.h  |   0
 .../{ => intel}/ixgbe/ixgbe_bypass_defines.h  |   0
 drivers/net/{ => intel}/ixgbe/ixgbe_ethdev.c  |   4 +-
 drivers/net/{ => intel}/ixgbe/ixgbe_ethdev.h  |   0
 drivers/net/{ => intel}/ixgbe/ixgbe_fdir.c    |   0
 drivers/net/{ => intel}/ixgbe/ixgbe_flow.c    |   0
 drivers/net/{ => intel}/ixgbe/ixgbe_ipsec.c   |   0
 drivers/net/{ => intel}/ixgbe/ixgbe_ipsec.h   |   0
 drivers/net/{ => intel}/ixgbe/ixgbe_logs.h    |   0
 drivers/net/{ => intel}/ixgbe/ixgbe_pf.c      |   0
 .../ixgbe/ixgbe_recycle_mbufs_vec_common.c    |   6 +-
 drivers/net/{ => intel}/ixgbe/ixgbe_regs.h    |   0
 drivers/net/{ => intel}/ixgbe/ixgbe_rxtx.c    | 139 +++---
 drivers/net/{ => intel}/ixgbe/ixgbe_rxtx.h    |  73 +--
 .../net/intel/ixgbe/ixgbe_rxtx_vec_common.h   | 184 ++++++++
 .../{ => intel}/ixgbe/ixgbe_rxtx_vec_neon.c   |  40 +-
 .../{ => intel}/ixgbe/ixgbe_rxtx_vec_sse.c    |  40 +-
 drivers/net/{ => intel}/ixgbe/ixgbe_testpmd.c |   0
 drivers/net/{ => intel}/ixgbe/ixgbe_tm.c      |   0
 .../{ => intel}/ixgbe/ixgbe_vf_representor.c  |   0
 drivers/net/{ => intel}/ixgbe/meson.build     |   0
 drivers/net/{ => intel}/ixgbe/rte_pmd_ixgbe.c |   0
 drivers/net/{ => intel}/ixgbe/rte_pmd_ixgbe.h |   0
 drivers/net/{ => intel}/ixgbe/version.map     |   0
 drivers/net/ixgbe/ixgbe_rxtx_vec_common.h     | 292 ------------
 drivers/net/meson.build                       |  20 +-
 drivers/raw/ifpga/meson.build                 |   2 -
 usertools/dpdk-rss-flows.py                   |   4 +-
 394 files changed, 1485 insertions(+), 2509 deletions(-)
 delete mode 100644 drivers/net/i40e/i40e_rxtx_vec_common.h
 delete mode 100644 drivers/net/ice/ice_rxtx_vec_common.h
 create mode 100644 drivers/net/intel/common/rx.h
 create mode 100644 drivers/net/intel/common/tx.h
 rename drivers/net/{ => intel}/cpfl/cpfl_actions.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_controlq.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_controlq.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_cpchnl.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_ethdev.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_ethdev.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_flow.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_flow.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_flow_engine_fxp.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_flow_parser.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_flow_parser.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_fxp_rule.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_fxp_rule.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_logs.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_representor.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_representor.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_rules.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_rules.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_rxtx.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_rxtx.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_rxtx_vec_common.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_vchnl.c (100%)
 rename drivers/net/{ => intel}/cpfl/meson.build (100%)
 rename drivers/net/{ => intel}/e1000/base/README (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_80003es2lan.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_80003es2lan.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82540.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82541.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82541.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82542.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82543.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82543.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82571.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82571.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82575.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82575.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_api.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_api.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_base.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_base.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_defines.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_hw.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_i210.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_i210.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_ich8lan.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_ich8lan.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_mac.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_mac.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_manage.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_manage.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_mbx.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_mbx.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_nvm.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_nvm.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_osdep.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_osdep.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_phy.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_phy.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_regs.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_vf.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_vf.h (100%)
 rename drivers/net/{ => intel}/e1000/base/meson.build (100%)
 rename drivers/net/{ => intel}/e1000/e1000_ethdev.h (100%)
 rename drivers/net/{ => intel}/e1000/e1000_logs.c (100%)
 rename drivers/net/{ => intel}/e1000/e1000_logs.h (100%)
 rename drivers/net/{ => intel}/e1000/em_ethdev.c (100%)
 rename drivers/net/{ => intel}/e1000/em_rxtx.c (100%)
 rename drivers/net/{ => intel}/e1000/igb_ethdev.c (100%)
 rename drivers/net/{ => intel}/e1000/igb_flow.c (100%)
 rename drivers/net/{ => intel}/e1000/igb_pf.c (100%)
 rename drivers/net/{ => intel}/e1000/igb_regs.h (100%)
 rename drivers/net/{ => intel}/e1000/igb_rxtx.c (100%)
 rename drivers/net/{ => intel}/e1000/meson.build (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_api.c (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_api.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_common.c (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_common.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_mbx.c (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_mbx.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_osdep.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_pf.c (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_pf.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_tlv.c (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_tlv.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_type.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_vf.c (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_vf.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/meson.build (100%)
 rename drivers/net/{ => intel}/fm10k/fm10k.h (100%)
 rename drivers/net/{ => intel}/fm10k/fm10k_ethdev.c (100%)
 rename drivers/net/{ => intel}/fm10k/fm10k_logs.h (100%)
 rename drivers/net/{ => intel}/fm10k/fm10k_rxtx.c (100%)
 rename drivers/net/{ => intel}/fm10k/fm10k_rxtx_vec.c (100%)
 rename drivers/net/{ => intel}/fm10k/meson.build (100%)
 rename drivers/net/{ => intel}/i40e/base/README (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_adminq.c (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_adminq.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_adminq_cmd.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_alloc.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_common.c (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_dcb.c (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_dcb.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_devids.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_diag.c (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_diag.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_hmc.c (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_hmc.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_lan_hmc.c (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_lan_hmc.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_nvm.c (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_osdep.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_prototype.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_register.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_status.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_type.h (100%)
 rename drivers/net/{ => intel}/i40e/base/meson.build (100%)
 rename drivers/net/{ => intel}/i40e/base/virtchnl.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_ethdev.c (99%)
 rename drivers/net/{ => intel}/i40e/i40e_ethdev.h (99%)
 rename drivers/net/{ => intel}/i40e/i40e_fdir.c (99%)
 rename drivers/net/{ => intel}/i40e/i40e_flow.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_hash.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_hash.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_logs.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_pf.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_pf.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_recycle_mbufs_vec_common.c (97%)
 rename drivers/net/{ => intel}/i40e/i40e_regs.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx.c (95%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx.h (93%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx_common_avx.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx_vec_altivec.c (96%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx_vec_avx2.c (97%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx_vec_avx512.c (88%)
 create mode 100644 drivers/net/intel/i40e/i40e_rxtx_vec_common.h
 rename drivers/net/{ => intel}/i40e/i40e_rxtx_vec_neon.c (97%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx_vec_sse.c (97%)
 rename drivers/net/{ => intel}/i40e/i40e_testpmd.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_tm.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_vf_representor.c (100%)
 rename drivers/net/{ => intel}/i40e/meson.build (100%)
 rename drivers/net/{ => intel}/i40e/rte_pmd_i40e.c (100%)
 rename drivers/net/{ => intel}/i40e/rte_pmd_i40e.h (100%)
 rename drivers/net/{ => intel}/i40e/version.map (100%)
 rename drivers/net/{ => intel}/iavf/iavf.h (99%)
 rename drivers/net/{ => intel}/iavf/iavf_ethdev.c (99%)
 rename drivers/net/{ => intel}/iavf/iavf_fdir.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_fsub.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_generic_flow.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_generic_flow.h (100%)
 rename drivers/net/{ => intel}/iavf/iavf_hash.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_ipsec_crypto.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_ipsec_crypto.h (100%)
 rename drivers/net/{ => intel}/iavf/iavf_ipsec_crypto_capabilities.h (100%)
 rename drivers/net/{ => intel}/iavf/iavf_log.h (100%)
 rename drivers/net/{ => intel}/iavf/iavf_rxtx.c (97%)
 rename drivers/net/{ => intel}/iavf/iavf_rxtx.h (93%)
 rename drivers/net/{ => intel}/iavf/iavf_rxtx_vec_avx2.c (98%)
 rename drivers/net/{ => intel}/iavf/iavf_rxtx_vec_avx512.c (93%)
 rename drivers/net/{ => intel}/iavf/iavf_rxtx_vec_common.h (72%)
 rename drivers/net/{ => intel}/iavf/iavf_rxtx_vec_neon.c (99%)
 rename drivers/net/{ => intel}/iavf/iavf_rxtx_vec_sse.c (97%)
 rename drivers/net/{ => intel}/iavf/iavf_testpmd.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_tm.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_vchnl.c (99%)
 rename drivers/net/{ => intel}/iavf/meson.build (86%)
 rename drivers/net/{ => intel}/iavf/rte_pmd_iavf.h (100%)
 rename drivers/net/{ => intel}/iavf/version.map (100%)
 rename drivers/net/{ => intel}/ice/base/README (100%)
 rename drivers/net/{ => intel}/ice/base/ice_acl.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_acl.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_acl_ctrl.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_adminq_cmd.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_alloc.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_bitops.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_bst_tcam.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_bst_tcam.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_cgu_regs.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_common.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_common.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_controlq.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_controlq.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_dcb.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_dcb.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_ddp.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_ddp.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_defs.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_devids.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_fdir.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_fdir.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_flex_pipe.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_flex_pipe.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_flex_type.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_flg_rd.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_flg_rd.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_flow.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_flow.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_fwlog.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_fwlog.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_hw_autogen.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_imem.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_imem.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_lan_tx_rx.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_metainit.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_metainit.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_mk_grp.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_mk_grp.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_nvm.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_nvm.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_osdep.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_parser.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_parser.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_parser_rt.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_parser_rt.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_parser_util.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_pg_cam.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_pg_cam.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_phy_regs.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_proto_grp.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_proto_grp.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_protocol_type.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_ptp_consts.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_ptp_hw.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_ptp_hw.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_ptype_mk.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_ptype_mk.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_sbq_cmd.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_sched.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_sched.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_status.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_switch.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_switch.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_tmatch.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_type.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_vf_mbx.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_vf_mbx.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_vlan_mode.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_vlan_mode.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_xlt_kb.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_xlt_kb.h (100%)
 rename drivers/net/{ => intel}/ice/base/meson.build (100%)
 rename drivers/net/{ => intel}/ice/ice_acl_filter.c (100%)
 rename drivers/net/{ => intel}/ice/ice_dcf.c (99%)
 rename drivers/net/{ => intel}/ice/ice_dcf.h (100%)
 rename drivers/net/{ => intel}/ice/ice_dcf_ethdev.c (99%)
 rename drivers/net/{ => intel}/ice/ice_dcf_ethdev.h (100%)
 rename drivers/net/{ => intel}/ice/ice_dcf_parent.c (100%)
 rename drivers/net/{ => intel}/ice/ice_dcf_sched.c (100%)
 rename drivers/net/{ => intel}/ice/ice_dcf_vf_representor.c (100%)
 rename drivers/net/{ => intel}/ice/ice_diagnose.c (99%)
 rename drivers/net/{ => intel}/ice/ice_ethdev.c (99%)
 rename drivers/net/{ => intel}/ice/ice_ethdev.h (99%)
 rename drivers/net/{ => intel}/ice/ice_fdir_filter.c (100%)
 rename drivers/net/{ => intel}/ice/ice_generic_flow.c (100%)
 rename drivers/net/{ => intel}/ice/ice_generic_flow.h (100%)
 rename drivers/net/{ => intel}/ice/ice_hash.c (100%)
 rename drivers/net/{ => intel}/ice/ice_logs.h (100%)
 rename drivers/net/{ => intel}/ice/ice_rxtx.c (97%)
 rename drivers/net/{ => intel}/ice/ice_rxtx.h (87%)
 rename drivers/net/{ => intel}/ice/ice_rxtx_common_avx.h (100%)
 rename drivers/net/{ => intel}/ice/ice_rxtx_vec_avx2.c (98%)
 rename drivers/net/{ => intel}/ice/ice_rxtx_vec_avx512.c (88%)
 create mode 100644 drivers/net/intel/ice/ice_rxtx_vec_common.h
 rename drivers/net/{ => intel}/ice/ice_rxtx_vec_sse.c (97%)
 rename drivers/net/{ => intel}/ice/ice_switch_filter.c (100%)
 rename drivers/net/{ => intel}/ice/ice_testpmd.c (100%)
 rename drivers/net/{ => intel}/ice/ice_tm.c (100%)
 rename drivers/net/{ => intel}/ice/meson.build (96%)
 rename drivers/net/{ => intel}/ice/version.map (100%)
 rename drivers/net/{ => intel}/idpf/idpf_ethdev.c (100%)
 rename drivers/net/{ => intel}/idpf/idpf_ethdev.h (100%)
 rename drivers/net/{ => intel}/idpf/idpf_logs.h (100%)
 rename drivers/net/{ => intel}/idpf/idpf_rxtx.c (100%)
 rename drivers/net/{ => intel}/idpf/idpf_rxtx.h (100%)
 rename drivers/net/{ => intel}/idpf/idpf_rxtx_vec_common.h (100%)
 rename drivers/net/{ => intel}/idpf/meson.build (100%)
 rename drivers/net/{ => intel}/igc/base/README (100%)
 rename drivers/net/{ => intel}/igc/base/igc_82571.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_82575.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_api.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_api.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_base.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_base.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_defines.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_hw.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_i225.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_i225.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_ich8lan.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_mac.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_mac.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_manage.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_manage.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_nvm.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_nvm.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_osdep.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_osdep.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_phy.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_phy.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_regs.h (100%)
 rename drivers/net/{ => intel}/igc/base/meson.build (100%)
 rename drivers/net/{ => intel}/igc/igc_ethdev.c (100%)
 rename drivers/net/{ => intel}/igc/igc_ethdev.h (100%)
 rename drivers/net/{ => intel}/igc/igc_filter.c (100%)
 rename drivers/net/{ => intel}/igc/igc_filter.h (100%)
 rename drivers/net/{ => intel}/igc/igc_flow.c (100%)
 rename drivers/net/{ => intel}/igc/igc_flow.h (100%)
 rename drivers/net/{ => intel}/igc/igc_logs.c (100%)
 rename drivers/net/{ => intel}/igc/igc_logs.h (100%)
 rename drivers/net/{ => intel}/igc/igc_txrx.c (100%)
 rename drivers/net/{ => intel}/igc/igc_txrx.h (100%)
 rename drivers/net/{ => intel}/igc/meson.build (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_ethdev.c (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_ethdev.h (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_flow.c (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_flow.h (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_logs.h (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_rawdev_api.h (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_representor.c (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_tm.c (100%)
 rename drivers/net/{ => intel}/ipn3ke/meson.build (91%)
 rename drivers/net/{ => intel}/ipn3ke/version.map (100%)
 rename drivers/net/{ => intel}/ixgbe/base/README (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_82598.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_82598.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_82599.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_82599.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_api.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_api.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_common.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_common.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb_82598.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb_82598.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb_82599.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb_82599.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_e610.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_e610.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_hv_vf.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_hv_vf.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_mbx.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_mbx.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_osdep.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_osdep.h (98%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_phy.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_phy.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_type.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_type_e610.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_vf.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_vf.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_x540.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_x540.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_x550.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_x550.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/meson.build (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_82599_bypass.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_bypass.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_bypass.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_bypass_api.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_bypass_defines.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_ethdev.c (99%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_ethdev.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_fdir.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_flow.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_ipsec.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_ipsec.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_logs.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_pf.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_recycle_mbufs_vec_common.c (97%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_regs.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_rxtx.c (98%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_rxtx.h (75%)
 create mode 100644 drivers/net/intel/ixgbe/ixgbe_rxtx_vec_common.h
 rename drivers/net/{ => intel}/ixgbe/ixgbe_rxtx_vec_neon.c (95%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_rxtx_vec_sse.c (96%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_testpmd.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_tm.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_vf_representor.c (100%)
 rename drivers/net/{ => intel}/ixgbe/meson.build (100%)
 rename drivers/net/{ => intel}/ixgbe/rte_pmd_ixgbe.c (100%)
 rename drivers/net/{ => intel}/ixgbe/rte_pmd_ixgbe.h (100%)
 rename drivers/net/{ => intel}/ixgbe/version.map (100%)
 delete mode 100644 drivers/net/ixgbe/ixgbe_rxtx_vec_common.h

--
2.43.0

#141 lore raw

PATCH v5 1/25 net: move intel drivers to intel subdirectory

Consolidate all Intel HW NIC drivers into a driver/net/intel This matches the layout used for drivers in the kernel, and potentially enabling easier sharing among drivers.

---
 MAINTAINERS                                   | 20 +++++++++----------
 devtools/check-git-log.sh                     |  4 ++++
 doc/api/doxy-api.conf.in                      |  6 +++---
 drivers/meson.build                           |  6 +++++-
 drivers/net/{ => intel}/cpfl/cpfl_actions.h   |  0
 drivers/net/{ => intel}/cpfl/cpfl_controlq.c  |  0
 drivers/net/{ => intel}/cpfl/cpfl_controlq.h  |  0
 drivers/net/{ => intel}/cpfl/cpfl_cpchnl.h    |  0
 drivers/net/{ => intel}/cpfl/cpfl_ethdev.c    |  0
 drivers/net/{ => intel}/cpfl/cpfl_ethdev.h    |  0
 drivers/net/{ => intel}/cpfl/cpfl_flow.c      |  0
 drivers/net/{ => intel}/cpfl/cpfl_flow.h      |  0
 .../{ => intel}/cpfl/cpfl_flow_engine_fxp.c   |  0
 .../net/{ => intel}/cpfl/cpfl_flow_parser.c   |  0
 .../net/{ => intel}/cpfl/cpfl_flow_parser.h   |  0
 drivers/net/{ => intel}/cpfl/cpfl_fxp_rule.c  |  0
 drivers/net/{ => intel}/cpfl/cpfl_fxp_rule.h  |  0
 drivers/net/{ => intel}/cpfl/cpfl_logs.h      |  0
 .../net/{ => intel}/cpfl/cpfl_representor.c   |  0
 .../net/{ => intel}/cpfl/cpfl_representor.h   |  0
 drivers/net/{ => intel}/cpfl/cpfl_rules.c     |  0
 drivers/net/{ => intel}/cpfl/cpfl_rules.h     |  0
 drivers/net/{ => intel}/cpfl/cpfl_rxtx.c      |  0
 drivers/net/{ => intel}/cpfl/cpfl_rxtx.h      |  0
 .../{ => intel}/cpfl/cpfl_rxtx_vec_common.h   |  0
 drivers/net/{ => intel}/cpfl/cpfl_vchnl.c     |  0
 drivers/net/{ => intel}/cpfl/meson.build      |  0
 drivers/net/{ => intel}/e1000/base/README     |  0
 .../e1000/base/e1000_80003es2lan.c            |  0
 .../e1000/base/e1000_80003es2lan.h            |  0
 .../net/{ => intel}/e1000/base/e1000_82540.c  |  0
 .../net/{ => intel}/e1000/base/e1000_82541.c  |  0
 .../net/{ => intel}/e1000/base/e1000_82541.h  |  0
 .../net/{ => intel}/e1000/base/e1000_82542.c  |  0
 .../net/{ => intel}/e1000/base/e1000_82543.c  |  0
 .../net/{ => intel}/e1000/base/e1000_82543.h  |  0
 .../net/{ => intel}/e1000/base/e1000_82571.c  |  0
 .../net/{ => intel}/e1000/base/e1000_82571.h  |  0
 .../net/{ => intel}/e1000/base/e1000_82575.c  |  0
 .../net/{ => intel}/e1000/base/e1000_82575.h  |  0
 .../net/{ => intel}/e1000/base/e1000_api.c    |  0
 .../net/{ => intel}/e1000/base/e1000_api.h    |  0
 .../net/{ => intel}/e1000/base/e1000_base.c   |  0
 .../net/{ => intel}/e1000/base/e1000_base.h   |  0
 .../{ => intel}/e1000/base/e1000_defines.h    |  0
 drivers/net/{ => intel}/e1000/base/e1000_hw.h |  0
 .../net/{ => intel}/e1000/base/e1000_i210.c   |  0
 .../net/{ => intel}/e1000/base/e1000_i210.h   |  0
 .../{ => intel}/e1000/base/e1000_ich8lan.c    |  0
 .../{ => intel}/e1000/base/e1000_ich8lan.h    |  0
 .../net/{ => intel}/e1000/base/e1000_mac.c    |  0
 .../net/{ => intel}/e1000/base/e1000_mac.h    |  0
 .../net/{ => intel}/e1000/base/e1000_manage.c |  0
 .../net/{ => intel}/e1000/base/e1000_manage.h |  0
 .../net/{ => intel}/e1000/base/e1000_mbx.c    |  0
 .../net/{ => intel}/e1000/base/e1000_mbx.h    |  0
 .../net/{ => intel}/e1000/base/e1000_nvm.c    |  0
 .../net/{ => intel}/e1000/base/e1000_nvm.h    |  0
 .../net/{ => intel}/e1000/base/e1000_osdep.c  |  0
 .../net/{ => intel}/e1000/base/e1000_osdep.h  |  0
 .../net/{ => intel}/e1000/base/e1000_phy.c    |  0
 .../net/{ => intel}/e1000/base/e1000_phy.h    |  0
 .../net/{ => intel}/e1000/base/e1000_regs.h   |  0
 drivers/net/{ => intel}/e1000/base/e1000_vf.c |  0
 drivers/net/{ => intel}/e1000/base/e1000_vf.h |  0
 .../net/{ => intel}/e1000/base/meson.build    |  0
 drivers/net/{ => intel}/e1000/e1000_ethdev.h  |  0
 drivers/net/{ => intel}/e1000/e1000_logs.c    |  0
 drivers/net/{ => intel}/e1000/e1000_logs.h    |  0
 drivers/net/{ => intel}/e1000/em_ethdev.c     |  0
 drivers/net/{ => intel}/e1000/em_rxtx.c       |  0
 drivers/net/{ => intel}/e1000/igb_ethdev.c    |  0
 drivers/net/{ => intel}/e1000/igb_flow.c      |  0
 drivers/net/{ => intel}/e1000/igb_pf.c        |  0
 drivers/net/{ => intel}/e1000/igb_regs.h      |  0
 drivers/net/{ => intel}/e1000/igb_rxtx.c      |  0
 drivers/net/{ => intel}/e1000/meson.build     |  0
 .../net/{ => intel}/fm10k/base/fm10k_api.c    |  0
 .../net/{ => intel}/fm10k/base/fm10k_api.h    |  0
 .../net/{ => intel}/fm10k/base/fm10k_common.c |  0
 .../net/{ => intel}/fm10k/base/fm10k_common.h |  0
 .../net/{ => intel}/fm10k/base/fm10k_mbx.c    |  0
 .../net/{ => intel}/fm10k/base/fm10k_mbx.h    |  0
 .../net/{ => intel}/fm10k/base/fm10k_osdep.h  |  0
 drivers/net/{ => intel}/fm10k/base/fm10k_pf.c |  0
 drivers/net/{ => intel}/fm10k/base/fm10k_pf.h |  0
 .../net/{ => intel}/fm10k/base/fm10k_tlv.c    |  0
 .../net/{ => intel}/fm10k/base/fm10k_tlv.h    |  0
 .../net/{ => intel}/fm10k/base/fm10k_type.h   |  0
 drivers/net/{ => intel}/fm10k/base/fm10k_vf.c |  0
 drivers/net/{ => intel}/fm10k/base/fm10k_vf.h |  0
 .../net/{ => intel}/fm10k/base/meson.build    |  0
 drivers/net/{ => intel}/fm10k/fm10k.h         |  0
 drivers/net/{ => intel}/fm10k/fm10k_ethdev.c  |  0
 drivers/net/{ => intel}/fm10k/fm10k_logs.h    |  0
 drivers/net/{ => intel}/fm10k/fm10k_rxtx.c    |  0
 .../net/{ => intel}/fm10k/fm10k_rxtx_vec.c    |  0
 drivers/net/{ => intel}/fm10k/meson.build     |  0
 drivers/net/{ => intel}/i40e/base/README      |  0
 .../net/{ => intel}/i40e/base/i40e_adminq.c   |  0
 .../net/{ => intel}/i40e/base/i40e_adminq.h   |  0
 .../{ => intel}/i40e/base/i40e_adminq_cmd.h   |  0
 .../net/{ => intel}/i40e/base/i40e_alloc.h    |  0
 .../net/{ => intel}/i40e/base/i40e_common.c   |  0
 drivers/net/{ => intel}/i40e/base/i40e_dcb.c  |  0
 drivers/net/{ => intel}/i40e/base/i40e_dcb.h  |  0
 .../net/{ => intel}/i40e/base/i40e_devids.h   |  0
 drivers/net/{ => intel}/i40e/base/i40e_diag.c |  0
 drivers/net/{ => intel}/i40e/base/i40e_diag.h |  0
 drivers/net/{ => intel}/i40e/base/i40e_hmc.c  |  0
 drivers/net/{ => intel}/i40e/base/i40e_hmc.h  |  0
 .../net/{ => intel}/i40e/base/i40e_lan_hmc.c  |  0
 .../net/{ => intel}/i40e/base/i40e_lan_hmc.h  |  0
 drivers/net/{ => intel}/i40e/base/i40e_nvm.c  |  0
 .../net/{ => intel}/i40e/base/i40e_osdep.h    |  0
 .../{ => intel}/i40e/base/i40e_prototype.h    |  0
 .../net/{ => intel}/i40e/base/i40e_register.h |  0
 .../net/{ => intel}/i40e/base/i40e_status.h   |  0
 drivers/net/{ => intel}/i40e/base/i40e_type.h |  0
 drivers/net/{ => intel}/i40e/base/meson.build |  0
 drivers/net/{ => intel}/i40e/base/virtchnl.h  |  0
 drivers/net/{ => intel}/i40e/i40e_ethdev.c    |  0
 drivers/net/{ => intel}/i40e/i40e_ethdev.h    |  0
 drivers/net/{ => intel}/i40e/i40e_fdir.c      |  0
 drivers/net/{ => intel}/i40e/i40e_flow.c      |  0
 drivers/net/{ => intel}/i40e/i40e_hash.c      |  0
 drivers/net/{ => intel}/i40e/i40e_hash.h      |  0
 drivers/net/{ => intel}/i40e/i40e_logs.h      |  0
 drivers/net/{ => intel}/i40e/i40e_pf.c        |  0
 drivers/net/{ => intel}/i40e/i40e_pf.h        |  0
 .../i40e/i40e_recycle_mbufs_vec_common.c      |  0
 drivers/net/{ => intel}/i40e/i40e_regs.h      |  0
 drivers/net/{ => intel}/i40e/i40e_rxtx.c      |  0
 drivers/net/{ => intel}/i40e/i40e_rxtx.h      |  0
 .../{ => intel}/i40e/i40e_rxtx_common_avx.h   |  0
 .../{ => intel}/i40e/i40e_rxtx_vec_altivec.c  |  0
 .../net/{ => intel}/i40e/i40e_rxtx_vec_avx2.c |  0
 .../{ => intel}/i40e/i40e_rxtx_vec_avx512.c   |  0
 .../{ => intel}/i40e/i40e_rxtx_vec_common.h   |  0
 .../net/{ => intel}/i40e/i40e_rxtx_vec_neon.c |  0
 .../net/{ => intel}/i40e/i40e_rxtx_vec_sse.c  |  0
 drivers/net/{ => intel}/i40e/i40e_testpmd.c   |  0
 drivers/net/{ => intel}/i40e/i40e_tm.c        |  0
 .../{ => intel}/i40e/i40e_vf_representor.c    |  0
 drivers/net/{ => intel}/i40e/meson.build      |  0
 drivers/net/{ => intel}/i40e/rte_pmd_i40e.c   |  0
 drivers/net/{ => intel}/i40e/rte_pmd_i40e.h   |  0
 drivers/net/{ => intel}/i40e/version.map      |  0
 drivers/net/{ => intel}/iavf/iavf.h           |  0
 drivers/net/{ => intel}/iavf/iavf_ethdev.c    |  0
 drivers/net/{ => intel}/iavf/iavf_fdir.c      |  0
 drivers/net/{ => intel}/iavf/iavf_fsub.c      |  0
 .../net/{ => intel}/iavf/iavf_generic_flow.c  |  0
 .../net/{ => intel}/iavf/iavf_generic_flow.h  |  0
 drivers/net/{ => intel}/iavf/iavf_hash.c      |  0
 .../net/{ => intel}/iavf/iavf_ipsec_crypto.c  |  0
 .../net/{ => intel}/iavf/iavf_ipsec_crypto.h  |  0
 .../iavf/iavf_ipsec_crypto_capabilities.h     |  0
 drivers/net/{ => intel}/iavf/iavf_log.h       |  0
 drivers/net/{ => intel}/iavf/iavf_rxtx.c      |  0
 drivers/net/{ => intel}/iavf/iavf_rxtx.h      |  0
 .../net/{ => intel}/iavf/iavf_rxtx_vec_avx2.c |  0
 .../{ => intel}/iavf/iavf_rxtx_vec_avx512.c   |  0
 .../{ => intel}/iavf/iavf_rxtx_vec_common.h   |  0
 .../net/{ => intel}/iavf/iavf_rxtx_vec_neon.c |  0
 .../net/{ => intel}/iavf/iavf_rxtx_vec_sse.c  |  0
 drivers/net/{ => intel}/iavf/iavf_testpmd.c   |  0
 drivers/net/{ => intel}/iavf/iavf_tm.c        |  0
 drivers/net/{ => intel}/iavf/iavf_vchnl.c     |  0
 drivers/net/{ => intel}/iavf/meson.build      |  7 ++-----
 drivers/net/{ => intel}/iavf/rte_pmd_iavf.h   |  0
 drivers/net/{ => intel}/iavf/version.map      |  0
 drivers/net/{ => intel}/ice/base/README       |  0
 drivers/net/{ => intel}/ice/base/ice_acl.c    |  0
 drivers/net/{ => intel}/ice/base/ice_acl.h    |  0
 .../net/{ => intel}/ice/base/ice_acl_ctrl.c   |  0
 .../net/{ => intel}/ice/base/ice_adminq_cmd.h |  0
 drivers/net/{ => intel}/ice/base/ice_alloc.h  |  0
 drivers/net/{ => intel}/ice/base/ice_bitops.h |  0
 .../net/{ => intel}/ice/base/ice_bst_tcam.c   |  0
 .../net/{ => intel}/ice/base/ice_bst_tcam.h   |  0
 .../net/{ => intel}/ice/base/ice_cgu_regs.h   |  0
 drivers/net/{ => intel}/ice/base/ice_common.c |  0
 drivers/net/{ => intel}/ice/base/ice_common.h |  0
 .../net/{ => intel}/ice/base/ice_controlq.c   |  0
 .../net/{ => intel}/ice/base/ice_controlq.h   |  0
 drivers/net/{ => intel}/ice/base/ice_dcb.c    |  0
 drivers/net/{ => intel}/ice/base/ice_dcb.h    |  0
 drivers/net/{ => intel}/ice/base/ice_ddp.c    |  0
 drivers/net/{ => intel}/ice/base/ice_ddp.h    |  0
 drivers/net/{ => intel}/ice/base/ice_defs.h   |  0
 drivers/net/{ => intel}/ice/base/ice_devids.h |  0
 drivers/net/{ => intel}/ice/base/ice_fdir.c   |  0
 drivers/net/{ => intel}/ice/base/ice_fdir.h   |  0
 .../net/{ => intel}/ice/base/ice_flex_pipe.c  |  0
 .../net/{ => intel}/ice/base/ice_flex_pipe.h  |  0
 .../net/{ => intel}/ice/base/ice_flex_type.h  |  0
 drivers/net/{ => intel}/ice/base/ice_flg_rd.c |  0
 drivers/net/{ => intel}/ice/base/ice_flg_rd.h |  0
 drivers/net/{ => intel}/ice/base/ice_flow.c   |  0
 drivers/net/{ => intel}/ice/base/ice_flow.h   |  0
 drivers/net/{ => intel}/ice/base/ice_fwlog.c  |  0
 drivers/net/{ => intel}/ice/base/ice_fwlog.h  |  0
 .../net/{ => intel}/ice/base/ice_hw_autogen.h |  0
 drivers/net/{ => intel}/ice/base/ice_imem.c   |  0
 drivers/net/{ => intel}/ice/base/ice_imem.h   |  0
 .../net/{ => intel}/ice/base/ice_lan_tx_rx.h  |  0
 .../net/{ => intel}/ice/base/ice_metainit.c   |  0
 .../net/{ => intel}/ice/base/ice_metainit.h   |  0
 drivers/net/{ => intel}/ice/base/ice_mk_grp.c |  0
 drivers/net/{ => intel}/ice/base/ice_mk_grp.h |  0
 drivers/net/{ => intel}/ice/base/ice_nvm.c    |  0
 drivers/net/{ => intel}/ice/base/ice_nvm.h    |  0
 drivers/net/{ => intel}/ice/base/ice_osdep.h  |  0
 drivers/net/{ => intel}/ice/base/ice_parser.c |  0
 drivers/net/{ => intel}/ice/base/ice_parser.h |  0
 .../net/{ => intel}/ice/base/ice_parser_rt.c  |  0
 .../net/{ => intel}/ice/base/ice_parser_rt.h  |  0
 .../{ => intel}/ice/base/ice_parser_util.h    |  0
 drivers/net/{ => intel}/ice/base/ice_pg_cam.c |  0
 drivers/net/{ => intel}/ice/base/ice_pg_cam.h |  0
 .../net/{ => intel}/ice/base/ice_phy_regs.h   |  0
 .../net/{ => intel}/ice/base/ice_proto_grp.c  |  0
 .../net/{ => intel}/ice/base/ice_proto_grp.h  |  0
 .../{ => intel}/ice/base/ice_protocol_type.h  |  0
 .../net/{ => intel}/ice/base/ice_ptp_consts.h |  0
 drivers/net/{ => intel}/ice/base/ice_ptp_hw.c |  0
 drivers/net/{ => intel}/ice/base/ice_ptp_hw.h |  0
 .../net/{ => intel}/ice/base/ice_ptype_mk.c   |  0
 .../net/{ => intel}/ice/base/ice_ptype_mk.h   |  0
 .../net/{ => intel}/ice/base/ice_sbq_cmd.h    |  0
 drivers/net/{ => intel}/ice/base/ice_sched.c  |  0
 drivers/net/{ => intel}/ice/base/ice_sched.h  |  0
 drivers/net/{ => intel}/ice/base/ice_status.h |  0
 drivers/net/{ => intel}/ice/base/ice_switch.c |  0
 drivers/net/{ => intel}/ice/base/ice_switch.h |  0
 drivers/net/{ => intel}/ice/base/ice_tmatch.h |  0
 drivers/net/{ => intel}/ice/base/ice_type.h   |  0
 drivers/net/{ => intel}/ice/base/ice_vf_mbx.c |  0
 drivers/net/{ => intel}/ice/base/ice_vf_mbx.h |  0
 .../net/{ => intel}/ice/base/ice_vlan_mode.c  |  0
 .../net/{ => intel}/ice/base/ice_vlan_mode.h  |  0
 drivers/net/{ => intel}/ice/base/ice_xlt_kb.c |  0
 drivers/net/{ => intel}/ice/base/ice_xlt_kb.h |  0
 drivers/net/{ => intel}/ice/base/meson.build  |  0
 drivers/net/{ => intel}/ice/ice_acl_filter.c  |  0
 drivers/net/{ => intel}/ice/ice_dcf.c         |  0
 drivers/net/{ => intel}/ice/ice_dcf.h         |  0
 drivers/net/{ => intel}/ice/ice_dcf_ethdev.c  |  0
 drivers/net/{ => intel}/ice/ice_dcf_ethdev.h  |  0
 drivers/net/{ => intel}/ice/ice_dcf_parent.c  |  0
 drivers/net/{ => intel}/ice/ice_dcf_sched.c   |  0
 .../{ => intel}/ice/ice_dcf_vf_representor.c  |  0
 drivers/net/{ => intel}/ice/ice_diagnose.c    |  0
 drivers/net/{ => intel}/ice/ice_ethdev.c      |  0
 drivers/net/{ => intel}/ice/ice_ethdev.h      |  0
 drivers/net/{ => intel}/ice/ice_fdir_filter.c |  0
 .../net/{ => intel}/ice/ice_generic_flow.c    |  0
 .../net/{ => intel}/ice/ice_generic_flow.h    |  0
 drivers/net/{ => intel}/ice/ice_hash.c        |  0
 drivers/net/{ => intel}/ice/ice_logs.h        |  0
 drivers/net/{ => intel}/ice/ice_rxtx.c        |  0
 drivers/net/{ => intel}/ice/ice_rxtx.h        |  0
 .../net/{ => intel}/ice/ice_rxtx_common_avx.h |  0
 .../net/{ => intel}/ice/ice_rxtx_vec_avx2.c   |  0
 .../net/{ => intel}/ice/ice_rxtx_vec_avx512.c |  0
 .../net/{ => intel}/ice/ice_rxtx_vec_common.h |  0
 .../net/{ => intel}/ice/ice_rxtx_vec_sse.c    |  0
 .../net/{ => intel}/ice/ice_switch_filter.c   |  0
 drivers/net/{ => intel}/ice/ice_testpmd.c     |  0
 drivers/net/{ => intel}/ice/ice_tm.c          |  0
 drivers/net/{ => intel}/ice/meson.build       |  2 +-
 drivers/net/{ => intel}/ice/version.map       |  0
 drivers/net/{ => intel}/idpf/idpf_ethdev.c    |  0
 drivers/net/{ => intel}/idpf/idpf_ethdev.h    |  0
 drivers/net/{ => intel}/idpf/idpf_logs.h      |  0
 drivers/net/{ => intel}/idpf/idpf_rxtx.c      |  0
 drivers/net/{ => intel}/idpf/idpf_rxtx.h      |  0
 .../{ => intel}/idpf/idpf_rxtx_vec_common.h   |  0
 drivers/net/{ => intel}/idpf/meson.build      |  0
 drivers/net/{ => intel}/igc/base/README       |  0
 drivers/net/{ => intel}/igc/base/igc_82571.h  |  0
 drivers/net/{ => intel}/igc/base/igc_82575.h  |  0
 drivers/net/{ => intel}/igc/base/igc_api.c    |  0
 drivers/net/{ => intel}/igc/base/igc_api.h    |  0
 drivers/net/{ => intel}/igc/base/igc_base.c   |  0
 drivers/net/{ => intel}/igc/base/igc_base.h   |  0
 .../net/{ => intel}/igc/base/igc_defines.h    |  0
 drivers/net/{ => intel}/igc/base/igc_hw.h     |  0
 drivers/net/{ => intel}/igc/base/igc_i225.c   |  0
 drivers/net/{ => intel}/igc/base/igc_i225.h   |  0
 .../net/{ => intel}/igc/base/igc_ich8lan.h    |  0
 drivers/net/{ => intel}/igc/base/igc_mac.c    |  0
 drivers/net/{ => intel}/igc/base/igc_mac.h    |  0
 drivers/net/{ => intel}/igc/base/igc_manage.c |  0
 drivers/net/{ => intel}/igc/base/igc_manage.h |  0
 drivers/net/{ => intel}/igc/base/igc_nvm.c    |  0
 drivers/net/{ => intel}/igc/base/igc_nvm.h    |  0
 drivers/net/{ => intel}/igc/base/igc_osdep.c  |  0
 drivers/net/{ => intel}/igc/base/igc_osdep.h  |  0
 drivers/net/{ => intel}/igc/base/igc_phy.c    |  0
 drivers/net/{ => intel}/igc/base/igc_phy.h    |  0
 drivers/net/{ => intel}/igc/base/igc_regs.h   |  0
 drivers/net/{ => intel}/igc/base/meson.build  |  0
 drivers/net/{ => intel}/igc/igc_ethdev.c      |  0
 drivers/net/{ => intel}/igc/igc_ethdev.h      |  0
 drivers/net/{ => intel}/igc/igc_filter.c      |  0
 drivers/net/{ => intel}/igc/igc_filter.h      |  0
 drivers/net/{ => intel}/igc/igc_flow.c        |  0
 drivers/net/{ => intel}/igc/igc_flow.h        |  0
 drivers/net/{ => intel}/igc/igc_logs.c        |  0
 drivers/net/{ => intel}/igc/igc_logs.h        |  0
 drivers/net/{ => intel}/igc/igc_txrx.c        |  0
 drivers/net/{ => intel}/igc/igc_txrx.h        |  0
 drivers/net/{ => intel}/igc/meson.build       |  0
 .../net/{ => intel}/ipn3ke/ipn3ke_ethdev.c    |  0
 .../net/{ => intel}/ipn3ke/ipn3ke_ethdev.h    |  0
 drivers/net/{ => intel}/ipn3ke/ipn3ke_flow.c  |  0
 drivers/net/{ => intel}/ipn3ke/ipn3ke_flow.h  |  0
 drivers/net/{ => intel}/ipn3ke/ipn3ke_logs.h  |  0
 .../{ => intel}/ipn3ke/ipn3ke_rawdev_api.h    |  0
 .../{ => intel}/ipn3ke/ipn3ke_representor.c   |  0
 drivers/net/{ => intel}/ipn3ke/ipn3ke_tm.c    |  0
 drivers/net/{ => intel}/ipn3ke/meson.build    |  2 +-
 drivers/net/{ => intel}/ipn3ke/version.map    |  0
 drivers/net/{ => intel}/ixgbe/base/README     |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_82598.c  |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_82598.h  |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_82599.c  |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_82599.h  |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_api.c    |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_api.h    |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_common.c |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_common.h |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_dcb.c    |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_dcb.h    |  0
 .../{ => intel}/ixgbe/base/ixgbe_dcb_82598.c  |  0
 .../{ => intel}/ixgbe/base/ixgbe_dcb_82598.h  |  0
 .../{ => intel}/ixgbe/base/ixgbe_dcb_82599.c  |  0
 .../{ => intel}/ixgbe/base/ixgbe_dcb_82599.h  |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_e610.c   |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_e610.h   |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_hv_vf.c  |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_hv_vf.h  |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_mbx.c    |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_mbx.h    |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_osdep.c  |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_osdep.h  |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_phy.c    |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_phy.h    |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_type.h   |  0
 .../{ => intel}/ixgbe/base/ixgbe_type_e610.h  |  0
 drivers/net/{ => intel}/ixgbe/base/ixgbe_vf.c |  0
 drivers/net/{ => intel}/ixgbe/base/ixgbe_vf.h |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_x540.c   |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_x540.h   |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_x550.c   |  0
 .../net/{ => intel}/ixgbe/base/ixgbe_x550.h   |  0
 .../net/{ => intel}/ixgbe/base/meson.build    |  0
 .../{ => intel}/ixgbe/ixgbe_82599_bypass.c    |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_bypass.c  |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_bypass.h  |  0
 .../net/{ => intel}/ixgbe/ixgbe_bypass_api.h  |  0
 .../{ => intel}/ixgbe/ixgbe_bypass_defines.h  |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_ethdev.c  |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_ethdev.h  |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_fdir.c    |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_flow.c    |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_ipsec.c   |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_ipsec.h   |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_logs.h    |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_pf.c      |  0
 .../ixgbe/ixgbe_recycle_mbufs_vec_common.c    |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_regs.h    |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_rxtx.c    |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_rxtx.h    |  0
 .../{ => intel}/ixgbe/ixgbe_rxtx_vec_common.h |  0
 .../{ => intel}/ixgbe/ixgbe_rxtx_vec_neon.c   |  0
 .../{ => intel}/ixgbe/ixgbe_rxtx_vec_sse.c    |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_testpmd.c |  0
 drivers/net/{ => intel}/ixgbe/ixgbe_tm.c      |  0
 .../{ => intel}/ixgbe/ixgbe_vf_representor.c  |  0
 drivers/net/{ => intel}/ixgbe/meson.build     |  0
 drivers/net/{ => intel}/ixgbe/rte_pmd_ixgbe.c |  0
 drivers/net/{ => intel}/ixgbe/rte_pmd_ixgbe.h |  0
 drivers/net/{ => intel}/ixgbe/version.map     |  0
 drivers/net/meson.build                       | 20 +++++++++----------
 drivers/raw/ifpga/meson.build                 |  2 --
 usertools/dpdk-rss-flows.py                   |  4 ++--
 389 files changed, 38 insertions(+), 35 deletions(-)
 rename drivers/net/{ => intel}/cpfl/cpfl_actions.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_controlq.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_controlq.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_cpchnl.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_ethdev.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_ethdev.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_flow.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_flow.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_flow_engine_fxp.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_flow_parser.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_flow_parser.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_fxp_rule.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_fxp_rule.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_logs.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_representor.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_representor.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_rules.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_rules.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_rxtx.c (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_rxtx.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_rxtx_vec_common.h (100%)
 rename drivers/net/{ => intel}/cpfl/cpfl_vchnl.c (100%)
 rename drivers/net/{ => intel}/cpfl/meson.build (100%)
 rename drivers/net/{ => intel}/e1000/base/README (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_80003es2lan.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_80003es2lan.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82540.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82541.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82541.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82542.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82543.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82543.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82571.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82571.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82575.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_82575.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_api.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_api.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_base.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_base.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_defines.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_hw.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_i210.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_i210.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_ich8lan.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_ich8lan.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_mac.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_mac.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_manage.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_manage.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_mbx.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_mbx.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_nvm.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_nvm.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_osdep.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_osdep.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_phy.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_phy.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_regs.h (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_vf.c (100%)
 rename drivers/net/{ => intel}/e1000/base/e1000_vf.h (100%)
 rename drivers/net/{ => intel}/e1000/base/meson.build (100%)
 rename drivers/net/{ => intel}/e1000/e1000_ethdev.h (100%)
 rename drivers/net/{ => intel}/e1000/e1000_logs.c (100%)
 rename drivers/net/{ => intel}/e1000/e1000_logs.h (100%)
 rename drivers/net/{ => intel}/e1000/em_ethdev.c (100%)
 rename drivers/net/{ => intel}/e1000/em_rxtx.c (100%)
 rename drivers/net/{ => intel}/e1000/igb_ethdev.c (100%)
 rename drivers/net/{ => intel}/e1000/igb_flow.c (100%)
 rename drivers/net/{ => intel}/e1000/igb_pf.c (100%)
 rename drivers/net/{ => intel}/e1000/igb_regs.h (100%)
 rename drivers/net/{ => intel}/e1000/igb_rxtx.c (100%)
 rename drivers/net/{ => intel}/e1000/meson.build (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_api.c (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_api.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_common.c (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_common.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_mbx.c (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_mbx.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_osdep.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_pf.c (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_pf.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_tlv.c (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_tlv.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_type.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_vf.c (100%)
 rename drivers/net/{ => intel}/fm10k/base/fm10k_vf.h (100%)
 rename drivers/net/{ => intel}/fm10k/base/meson.build (100%)
 rename drivers/net/{ => intel}/fm10k/fm10k.h (100%)
 rename drivers/net/{ => intel}/fm10k/fm10k_ethdev.c (100%)
 rename drivers/net/{ => intel}/fm10k/fm10k_logs.h (100%)
 rename drivers/net/{ => intel}/fm10k/fm10k_rxtx.c (100%)
 rename drivers/net/{ => intel}/fm10k/fm10k_rxtx_vec.c (100%)
 rename drivers/net/{ => intel}/fm10k/meson.build (100%)
 rename drivers/net/{ => intel}/i40e/base/README (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_adminq.c (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_adminq.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_adminq_cmd.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_alloc.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_common.c (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_dcb.c (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_dcb.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_devids.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_diag.c (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_diag.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_hmc.c (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_hmc.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_lan_hmc.c (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_lan_hmc.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_nvm.c (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_osdep.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_prototype.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_register.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_status.h (100%)
 rename drivers/net/{ => intel}/i40e/base/i40e_type.h (100%)
 rename drivers/net/{ => intel}/i40e/base/meson.build (100%)
 rename drivers/net/{ => intel}/i40e/base/virtchnl.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_ethdev.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_ethdev.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_fdir.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_flow.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_hash.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_hash.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_logs.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_pf.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_pf.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_recycle_mbufs_vec_common.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_regs.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx_common_avx.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx_vec_altivec.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx_vec_avx2.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx_vec_avx512.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx_vec_common.h (100%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx_vec_neon.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_rxtx_vec_sse.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_testpmd.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_tm.c (100%)
 rename drivers/net/{ => intel}/i40e/i40e_vf_representor.c (100%)
 rename drivers/net/{ => intel}/i40e/meson.build (100%)
 rename drivers/net/{ => intel}/i40e/rte_pmd_i40e.c (100%)
 rename drivers/net/{ => intel}/i40e/rte_pmd_i40e.h (100%)
 rename drivers/net/{ => intel}/i40e/version.map (100%)
 rename drivers/net/{ => intel}/iavf/iavf.h (100%)
 rename drivers/net/{ => intel}/iavf/iavf_ethdev.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_fdir.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_fsub.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_generic_flow.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_generic_flow.h (100%)
 rename drivers/net/{ => intel}/iavf/iavf_hash.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_ipsec_crypto.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_ipsec_crypto.h (100%)
 rename drivers/net/{ => intel}/iavf/iavf_ipsec_crypto_capabilities.h (100%)
 rename drivers/net/{ => intel}/iavf/iavf_log.h (100%)
 rename drivers/net/{ => intel}/iavf/iavf_rxtx.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_rxtx.h (100%)
 rename drivers/net/{ => intel}/iavf/iavf_rxtx_vec_avx2.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_rxtx_vec_avx512.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_rxtx_vec_common.h (100%)
 rename drivers/net/{ => intel}/iavf/iavf_rxtx_vec_neon.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_rxtx_vec_sse.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_testpmd.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_tm.c (100%)
 rename drivers/net/{ => intel}/iavf/iavf_vchnl.c (100%)
 rename drivers/net/{ => intel}/iavf/meson.build (86%)
 rename drivers/net/{ => intel}/iavf/rte_pmd_iavf.h (100%)
 rename drivers/net/{ => intel}/iavf/version.map (100%)
 rename drivers/net/{ => intel}/ice/base/README (100%)
 rename drivers/net/{ => intel}/ice/base/ice_acl.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_acl.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_acl_ctrl.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_adminq_cmd.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_alloc.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_bitops.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_bst_tcam.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_bst_tcam.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_cgu_regs.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_common.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_common.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_controlq.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_controlq.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_dcb.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_dcb.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_ddp.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_ddp.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_defs.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_devids.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_fdir.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_fdir.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_flex_pipe.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_flex_pipe.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_flex_type.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_flg_rd.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_flg_rd.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_flow.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_flow.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_fwlog.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_fwlog.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_hw_autogen.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_imem.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_imem.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_lan_tx_rx.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_metainit.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_metainit.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_mk_grp.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_mk_grp.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_nvm.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_nvm.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_osdep.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_parser.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_parser.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_parser_rt.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_parser_rt.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_parser_util.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_pg_cam.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_pg_cam.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_phy_regs.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_proto_grp.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_proto_grp.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_protocol_type.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_ptp_consts.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_ptp_hw.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_ptp_hw.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_ptype_mk.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_ptype_mk.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_sbq_cmd.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_sched.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_sched.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_status.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_switch.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_switch.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_tmatch.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_type.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_vf_mbx.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_vf_mbx.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_vlan_mode.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_vlan_mode.h (100%)
 rename drivers/net/{ => intel}/ice/base/ice_xlt_kb.c (100%)
 rename drivers/net/{ => intel}/ice/base/ice_xlt_kb.h (100%)
 rename drivers/net/{ => intel}/ice/base/meson.build (100%)
 rename drivers/net/{ => intel}/ice/ice_acl_filter.c (100%)
 rename drivers/net/{ => intel}/ice/ice_dcf.c (100%)
 rename drivers/net/{ => intel}/ice/ice_dcf.h (100%)
 rename drivers/net/{ => intel}/ice/ice_dcf_ethdev.c (100%)
 rename drivers/net/{ => intel}/ice/ice_dcf_ethdev.h (100%)
 rename drivers/net/{ => intel}/ice/ice_dcf_parent.c (100%)
 rename drivers/net/{ => intel}/ice/ice_dcf_sched.c (100%)
 rename drivers/net/{ => intel}/ice/ice_dcf_vf_representor.c (100%)
 rename drivers/net/{ => intel}/ice/ice_diagnose.c (100%)
 rename drivers/net/{ => intel}/ice/ice_ethdev.c (100%)
 rename drivers/net/{ => intel}/ice/ice_ethdev.h (100%)
 rename drivers/net/{ => intel}/ice/ice_fdir_filter.c (100%)
 rename drivers/net/{ => intel}/ice/ice_generic_flow.c (100%)
 rename drivers/net/{ => intel}/ice/ice_generic_flow.h (100%)
 rename drivers/net/{ => intel}/ice/ice_hash.c (100%)
 rename drivers/net/{ => intel}/ice/ice_logs.h (100%)
 rename drivers/net/{ => intel}/ice/ice_rxtx.c (100%)
 rename drivers/net/{ => intel}/ice/ice_rxtx.h (100%)
 rename drivers/net/{ => intel}/ice/ice_rxtx_common_avx.h (100%)
 rename drivers/net/{ => intel}/ice/ice_rxtx_vec_avx2.c (100%)
 rename drivers/net/{ => intel}/ice/ice_rxtx_vec_avx512.c (100%)
 rename drivers/net/{ => intel}/ice/ice_rxtx_vec_common.h (100%)
 rename drivers/net/{ => intel}/ice/ice_rxtx_vec_sse.c (100%)
 rename drivers/net/{ => intel}/ice/ice_switch_filter.c (100%)
 rename drivers/net/{ => intel}/ice/ice_testpmd.c (100%)
 rename drivers/net/{ => intel}/ice/ice_tm.c (100%)
 rename drivers/net/{ => intel}/ice/meson.build (96%)
 rename drivers/net/{ => intel}/ice/version.map (100%)
 rename drivers/net/{ => intel}/idpf/idpf_ethdev.c (100%)
 rename drivers/net/{ => intel}/idpf/idpf_ethdev.h (100%)
 rename drivers/net/{ => intel}/idpf/idpf_logs.h (100%)
 rename drivers/net/{ => intel}/idpf/idpf_rxtx.c (100%)
 rename drivers/net/{ => intel}/idpf/idpf_rxtx.h (100%)
 rename drivers/net/{ => intel}/idpf/idpf_rxtx_vec_common.h (100%)
 rename drivers/net/{ => intel}/idpf/meson.build (100%)
 rename drivers/net/{ => intel}/igc/base/README (100%)
 rename drivers/net/{ => intel}/igc/base/igc_82571.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_82575.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_api.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_api.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_base.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_base.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_defines.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_hw.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_i225.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_i225.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_ich8lan.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_mac.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_mac.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_manage.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_manage.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_nvm.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_nvm.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_osdep.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_osdep.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_phy.c (100%)
 rename drivers/net/{ => intel}/igc/base/igc_phy.h (100%)
 rename drivers/net/{ => intel}/igc/base/igc_regs.h (100%)
 rename drivers/net/{ => intel}/igc/base/meson.build (100%)
 rename drivers/net/{ => intel}/igc/igc_ethdev.c (100%)
 rename drivers/net/{ => intel}/igc/igc_ethdev.h (100%)
 rename drivers/net/{ => intel}/igc/igc_filter.c (100%)
 rename drivers/net/{ => intel}/igc/igc_filter.h (100%)
 rename drivers/net/{ => intel}/igc/igc_flow.c (100%)
 rename drivers/net/{ => intel}/igc/igc_flow.h (100%)
 rename drivers/net/{ => intel}/igc/igc_logs.c (100%)
 rename drivers/net/{ => intel}/igc/igc_logs.h (100%)
 rename drivers/net/{ => intel}/igc/igc_txrx.c (100%)
 rename drivers/net/{ => intel}/igc/igc_txrx.h (100%)
 rename drivers/net/{ => intel}/igc/meson.build (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_ethdev.c (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_ethdev.h (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_flow.c (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_flow.h (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_logs.h (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_rawdev_api.h (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_representor.c (100%)
 rename drivers/net/{ => intel}/ipn3ke/ipn3ke_tm.c (100%)
 rename drivers/net/{ => intel}/ipn3ke/meson.build (91%)
 rename drivers/net/{ => intel}/ipn3ke/version.map (100%)
 rename drivers/net/{ => intel}/ixgbe/base/README (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_82598.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_82598.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_82599.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_82599.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_api.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_api.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_common.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_common.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb_82598.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb_82598.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb_82599.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb_82599.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_e610.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_e610.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_hv_vf.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_hv_vf.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_mbx.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_mbx.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_osdep.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_osdep.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_phy.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_phy.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_type.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_type_e610.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_vf.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_vf.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_x540.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_x540.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_x550.c (100%)
 rename drivers/net/{ => intel}/ixgbe/base/ixgbe_x550.h (100%)
 rename drivers/net/{ => intel}/ixgbe/base/meson.build (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_82599_bypass.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_bypass.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_bypass.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_bypass_api.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_bypass_defines.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_ethdev.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_ethdev.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_fdir.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_flow.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_ipsec.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_ipsec.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_logs.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_pf.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_recycle_mbufs_vec_common.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_regs.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_rxtx.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_rxtx.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_rxtx_vec_common.h (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_rxtx_vec_neon.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_rxtx_vec_sse.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_testpmd.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_tm.c (100%)
 rename drivers/net/{ => intel}/ixgbe/ixgbe_vf_representor.c (100%)
 rename drivers/net/{ => intel}/ixgbe/meson.build (100%)
 rename drivers/net/{ => intel}/ixgbe/rte_pmd_ixgbe.c (100%)
 rename drivers/net/{ => intel}/ixgbe/rte_pmd_ixgbe.h (100%)
 rename drivers/net/{ => intel}/ixgbe/version.map (100%)
MAINTAINERS +10 -10
index b86cdd266b..5f23ee558c 100644
@@ -779,7 +779,7 @@ F: doc/guides/nics/features/hinic.ini
 
 Intel e1000
 T: git://dpdk.org/next/dpdk-next-net-intel
-F: drivers/net/e1000/
+F: drivers/net/intel/e1000/
 F: doc/guides/nics/e1000em.rst
 F: doc/guides/nics/intel_vf.rst
 F: doc/guides/nics/features/e1000.ini
@@ -789,7 +789,7 @@ Intel ixgbe
 M: Anatoly Burakov <[email protected]>
 M: Vladimir Medvedkin <[email protected]>
 T: git://dpdk.org/next/dpdk-next-net-intel
-F: drivers/net/ixgbe/
+F: drivers/net/intel/ixgbe/
 F: doc/guides/nics/ixgbe.rst
 F: doc/guides/nics/intel_vf.rst
 F: doc/guides/nics/features/ixgbe*.ini
@@ -798,14 +798,14 @@ Intel i40e
 M: Ian Stokes <[email protected]>
 M: Bruce Richardson <[email protected]>
 T: git://dpdk.org/next/dpdk-next-net-intel
-F: drivers/net/i40e/
+F: drivers/net/intel/i40e/
 F: doc/guides/nics/i40e.rst
 F: doc/guides/nics/intel_vf.rst
 F: doc/guides/nics/features/i40e*.ini
 
 Intel fm10k
 T: git://dpdk.org/next/dpdk-next-net-intel
-F: drivers/net/fm10k/
+F: drivers/net/intel/fm10k/
 F: doc/guides/nics/fm10k.rst
 F: doc/guides/nics/features/fm10k*.ini
 
@@ -813,7 +813,7 @@ Intel iavf
 M: Vladimir Medvedkin <[email protected]>
 M: Ian Stokes <[email protected]>
 T: git://dpdk.org/next/dpdk-next-net-intel
-F: drivers/net/iavf/
+F: drivers/net/intel/iavf/
 F: drivers/common/iavf/
 F: doc/guides/nics/features/iavf*.ini
 
@@ -821,7 +821,7 @@ Intel ice
 M: Bruce Richardson <[email protected]>
 M: Anatoly Burakov <[email protected]>
 T: git://dpdk.org/next/dpdk-next-net-intel
-F: drivers/net/ice/
+F: drivers/net/intel/ice/
 F: doc/guides/nics/ice.rst
 F: doc/guides/nics/features/ice.ini
 
@@ -829,7 +829,7 @@ Intel idpf
 M: Jingjing Wu <[email protected]>
 M: Praveen Shetty <[email protected]>
 T: git://dpdk.org/next/dpdk-next-net-intel
-F: drivers/net/idpf/
+F: drivers/net/intel/idpf/
 F: drivers/common/idpf/
 F: doc/guides/nics/idpf.rst
 F: doc/guides/nics/features/idpf.ini
@@ -837,20 +837,20 @@ F: doc/guides/nics/features/idpf.ini
 Intel cpfl - EXPERIMENTAL
 M: Praveen Shetty <[email protected]>
 T: git://dpdk.org/next/dpdk-next-net-intel
-F: drivers/net/cpfl/
+F: drivers/net/intel/cpfl/
 F: doc/guides/nics/cpfl.rst
 F: doc/guides/nics/features/cpfl.ini
 
 Intel igc
 T: git://dpdk.org/next/dpdk-next-net-intel
-F: drivers/net/igc/
+F: drivers/net/intel/igc/
 F: doc/guides/nics/igc.rst
 F: doc/guides/nics/features/igc.ini
 
 Intel ipn3ke
 M: Rosen Xu <[email protected]>
 T: git://dpdk.org/next/dpdk-next-net-intel
-F: drivers/net/ipn3ke/
+F: drivers/net/intel/ipn3ke/
 F: doc/guides/nics/ipn3ke.rst
 F: doc/guides/nics/features/ipn3ke.ini
 
devtools/check-git-log.sh +4 -0
index 2ee7f2db64..b2da013f6c 100755
@@ -79,6 +79,10 @@ bad=$(for commit in $commits ; do
 	[ -z "$(echo "$files" | grep -v '^\(drivers\|doc\|config\)/')" ] ||
 		continue
 	drv=$(echo "$files" | grep '^drivers/' | cut -d "/" -f 2,3 | sort -u)
+	# for drivers/net/intel/* use 2nd and 4th fields not 2nd and 3rd
+	if [ "$drv" = "net/intel" ] ; then
+		drv=$(echo "$files" | grep '^drivers/' | cut -d "/" -f 2,4 | sort -u)
+	fi
 	drvgrp=$(echo "$drv" | cut -d "/" -f 1 | uniq)
 	if [ $(echo "$drvgrp" | wc -l) -gt 1 ] ; then
 		echo "$headline" | grep -v '^drivers:'
doc/api/doxy-api.conf.in +3 -3
index d23352d300..ebe9c211a9 100644
@@ -19,9 +19,9 @@ INPUT                   = @TOPDIR@/doc/api/doxy-api-index.md \
                           @TOPDIR@/drivers/net/cnxk \
                           @TOPDIR@/drivers/net/dpaa \
                           @TOPDIR@/drivers/net/dpaa2 \
-                          @TOPDIR@/drivers/net/i40e \
-                          @TOPDIR@/drivers/net/iavf \
-                          @TOPDIR@/drivers/net/ixgbe \
+                          @TOPDIR@/drivers/net/intel/i40e \
+                          @TOPDIR@/drivers/net/intel/iavf \
+                          @TOPDIR@/drivers/net/intel/ixgbe \
                           @TOPDIR@/drivers/net/mlx5 \
                           @TOPDIR@/drivers/net/softnic \
                           @TOPDIR@/drivers/raw/dpaa2_cmdif \
drivers/meson.build +5 -1
index 495e21b54a..89545e618e 100644
@@ -47,7 +47,7 @@ enable_drivers = run_command(list_dir_globs, enable_drivers, check: true).stdout
 require_drivers = true
 if enable_drivers.length() == 0
     require_drivers = false
-    enable_drivers = run_command(list_dir_globs, '*/*', check: true).stdout().split()
+    enable_drivers = run_command(list_dir_globs, '*/*,*/*/*', check: true).stdout().split()
 endif
 
 # these drivers must always be enabled, otherwise the build breaks
@@ -143,6 +143,10 @@ foreach subpath:subdirs
         testpmd_sources = []
         require_iova_in_mbuf = true
 
+        if name.contains('/')
+            name = name.split('/')[1]
+        endif
+
         if not enable_drivers.contains(drv_path)
             build = false
             reason = 'not in enabled drivers build config'
drivers/net/intel/cpfl/cpfl_actions.h renamed from drivers/net/cpfl/cpfl_actions.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_actions.h
rename to drivers/net/intel/cpfl/cpfl_actions.h
drivers/net/intel/cpfl/cpfl_controlq.c renamed from drivers/net/cpfl/cpfl_controlq.c +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_controlq.c
rename to drivers/net/intel/cpfl/cpfl_controlq.c
drivers/net/intel/cpfl/cpfl_controlq.h renamed from drivers/net/cpfl/cpfl_controlq.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_controlq.h
rename to drivers/net/intel/cpfl/cpfl_controlq.h
drivers/net/intel/cpfl/cpfl_cpchnl.h renamed from drivers/net/cpfl/cpfl_cpchnl.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_cpchnl.h
rename to drivers/net/intel/cpfl/cpfl_cpchnl.h
drivers/net/intel/cpfl/cpfl_ethdev.c renamed from drivers/net/cpfl/cpfl_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_ethdev.c
rename to drivers/net/intel/cpfl/cpfl_ethdev.c
drivers/net/intel/cpfl/cpfl_ethdev.h renamed from drivers/net/cpfl/cpfl_ethdev.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_ethdev.h
rename to drivers/net/intel/cpfl/cpfl_ethdev.h
drivers/net/intel/cpfl/cpfl_flow.c renamed from drivers/net/cpfl/cpfl_flow.c +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_flow.c
rename to drivers/net/intel/cpfl/cpfl_flow.c
drivers/net/intel/cpfl/cpfl_flow.h renamed from drivers/net/cpfl/cpfl_flow.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_flow.h
rename to drivers/net/intel/cpfl/cpfl_flow.h
drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c renamed from drivers/net/cpfl/cpfl_flow_engine_fxp.c +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_flow_engine_fxp.c
rename to drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c
drivers/net/intel/cpfl/cpfl_flow_parser.c renamed from drivers/net/cpfl/cpfl_flow_parser.c +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_flow_parser.c
rename to drivers/net/intel/cpfl/cpfl_flow_parser.c
drivers/net/intel/cpfl/cpfl_flow_parser.h renamed from drivers/net/cpfl/cpfl_flow_parser.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_flow_parser.h
rename to drivers/net/intel/cpfl/cpfl_flow_parser.h
drivers/net/intel/cpfl/cpfl_fxp_rule.c renamed from drivers/net/cpfl/cpfl_fxp_rule.c +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_fxp_rule.c
rename to drivers/net/intel/cpfl/cpfl_fxp_rule.c
drivers/net/intel/cpfl/cpfl_fxp_rule.h renamed from drivers/net/cpfl/cpfl_fxp_rule.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_fxp_rule.h
rename to drivers/net/intel/cpfl/cpfl_fxp_rule.h
drivers/net/intel/cpfl/cpfl_logs.h renamed from drivers/net/cpfl/cpfl_logs.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_logs.h
rename to drivers/net/intel/cpfl/cpfl_logs.h
drivers/net/intel/cpfl/cpfl_representor.c renamed from drivers/net/cpfl/cpfl_representor.c +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_representor.c
rename to drivers/net/intel/cpfl/cpfl_representor.c
drivers/net/intel/cpfl/cpfl_representor.h renamed from drivers/net/cpfl/cpfl_representor.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_representor.h
rename to drivers/net/intel/cpfl/cpfl_representor.h
drivers/net/intel/cpfl/cpfl_rules.c renamed from drivers/net/cpfl/cpfl_rules.c +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_rules.c
rename to drivers/net/intel/cpfl/cpfl_rules.c
drivers/net/intel/cpfl/cpfl_rules.h renamed from drivers/net/cpfl/cpfl_rules.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_rules.h
rename to drivers/net/intel/cpfl/cpfl_rules.h
drivers/net/intel/cpfl/cpfl_rxtx.c renamed from drivers/net/cpfl/cpfl_rxtx.c +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_rxtx.c
rename to drivers/net/intel/cpfl/cpfl_rxtx.c
drivers/net/intel/cpfl/cpfl_rxtx.h renamed from drivers/net/cpfl/cpfl_rxtx.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_rxtx.h
rename to drivers/net/intel/cpfl/cpfl_rxtx.h
drivers/net/intel/cpfl/cpfl_rxtx_vec_common.h renamed from drivers/net/cpfl/cpfl_rxtx_vec_common.h +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_rxtx_vec_common.h
rename to drivers/net/intel/cpfl/cpfl_rxtx_vec_common.h
drivers/net/intel/cpfl/cpfl_vchnl.c renamed from drivers/net/cpfl/cpfl_vchnl.c +0 -0
similarity index 100%
rename from drivers/net/cpfl/cpfl_vchnl.c
rename to drivers/net/intel/cpfl/cpfl_vchnl.c
drivers/net/intel/cpfl/meson.build renamed from drivers/net/cpfl/meson.build +0 -0
similarity index 100%
rename from drivers/net/cpfl/meson.build
rename to drivers/net/intel/cpfl/meson.build
drivers/net/intel/e1000/base/README renamed from drivers/net/e1000/base/README +0 -0
similarity index 100%
rename from drivers/net/e1000/base/README
rename to drivers/net/intel/e1000/base/README
drivers/net/intel/e1000/base/e1000_80003es2lan.c renamed from drivers/net/e1000/base/e1000_80003es2lan.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_80003es2lan.c
rename to drivers/net/intel/e1000/base/e1000_80003es2lan.c
drivers/net/intel/e1000/base/e1000_80003es2lan.h renamed from drivers/net/e1000/base/e1000_80003es2lan.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_80003es2lan.h
rename to drivers/net/intel/e1000/base/e1000_80003es2lan.h
drivers/net/intel/e1000/base/e1000_82540.c renamed from drivers/net/e1000/base/e1000_82540.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_82540.c
rename to drivers/net/intel/e1000/base/e1000_82540.c
drivers/net/intel/e1000/base/e1000_82541.c renamed from drivers/net/e1000/base/e1000_82541.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_82541.c
rename to drivers/net/intel/e1000/base/e1000_82541.c
drivers/net/intel/e1000/base/e1000_82541.h renamed from drivers/net/e1000/base/e1000_82541.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_82541.h
rename to drivers/net/intel/e1000/base/e1000_82541.h
drivers/net/intel/e1000/base/e1000_82542.c renamed from drivers/net/e1000/base/e1000_82542.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_82542.c
rename to drivers/net/intel/e1000/base/e1000_82542.c
drivers/net/intel/e1000/base/e1000_82543.c renamed from drivers/net/e1000/base/e1000_82543.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_82543.c
rename to drivers/net/intel/e1000/base/e1000_82543.c
drivers/net/intel/e1000/base/e1000_82543.h renamed from drivers/net/e1000/base/e1000_82543.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_82543.h
rename to drivers/net/intel/e1000/base/e1000_82543.h
drivers/net/intel/e1000/base/e1000_82571.c renamed from drivers/net/e1000/base/e1000_82571.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_82571.c
rename to drivers/net/intel/e1000/base/e1000_82571.c
drivers/net/intel/e1000/base/e1000_82571.h renamed from drivers/net/e1000/base/e1000_82571.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_82571.h
rename to drivers/net/intel/e1000/base/e1000_82571.h
drivers/net/intel/e1000/base/e1000_82575.c renamed from drivers/net/e1000/base/e1000_82575.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_82575.c
rename to drivers/net/intel/e1000/base/e1000_82575.c
drivers/net/intel/e1000/base/e1000_82575.h renamed from drivers/net/e1000/base/e1000_82575.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_82575.h
rename to drivers/net/intel/e1000/base/e1000_82575.h
drivers/net/intel/e1000/base/e1000_api.c renamed from drivers/net/e1000/base/e1000_api.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_api.c
rename to drivers/net/intel/e1000/base/e1000_api.c
drivers/net/intel/e1000/base/e1000_api.h renamed from drivers/net/e1000/base/e1000_api.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_api.h
rename to drivers/net/intel/e1000/base/e1000_api.h
drivers/net/intel/e1000/base/e1000_base.c renamed from drivers/net/e1000/base/e1000_base.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_base.c
rename to drivers/net/intel/e1000/base/e1000_base.c
drivers/net/intel/e1000/base/e1000_base.h renamed from drivers/net/e1000/base/e1000_base.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_base.h
rename to drivers/net/intel/e1000/base/e1000_base.h
drivers/net/intel/e1000/base/e1000_defines.h renamed from drivers/net/e1000/base/e1000_defines.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_defines.h
rename to drivers/net/intel/e1000/base/e1000_defines.h
drivers/net/intel/e1000/base/e1000_hw.h renamed from drivers/net/e1000/base/e1000_hw.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_hw.h
rename to drivers/net/intel/e1000/base/e1000_hw.h
drivers/net/intel/e1000/base/e1000_i210.c renamed from drivers/net/e1000/base/e1000_i210.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_i210.c
rename to drivers/net/intel/e1000/base/e1000_i210.c
drivers/net/intel/e1000/base/e1000_i210.h renamed from drivers/net/e1000/base/e1000_i210.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_i210.h
rename to drivers/net/intel/e1000/base/e1000_i210.h
drivers/net/intel/e1000/base/e1000_ich8lan.c renamed from drivers/net/e1000/base/e1000_ich8lan.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_ich8lan.c
rename to drivers/net/intel/e1000/base/e1000_ich8lan.c
drivers/net/intel/e1000/base/e1000_ich8lan.h renamed from drivers/net/e1000/base/e1000_ich8lan.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_ich8lan.h
rename to drivers/net/intel/e1000/base/e1000_ich8lan.h
drivers/net/intel/e1000/base/e1000_mac.c renamed from drivers/net/e1000/base/e1000_mac.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_mac.c
rename to drivers/net/intel/e1000/base/e1000_mac.c
drivers/net/intel/e1000/base/e1000_mac.h renamed from drivers/net/e1000/base/e1000_mac.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_mac.h
rename to drivers/net/intel/e1000/base/e1000_mac.h
drivers/net/intel/e1000/base/e1000_manage.c renamed from drivers/net/e1000/base/e1000_manage.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_manage.c
rename to drivers/net/intel/e1000/base/e1000_manage.c
drivers/net/intel/e1000/base/e1000_manage.h renamed from drivers/net/e1000/base/e1000_manage.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_manage.h
rename to drivers/net/intel/e1000/base/e1000_manage.h
drivers/net/intel/e1000/base/e1000_mbx.c renamed from drivers/net/e1000/base/e1000_mbx.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_mbx.c
rename to drivers/net/intel/e1000/base/e1000_mbx.c
drivers/net/intel/e1000/base/e1000_mbx.h renamed from drivers/net/e1000/base/e1000_mbx.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_mbx.h
rename to drivers/net/intel/e1000/base/e1000_mbx.h
drivers/net/intel/e1000/base/e1000_nvm.c renamed from drivers/net/e1000/base/e1000_nvm.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_nvm.c
rename to drivers/net/intel/e1000/base/e1000_nvm.c
drivers/net/intel/e1000/base/e1000_nvm.h renamed from drivers/net/e1000/base/e1000_nvm.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_nvm.h
rename to drivers/net/intel/e1000/base/e1000_nvm.h
drivers/net/intel/e1000/base/e1000_osdep.c renamed from drivers/net/e1000/base/e1000_osdep.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_osdep.c
rename to drivers/net/intel/e1000/base/e1000_osdep.c
drivers/net/intel/e1000/base/e1000_osdep.h renamed from drivers/net/e1000/base/e1000_osdep.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_osdep.h
rename to drivers/net/intel/e1000/base/e1000_osdep.h
drivers/net/intel/e1000/base/e1000_phy.c renamed from drivers/net/e1000/base/e1000_phy.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_phy.c
rename to drivers/net/intel/e1000/base/e1000_phy.c
drivers/net/intel/e1000/base/e1000_phy.h renamed from drivers/net/e1000/base/e1000_phy.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_phy.h
rename to drivers/net/intel/e1000/base/e1000_phy.h
drivers/net/intel/e1000/base/e1000_regs.h renamed from drivers/net/e1000/base/e1000_regs.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_regs.h
rename to drivers/net/intel/e1000/base/e1000_regs.h
drivers/net/intel/e1000/base/e1000_vf.c renamed from drivers/net/e1000/base/e1000_vf.c +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_vf.c
rename to drivers/net/intel/e1000/base/e1000_vf.c
drivers/net/intel/e1000/base/e1000_vf.h renamed from drivers/net/e1000/base/e1000_vf.h +0 -0
similarity index 100%
rename from drivers/net/e1000/base/e1000_vf.h
rename to drivers/net/intel/e1000/base/e1000_vf.h
drivers/net/intel/e1000/base/meson.build renamed from drivers/net/e1000/base/meson.build +0 -0
similarity index 100%
rename from drivers/net/e1000/base/meson.build
rename to drivers/net/intel/e1000/base/meson.build
drivers/net/intel/e1000/e1000_ethdev.h renamed from drivers/net/e1000/e1000_ethdev.h +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_ethdev.h
rename to drivers/net/intel/e1000/e1000_ethdev.h
drivers/net/intel/e1000/e1000_logs.c renamed from drivers/net/e1000/e1000_logs.c +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_logs.c
rename to drivers/net/intel/e1000/e1000_logs.c
drivers/net/intel/e1000/e1000_logs.h renamed from drivers/net/e1000/e1000_logs.h +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_logs.h
rename to drivers/net/intel/e1000/e1000_logs.h
drivers/net/intel/e1000/em_ethdev.c renamed from drivers/net/e1000/em_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/e1000/em_ethdev.c
rename to drivers/net/intel/e1000/em_ethdev.c
drivers/net/intel/e1000/em_rxtx.c renamed from drivers/net/e1000/em_rxtx.c +0 -0
similarity index 100%
rename from drivers/net/e1000/em_rxtx.c
rename to drivers/net/intel/e1000/em_rxtx.c
drivers/net/intel/e1000/igb_ethdev.c renamed from drivers/net/e1000/igb_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/e1000/igb_ethdev.c
rename to drivers/net/intel/e1000/igb_ethdev.c
drivers/net/intel/e1000/igb_flow.c renamed from drivers/net/e1000/igb_flow.c +0 -0
similarity index 100%
rename from drivers/net/e1000/igb_flow.c
rename to drivers/net/intel/e1000/igb_flow.c
drivers/net/intel/e1000/igb_pf.c renamed from drivers/net/e1000/igb_pf.c +0 -0
similarity index 100%
rename from drivers/net/e1000/igb_pf.c
rename to drivers/net/intel/e1000/igb_pf.c
drivers/net/intel/e1000/igb_regs.h renamed from drivers/net/e1000/igb_regs.h +0 -0
similarity index 100%
rename from drivers/net/e1000/igb_regs.h
rename to drivers/net/intel/e1000/igb_regs.h
drivers/net/intel/e1000/igb_rxtx.c renamed from drivers/net/e1000/igb_rxtx.c +0 -0
similarity index 100%
rename from drivers/net/e1000/igb_rxtx.c
rename to drivers/net/intel/e1000/igb_rxtx.c
drivers/net/intel/e1000/meson.build renamed from drivers/net/e1000/meson.build +0 -0
similarity index 100%
rename from drivers/net/e1000/meson.build
rename to drivers/net/intel/e1000/meson.build
drivers/net/intel/fm10k/base/fm10k_api.c renamed from drivers/net/fm10k/base/fm10k_api.c +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_api.c
rename to drivers/net/intel/fm10k/base/fm10k_api.c
drivers/net/intel/fm10k/base/fm10k_api.h renamed from drivers/net/fm10k/base/fm10k_api.h +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_api.h
rename to drivers/net/intel/fm10k/base/fm10k_api.h
drivers/net/intel/fm10k/base/fm10k_common.c renamed from drivers/net/fm10k/base/fm10k_common.c +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_common.c
rename to drivers/net/intel/fm10k/base/fm10k_common.c
drivers/net/intel/fm10k/base/fm10k_common.h renamed from drivers/net/fm10k/base/fm10k_common.h +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_common.h
rename to drivers/net/intel/fm10k/base/fm10k_common.h
drivers/net/intel/fm10k/base/fm10k_mbx.c renamed from drivers/net/fm10k/base/fm10k_mbx.c +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_mbx.c
rename to drivers/net/intel/fm10k/base/fm10k_mbx.c
drivers/net/intel/fm10k/base/fm10k_mbx.h renamed from drivers/net/fm10k/base/fm10k_mbx.h +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_mbx.h
rename to drivers/net/intel/fm10k/base/fm10k_mbx.h
drivers/net/intel/fm10k/base/fm10k_osdep.h renamed from drivers/net/fm10k/base/fm10k_osdep.h +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_osdep.h
rename to drivers/net/intel/fm10k/base/fm10k_osdep.h
drivers/net/intel/fm10k/base/fm10k_pf.c renamed from drivers/net/fm10k/base/fm10k_pf.c +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_pf.c
rename to drivers/net/intel/fm10k/base/fm10k_pf.c
drivers/net/intel/fm10k/base/fm10k_pf.h renamed from drivers/net/fm10k/base/fm10k_pf.h +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_pf.h
rename to drivers/net/intel/fm10k/base/fm10k_pf.h
drivers/net/intel/fm10k/base/fm10k_tlv.c renamed from drivers/net/fm10k/base/fm10k_tlv.c +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_tlv.c
rename to drivers/net/intel/fm10k/base/fm10k_tlv.c
drivers/net/intel/fm10k/base/fm10k_tlv.h renamed from drivers/net/fm10k/base/fm10k_tlv.h +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_tlv.h
rename to drivers/net/intel/fm10k/base/fm10k_tlv.h
drivers/net/intel/fm10k/base/fm10k_type.h renamed from drivers/net/fm10k/base/fm10k_type.h +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_type.h
rename to drivers/net/intel/fm10k/base/fm10k_type.h
drivers/net/intel/fm10k/base/fm10k_vf.c renamed from drivers/net/fm10k/base/fm10k_vf.c +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_vf.c
rename to drivers/net/intel/fm10k/base/fm10k_vf.c
drivers/net/intel/fm10k/base/fm10k_vf.h renamed from drivers/net/fm10k/base/fm10k_vf.h +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/fm10k_vf.h
rename to drivers/net/intel/fm10k/base/fm10k_vf.h
drivers/net/intel/fm10k/base/meson.build renamed from drivers/net/fm10k/base/meson.build +0 -0
similarity index 100%
rename from drivers/net/fm10k/base/meson.build
rename to drivers/net/intel/fm10k/base/meson.build
drivers/net/intel/fm10k/fm10k.h renamed from drivers/net/fm10k/fm10k.h +0 -0
similarity index 100%
rename from drivers/net/fm10k/fm10k.h
rename to drivers/net/intel/fm10k/fm10k.h
drivers/net/intel/fm10k/fm10k_ethdev.c renamed from drivers/net/fm10k/fm10k_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/fm10k/fm10k_ethdev.c
rename to drivers/net/intel/fm10k/fm10k_ethdev.c
drivers/net/intel/fm10k/fm10k_logs.h renamed from drivers/net/fm10k/fm10k_logs.h +0 -0
similarity index 100%
rename from drivers/net/fm10k/fm10k_logs.h
rename to drivers/net/intel/fm10k/fm10k_logs.h
drivers/net/intel/fm10k/fm10k_rxtx.c renamed from drivers/net/fm10k/fm10k_rxtx.c +0 -0
similarity index 100%
rename from drivers/net/fm10k/fm10k_rxtx.c
rename to drivers/net/intel/fm10k/fm10k_rxtx.c
drivers/net/intel/fm10k/fm10k_rxtx_vec.c renamed from drivers/net/fm10k/fm10k_rxtx_vec.c +0 -0
similarity index 100%
rename from drivers/net/fm10k/fm10k_rxtx_vec.c
rename to drivers/net/intel/fm10k/fm10k_rxtx_vec.c
drivers/net/intel/fm10k/meson.build renamed from drivers/net/fm10k/meson.build +0 -0
similarity index 100%
rename from drivers/net/fm10k/meson.build
rename to drivers/net/intel/fm10k/meson.build
drivers/net/intel/i40e/base/README renamed from drivers/net/i40e/base/README +0 -0
similarity index 100%
rename from drivers/net/i40e/base/README
rename to drivers/net/intel/i40e/base/README
drivers/net/intel/i40e/base/i40e_adminq.c renamed from drivers/net/i40e/base/i40e_adminq.c +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_adminq.c
rename to drivers/net/intel/i40e/base/i40e_adminq.c
drivers/net/intel/i40e/base/i40e_adminq.h renamed from drivers/net/i40e/base/i40e_adminq.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_adminq.h
rename to drivers/net/intel/i40e/base/i40e_adminq.h
drivers/net/intel/i40e/base/i40e_adminq_cmd.h renamed from drivers/net/i40e/base/i40e_adminq_cmd.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_adminq_cmd.h
rename to drivers/net/intel/i40e/base/i40e_adminq_cmd.h
drivers/net/intel/i40e/base/i40e_alloc.h renamed from drivers/net/i40e/base/i40e_alloc.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_alloc.h
rename to drivers/net/intel/i40e/base/i40e_alloc.h
drivers/net/intel/i40e/base/i40e_common.c renamed from drivers/net/i40e/base/i40e_common.c +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_common.c
rename to drivers/net/intel/i40e/base/i40e_common.c
drivers/net/intel/i40e/base/i40e_dcb.c renamed from drivers/net/i40e/base/i40e_dcb.c +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_dcb.c
rename to drivers/net/intel/i40e/base/i40e_dcb.c
drivers/net/intel/i40e/base/i40e_dcb.h renamed from drivers/net/i40e/base/i40e_dcb.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_dcb.h
rename to drivers/net/intel/i40e/base/i40e_dcb.h
drivers/net/intel/i40e/base/i40e_devids.h renamed from drivers/net/i40e/base/i40e_devids.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_devids.h
rename to drivers/net/intel/i40e/base/i40e_devids.h
drivers/net/intel/i40e/base/i40e_diag.c renamed from drivers/net/i40e/base/i40e_diag.c +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_diag.c
rename to drivers/net/intel/i40e/base/i40e_diag.c
drivers/net/intel/i40e/base/i40e_diag.h renamed from drivers/net/i40e/base/i40e_diag.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_diag.h
rename to drivers/net/intel/i40e/base/i40e_diag.h
drivers/net/intel/i40e/base/i40e_hmc.c renamed from drivers/net/i40e/base/i40e_hmc.c +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_hmc.c
rename to drivers/net/intel/i40e/base/i40e_hmc.c
drivers/net/intel/i40e/base/i40e_hmc.h renamed from drivers/net/i40e/base/i40e_hmc.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_hmc.h
rename to drivers/net/intel/i40e/base/i40e_hmc.h
drivers/net/intel/i40e/base/i40e_lan_hmc.c renamed from drivers/net/i40e/base/i40e_lan_hmc.c +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_lan_hmc.c
rename to drivers/net/intel/i40e/base/i40e_lan_hmc.c
drivers/net/intel/i40e/base/i40e_lan_hmc.h renamed from drivers/net/i40e/base/i40e_lan_hmc.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_lan_hmc.h
rename to drivers/net/intel/i40e/base/i40e_lan_hmc.h
drivers/net/intel/i40e/base/i40e_nvm.c renamed from drivers/net/i40e/base/i40e_nvm.c +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_nvm.c
rename to drivers/net/intel/i40e/base/i40e_nvm.c
drivers/net/intel/i40e/base/i40e_osdep.h renamed from drivers/net/i40e/base/i40e_osdep.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_osdep.h
rename to drivers/net/intel/i40e/base/i40e_osdep.h
drivers/net/intel/i40e/base/i40e_prototype.h renamed from drivers/net/i40e/base/i40e_prototype.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_prototype.h
rename to drivers/net/intel/i40e/base/i40e_prototype.h
drivers/net/intel/i40e/base/i40e_register.h renamed from drivers/net/i40e/base/i40e_register.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_register.h
rename to drivers/net/intel/i40e/base/i40e_register.h
drivers/net/intel/i40e/base/i40e_status.h renamed from drivers/net/i40e/base/i40e_status.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_status.h
rename to drivers/net/intel/i40e/base/i40e_status.h
drivers/net/intel/i40e/base/i40e_type.h renamed from drivers/net/i40e/base/i40e_type.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/i40e_type.h
rename to drivers/net/intel/i40e/base/i40e_type.h
drivers/net/intel/i40e/base/meson.build renamed from drivers/net/i40e/base/meson.build +0 -0
similarity index 100%
rename from drivers/net/i40e/base/meson.build
rename to drivers/net/intel/i40e/base/meson.build
drivers/net/intel/i40e/base/virtchnl.h renamed from drivers/net/i40e/base/virtchnl.h +0 -0
similarity index 100%
rename from drivers/net/i40e/base/virtchnl.h
rename to drivers/net/intel/i40e/base/virtchnl.h
drivers/net/intel/i40e/i40e_ethdev.c renamed from drivers/net/i40e/i40e_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_ethdev.c
rename to drivers/net/intel/i40e/i40e_ethdev.c
drivers/net/intel/i40e/i40e_ethdev.h renamed from drivers/net/i40e/i40e_ethdev.h +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_ethdev.h
rename to drivers/net/intel/i40e/i40e_ethdev.h
drivers/net/intel/i40e/i40e_fdir.c renamed from drivers/net/i40e/i40e_fdir.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_fdir.c
rename to drivers/net/intel/i40e/i40e_fdir.c
drivers/net/intel/i40e/i40e_flow.c renamed from drivers/net/i40e/i40e_flow.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_flow.c
rename to drivers/net/intel/i40e/i40e_flow.c
drivers/net/intel/i40e/i40e_hash.c renamed from drivers/net/i40e/i40e_hash.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_hash.c
rename to drivers/net/intel/i40e/i40e_hash.c
drivers/net/intel/i40e/i40e_hash.h renamed from drivers/net/i40e/i40e_hash.h +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_hash.h
rename to drivers/net/intel/i40e/i40e_hash.h
drivers/net/intel/i40e/i40e_logs.h renamed from drivers/net/i40e/i40e_logs.h +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_logs.h
rename to drivers/net/intel/i40e/i40e_logs.h
drivers/net/intel/i40e/i40e_pf.c renamed from drivers/net/i40e/i40e_pf.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_pf.c
rename to drivers/net/intel/i40e/i40e_pf.c
drivers/net/intel/i40e/i40e_pf.h renamed from drivers/net/i40e/i40e_pf.h +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_pf.h
rename to drivers/net/intel/i40e/i40e_pf.h
drivers/net/intel/i40e/i40e_recycle_mbufs_vec_common.c renamed from drivers/net/i40e/i40e_recycle_mbufs_vec_common.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_recycle_mbufs_vec_common.c
rename to drivers/net/intel/i40e/i40e_recycle_mbufs_vec_common.c
drivers/net/intel/i40e/i40e_regs.h renamed from drivers/net/i40e/i40e_regs.h +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_regs.h
rename to drivers/net/intel/i40e/i40e_regs.h
drivers/net/intel/i40e/i40e_rxtx.c renamed from drivers/net/i40e/i40e_rxtx.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_rxtx.c
rename to drivers/net/intel/i40e/i40e_rxtx.c
drivers/net/intel/i40e/i40e_rxtx.h renamed from drivers/net/i40e/i40e_rxtx.h +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_rxtx.h
rename to drivers/net/intel/i40e/i40e_rxtx.h
drivers/net/intel/i40e/i40e_rxtx_common_avx.h renamed from drivers/net/i40e/i40e_rxtx_common_avx.h +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_rxtx_common_avx.h
rename to drivers/net/intel/i40e/i40e_rxtx_common_avx.h
drivers/net/intel/i40e/i40e_rxtx_vec_altivec.c renamed from drivers/net/i40e/i40e_rxtx_vec_altivec.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_rxtx_vec_altivec.c
rename to drivers/net/intel/i40e/i40e_rxtx_vec_altivec.c
drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c renamed from drivers/net/i40e/i40e_rxtx_vec_avx2.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_rxtx_vec_avx2.c
rename to drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c
drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c renamed from drivers/net/i40e/i40e_rxtx_vec_avx512.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_rxtx_vec_avx512.c
rename to drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c
drivers/net/intel/i40e/i40e_rxtx_vec_common.h renamed from drivers/net/i40e/i40e_rxtx_vec_common.h +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_rxtx_vec_common.h
rename to drivers/net/intel/i40e/i40e_rxtx_vec_common.h
drivers/net/intel/i40e/i40e_rxtx_vec_neon.c renamed from drivers/net/i40e/i40e_rxtx_vec_neon.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_rxtx_vec_neon.c
rename to drivers/net/intel/i40e/i40e_rxtx_vec_neon.c
drivers/net/intel/i40e/i40e_rxtx_vec_sse.c renamed from drivers/net/i40e/i40e_rxtx_vec_sse.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_rxtx_vec_sse.c
rename to drivers/net/intel/i40e/i40e_rxtx_vec_sse.c
drivers/net/intel/i40e/i40e_testpmd.c renamed from drivers/net/i40e/i40e_testpmd.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_testpmd.c
rename to drivers/net/intel/i40e/i40e_testpmd.c
drivers/net/intel/i40e/i40e_tm.c renamed from drivers/net/i40e/i40e_tm.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_tm.c
rename to drivers/net/intel/i40e/i40e_tm.c
drivers/net/intel/i40e/i40e_vf_representor.c renamed from drivers/net/i40e/i40e_vf_representor.c +0 -0
similarity index 100%
rename from drivers/net/i40e/i40e_vf_representor.c
rename to drivers/net/intel/i40e/i40e_vf_representor.c
drivers/net/intel/i40e/meson.build renamed from drivers/net/i40e/meson.build +0 -0
similarity index 100%
rename from drivers/net/i40e/meson.build
rename to drivers/net/intel/i40e/meson.build
drivers/net/intel/i40e/rte_pmd_i40e.c renamed from drivers/net/i40e/rte_pmd_i40e.c +0 -0
similarity index 100%
rename from drivers/net/i40e/rte_pmd_i40e.c
rename to drivers/net/intel/i40e/rte_pmd_i40e.c
drivers/net/intel/i40e/rte_pmd_i40e.h renamed from drivers/net/i40e/rte_pmd_i40e.h +0 -0
similarity index 100%
rename from drivers/net/i40e/rte_pmd_i40e.h
rename to drivers/net/intel/i40e/rte_pmd_i40e.h
drivers/net/intel/i40e/version.map renamed from drivers/net/i40e/version.map +0 -0
similarity index 100%
rename from drivers/net/i40e/version.map
rename to drivers/net/intel/i40e/version.map
drivers/net/intel/iavf/iavf.h renamed from drivers/net/iavf/iavf.h +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf.h
rename to drivers/net/intel/iavf/iavf.h
drivers/net/intel/iavf/iavf_ethdev.c renamed from drivers/net/iavf/iavf_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_ethdev.c
rename to drivers/net/intel/iavf/iavf_ethdev.c
drivers/net/intel/iavf/iavf_fdir.c renamed from drivers/net/iavf/iavf_fdir.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_fdir.c
rename to drivers/net/intel/iavf/iavf_fdir.c
drivers/net/intel/iavf/iavf_fsub.c renamed from drivers/net/iavf/iavf_fsub.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_fsub.c
rename to drivers/net/intel/iavf/iavf_fsub.c
drivers/net/intel/iavf/iavf_generic_flow.c renamed from drivers/net/iavf/iavf_generic_flow.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_generic_flow.c
rename to drivers/net/intel/iavf/iavf_generic_flow.c
drivers/net/intel/iavf/iavf_generic_flow.h renamed from drivers/net/iavf/iavf_generic_flow.h +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_generic_flow.h
rename to drivers/net/intel/iavf/iavf_generic_flow.h
drivers/net/intel/iavf/iavf_hash.c renamed from drivers/net/iavf/iavf_hash.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_hash.c
rename to drivers/net/intel/iavf/iavf_hash.c
drivers/net/intel/iavf/iavf_ipsec_crypto.c renamed from drivers/net/iavf/iavf_ipsec_crypto.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_ipsec_crypto.c
rename to drivers/net/intel/iavf/iavf_ipsec_crypto.c
drivers/net/intel/iavf/iavf_ipsec_crypto.h renamed from drivers/net/iavf/iavf_ipsec_crypto.h +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_ipsec_crypto.h
rename to drivers/net/intel/iavf/iavf_ipsec_crypto.h
drivers/net/intel/iavf/iavf_ipsec_crypto_capabilities.h renamed from drivers/net/iavf/iavf_ipsec_crypto_capabilities.h +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_ipsec_crypto_capabilities.h
rename to drivers/net/intel/iavf/iavf_ipsec_crypto_capabilities.h
drivers/net/intel/iavf/iavf_log.h renamed from drivers/net/iavf/iavf_log.h +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_log.h
rename to drivers/net/intel/iavf/iavf_log.h
drivers/net/intel/iavf/iavf_rxtx.c renamed from drivers/net/iavf/iavf_rxtx.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_rxtx.c
rename to drivers/net/intel/iavf/iavf_rxtx.c
drivers/net/intel/iavf/iavf_rxtx.h renamed from drivers/net/iavf/iavf_rxtx.h +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_rxtx.h
rename to drivers/net/intel/iavf/iavf_rxtx.h
drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c renamed from drivers/net/iavf/iavf_rxtx_vec_avx2.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_rxtx_vec_avx2.c
rename to drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c
drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c renamed from drivers/net/iavf/iavf_rxtx_vec_avx512.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_rxtx_vec_avx512.c
rename to drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c
drivers/net/intel/iavf/iavf_rxtx_vec_common.h renamed from drivers/net/iavf/iavf_rxtx_vec_common.h +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_rxtx_vec_common.h
rename to drivers/net/intel/iavf/iavf_rxtx_vec_common.h
drivers/net/intel/iavf/iavf_rxtx_vec_neon.c renamed from drivers/net/iavf/iavf_rxtx_vec_neon.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_rxtx_vec_neon.c
rename to drivers/net/intel/iavf/iavf_rxtx_vec_neon.c
drivers/net/intel/iavf/iavf_rxtx_vec_sse.c renamed from drivers/net/iavf/iavf_rxtx_vec_sse.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_rxtx_vec_sse.c
rename to drivers/net/intel/iavf/iavf_rxtx_vec_sse.c
drivers/net/intel/iavf/iavf_testpmd.c renamed from drivers/net/iavf/iavf_testpmd.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_testpmd.c
rename to drivers/net/intel/iavf/iavf_testpmd.c
drivers/net/intel/iavf/iavf_tm.c renamed from drivers/net/iavf/iavf_tm.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_tm.c
rename to drivers/net/intel/iavf/iavf_tm.c
drivers/net/intel/iavf/iavf_vchnl.c renamed from drivers/net/iavf/iavf_vchnl.c +0 -0
similarity index 100%
rename from drivers/net/iavf/iavf_vchnl.c
rename to drivers/net/intel/iavf/iavf_vchnl.c
drivers/net/intel/iavf/meson.build renamed from drivers/net/iavf/meson.build +2 -5
similarity index 86%
rename from drivers/net/iavf/meson.build
rename to drivers/net/intel/iavf/meson.build
index b48bb83438..08b51b2859 100644
@@ -5,8 +5,6 @@ if dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0
     subdir_done()
 endif
 
-includes += include_directories('../../common/iavf')
-
 testpmd_sources = files('iavf_testpmd.c')
 
 deps += ['common_iavf', 'security', 'cryptodev']
@@ -32,7 +30,7 @@ if arch_subdir == 'x86'
 
     iavf_avx2_lib = static_library('iavf_avx2_lib',
             'iavf_rxtx_vec_avx2.c',
-            dependencies: [static_rte_ethdev, static_rte_kvargs, static_rte_hash],
+            dependencies: [static_rte_ethdev, static_rte_common_iavf],
             include_directories: includes,
             c_args: [cflags, '-mavx2'])
     objs += iavf_avx2_lib.extract_objects('iavf_rxtx_vec_avx2.c')
@@ -45,8 +43,7 @@ if arch_subdir == 'x86'
         endif
         iavf_avx512_lib = static_library('iavf_avx512_lib',
                 'iavf_rxtx_vec_avx512.c',
-                dependencies: [static_rte_ethdev,
-                    static_rte_kvargs, static_rte_hash],
+                dependencies: [static_rte_ethdev, static_rte_common_iavf],
                 include_directories: includes,
                 c_args: avx512_args)
         objs += iavf_avx512_lib.extract_objects('iavf_rxtx_vec_avx512.c')
drivers/net/intel/iavf/rte_pmd_iavf.h renamed from drivers/net/iavf/rte_pmd_iavf.h +0 -0
similarity index 100%
rename from drivers/net/iavf/rte_pmd_iavf.h
rename to drivers/net/intel/iavf/rte_pmd_iavf.h
drivers/net/intel/iavf/version.map renamed from drivers/net/iavf/version.map +0 -0
similarity index 100%
rename from drivers/net/iavf/version.map
rename to drivers/net/intel/iavf/version.map
drivers/net/intel/ice/base/README renamed from drivers/net/ice/base/README +0 -0
similarity index 100%
rename from drivers/net/ice/base/README
rename to drivers/net/intel/ice/base/README
drivers/net/intel/ice/base/ice_acl.c renamed from drivers/net/ice/base/ice_acl.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_acl.c
rename to drivers/net/intel/ice/base/ice_acl.c
drivers/net/intel/ice/base/ice_acl.h renamed from drivers/net/ice/base/ice_acl.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_acl.h
rename to drivers/net/intel/ice/base/ice_acl.h
drivers/net/intel/ice/base/ice_acl_ctrl.c renamed from drivers/net/ice/base/ice_acl_ctrl.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_acl_ctrl.c
rename to drivers/net/intel/ice/base/ice_acl_ctrl.c
drivers/net/intel/ice/base/ice_adminq_cmd.h renamed from drivers/net/ice/base/ice_adminq_cmd.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_adminq_cmd.h
rename to drivers/net/intel/ice/base/ice_adminq_cmd.h
drivers/net/intel/ice/base/ice_alloc.h renamed from drivers/net/ice/base/ice_alloc.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_alloc.h
rename to drivers/net/intel/ice/base/ice_alloc.h
drivers/net/intel/ice/base/ice_bitops.h renamed from drivers/net/ice/base/ice_bitops.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_bitops.h
rename to drivers/net/intel/ice/base/ice_bitops.h
drivers/net/intel/ice/base/ice_bst_tcam.c renamed from drivers/net/ice/base/ice_bst_tcam.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_bst_tcam.c
rename to drivers/net/intel/ice/base/ice_bst_tcam.c
drivers/net/intel/ice/base/ice_bst_tcam.h renamed from drivers/net/ice/base/ice_bst_tcam.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_bst_tcam.h
rename to drivers/net/intel/ice/base/ice_bst_tcam.h
drivers/net/intel/ice/base/ice_cgu_regs.h renamed from drivers/net/ice/base/ice_cgu_regs.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_cgu_regs.h
rename to drivers/net/intel/ice/base/ice_cgu_regs.h
drivers/net/intel/ice/base/ice_common.c renamed from drivers/net/ice/base/ice_common.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_common.c
rename to drivers/net/intel/ice/base/ice_common.c
drivers/net/intel/ice/base/ice_common.h renamed from drivers/net/ice/base/ice_common.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_common.h
rename to drivers/net/intel/ice/base/ice_common.h
drivers/net/intel/ice/base/ice_controlq.c renamed from drivers/net/ice/base/ice_controlq.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_controlq.c
rename to drivers/net/intel/ice/base/ice_controlq.c
drivers/net/intel/ice/base/ice_controlq.h renamed from drivers/net/ice/base/ice_controlq.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_controlq.h
rename to drivers/net/intel/ice/base/ice_controlq.h
drivers/net/intel/ice/base/ice_dcb.c renamed from drivers/net/ice/base/ice_dcb.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_dcb.c
rename to drivers/net/intel/ice/base/ice_dcb.c
drivers/net/intel/ice/base/ice_dcb.h renamed from drivers/net/ice/base/ice_dcb.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_dcb.h
rename to drivers/net/intel/ice/base/ice_dcb.h
drivers/net/intel/ice/base/ice_ddp.c renamed from drivers/net/ice/base/ice_ddp.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_ddp.c
rename to drivers/net/intel/ice/base/ice_ddp.c
drivers/net/intel/ice/base/ice_ddp.h renamed from drivers/net/ice/base/ice_ddp.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_ddp.h
rename to drivers/net/intel/ice/base/ice_ddp.h
drivers/net/intel/ice/base/ice_defs.h renamed from drivers/net/ice/base/ice_defs.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_defs.h
rename to drivers/net/intel/ice/base/ice_defs.h
drivers/net/intel/ice/base/ice_devids.h renamed from drivers/net/ice/base/ice_devids.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_devids.h
rename to drivers/net/intel/ice/base/ice_devids.h
drivers/net/intel/ice/base/ice_fdir.c renamed from drivers/net/ice/base/ice_fdir.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_fdir.c
rename to drivers/net/intel/ice/base/ice_fdir.c
drivers/net/intel/ice/base/ice_fdir.h renamed from drivers/net/ice/base/ice_fdir.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_fdir.h
rename to drivers/net/intel/ice/base/ice_fdir.h
drivers/net/intel/ice/base/ice_flex_pipe.c renamed from drivers/net/ice/base/ice_flex_pipe.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_flex_pipe.c
rename to drivers/net/intel/ice/base/ice_flex_pipe.c
drivers/net/intel/ice/base/ice_flex_pipe.h renamed from drivers/net/ice/base/ice_flex_pipe.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_flex_pipe.h
rename to drivers/net/intel/ice/base/ice_flex_pipe.h
drivers/net/intel/ice/base/ice_flex_type.h renamed from drivers/net/ice/base/ice_flex_type.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_flex_type.h
rename to drivers/net/intel/ice/base/ice_flex_type.h
drivers/net/intel/ice/base/ice_flg_rd.c renamed from drivers/net/ice/base/ice_flg_rd.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_flg_rd.c
rename to drivers/net/intel/ice/base/ice_flg_rd.c
drivers/net/intel/ice/base/ice_flg_rd.h renamed from drivers/net/ice/base/ice_flg_rd.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_flg_rd.h
rename to drivers/net/intel/ice/base/ice_flg_rd.h
drivers/net/intel/ice/base/ice_flow.c renamed from drivers/net/ice/base/ice_flow.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_flow.c
rename to drivers/net/intel/ice/base/ice_flow.c
drivers/net/intel/ice/base/ice_flow.h renamed from drivers/net/ice/base/ice_flow.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_flow.h
rename to drivers/net/intel/ice/base/ice_flow.h
drivers/net/intel/ice/base/ice_fwlog.c renamed from drivers/net/ice/base/ice_fwlog.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_fwlog.c
rename to drivers/net/intel/ice/base/ice_fwlog.c
drivers/net/intel/ice/base/ice_fwlog.h renamed from drivers/net/ice/base/ice_fwlog.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_fwlog.h
rename to drivers/net/intel/ice/base/ice_fwlog.h
drivers/net/intel/ice/base/ice_hw_autogen.h renamed from drivers/net/ice/base/ice_hw_autogen.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_hw_autogen.h
rename to drivers/net/intel/ice/base/ice_hw_autogen.h
drivers/net/intel/ice/base/ice_imem.c renamed from drivers/net/ice/base/ice_imem.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_imem.c
rename to drivers/net/intel/ice/base/ice_imem.c
drivers/net/intel/ice/base/ice_imem.h renamed from drivers/net/ice/base/ice_imem.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_imem.h
rename to drivers/net/intel/ice/base/ice_imem.h
drivers/net/intel/ice/base/ice_lan_tx_rx.h renamed from drivers/net/ice/base/ice_lan_tx_rx.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_lan_tx_rx.h
rename to drivers/net/intel/ice/base/ice_lan_tx_rx.h
drivers/net/intel/ice/base/ice_metainit.c renamed from drivers/net/ice/base/ice_metainit.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_metainit.c
rename to drivers/net/intel/ice/base/ice_metainit.c
drivers/net/intel/ice/base/ice_metainit.h renamed from drivers/net/ice/base/ice_metainit.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_metainit.h
rename to drivers/net/intel/ice/base/ice_metainit.h
drivers/net/intel/ice/base/ice_mk_grp.c renamed from drivers/net/ice/base/ice_mk_grp.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_mk_grp.c
rename to drivers/net/intel/ice/base/ice_mk_grp.c
drivers/net/intel/ice/base/ice_mk_grp.h renamed from drivers/net/ice/base/ice_mk_grp.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_mk_grp.h
rename to drivers/net/intel/ice/base/ice_mk_grp.h
drivers/net/intel/ice/base/ice_nvm.c renamed from drivers/net/ice/base/ice_nvm.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_nvm.c
rename to drivers/net/intel/ice/base/ice_nvm.c
drivers/net/intel/ice/base/ice_nvm.h renamed from drivers/net/ice/base/ice_nvm.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_nvm.h
rename to drivers/net/intel/ice/base/ice_nvm.h
drivers/net/intel/ice/base/ice_osdep.h renamed from drivers/net/ice/base/ice_osdep.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_osdep.h
rename to drivers/net/intel/ice/base/ice_osdep.h
drivers/net/intel/ice/base/ice_parser.c renamed from drivers/net/ice/base/ice_parser.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_parser.c
rename to drivers/net/intel/ice/base/ice_parser.c
drivers/net/intel/ice/base/ice_parser.h renamed from drivers/net/ice/base/ice_parser.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_parser.h
rename to drivers/net/intel/ice/base/ice_parser.h
drivers/net/intel/ice/base/ice_parser_rt.c renamed from drivers/net/ice/base/ice_parser_rt.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_parser_rt.c
rename to drivers/net/intel/ice/base/ice_parser_rt.c
drivers/net/intel/ice/base/ice_parser_rt.h renamed from drivers/net/ice/base/ice_parser_rt.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_parser_rt.h
rename to drivers/net/intel/ice/base/ice_parser_rt.h
drivers/net/intel/ice/base/ice_parser_util.h renamed from drivers/net/ice/base/ice_parser_util.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_parser_util.h
rename to drivers/net/intel/ice/base/ice_parser_util.h
drivers/net/intel/ice/base/ice_pg_cam.c renamed from drivers/net/ice/base/ice_pg_cam.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_pg_cam.c
rename to drivers/net/intel/ice/base/ice_pg_cam.c
drivers/net/intel/ice/base/ice_pg_cam.h renamed from drivers/net/ice/base/ice_pg_cam.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_pg_cam.h
rename to drivers/net/intel/ice/base/ice_pg_cam.h
drivers/net/intel/ice/base/ice_phy_regs.h renamed from drivers/net/ice/base/ice_phy_regs.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_phy_regs.h
rename to drivers/net/intel/ice/base/ice_phy_regs.h
drivers/net/intel/ice/base/ice_proto_grp.c renamed from drivers/net/ice/base/ice_proto_grp.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_proto_grp.c
rename to drivers/net/intel/ice/base/ice_proto_grp.c
drivers/net/intel/ice/base/ice_proto_grp.h renamed from drivers/net/ice/base/ice_proto_grp.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_proto_grp.h
rename to drivers/net/intel/ice/base/ice_proto_grp.h
drivers/net/intel/ice/base/ice_protocol_type.h renamed from drivers/net/ice/base/ice_protocol_type.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_protocol_type.h
rename to drivers/net/intel/ice/base/ice_protocol_type.h
drivers/net/intel/ice/base/ice_ptp_consts.h renamed from drivers/net/ice/base/ice_ptp_consts.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_ptp_consts.h
rename to drivers/net/intel/ice/base/ice_ptp_consts.h
drivers/net/intel/ice/base/ice_ptp_hw.c renamed from drivers/net/ice/base/ice_ptp_hw.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_ptp_hw.c
rename to drivers/net/intel/ice/base/ice_ptp_hw.c
drivers/net/intel/ice/base/ice_ptp_hw.h renamed from drivers/net/ice/base/ice_ptp_hw.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_ptp_hw.h
rename to drivers/net/intel/ice/base/ice_ptp_hw.h
drivers/net/intel/ice/base/ice_ptype_mk.c renamed from drivers/net/ice/base/ice_ptype_mk.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_ptype_mk.c
rename to drivers/net/intel/ice/base/ice_ptype_mk.c
drivers/net/intel/ice/base/ice_ptype_mk.h renamed from drivers/net/ice/base/ice_ptype_mk.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_ptype_mk.h
rename to drivers/net/intel/ice/base/ice_ptype_mk.h
drivers/net/intel/ice/base/ice_sbq_cmd.h renamed from drivers/net/ice/base/ice_sbq_cmd.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_sbq_cmd.h
rename to drivers/net/intel/ice/base/ice_sbq_cmd.h
drivers/net/intel/ice/base/ice_sched.c renamed from drivers/net/ice/base/ice_sched.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_sched.c
rename to drivers/net/intel/ice/base/ice_sched.c
drivers/net/intel/ice/base/ice_sched.h renamed from drivers/net/ice/base/ice_sched.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_sched.h
rename to drivers/net/intel/ice/base/ice_sched.h
drivers/net/intel/ice/base/ice_status.h renamed from drivers/net/ice/base/ice_status.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_status.h
rename to drivers/net/intel/ice/base/ice_status.h
drivers/net/intel/ice/base/ice_switch.c renamed from drivers/net/ice/base/ice_switch.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_switch.c
rename to drivers/net/intel/ice/base/ice_switch.c
drivers/net/intel/ice/base/ice_switch.h renamed from drivers/net/ice/base/ice_switch.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_switch.h
rename to drivers/net/intel/ice/base/ice_switch.h
drivers/net/intel/ice/base/ice_tmatch.h renamed from drivers/net/ice/base/ice_tmatch.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_tmatch.h
rename to drivers/net/intel/ice/base/ice_tmatch.h
drivers/net/intel/ice/base/ice_type.h renamed from drivers/net/ice/base/ice_type.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_type.h
rename to drivers/net/intel/ice/base/ice_type.h
drivers/net/intel/ice/base/ice_vf_mbx.c renamed from drivers/net/ice/base/ice_vf_mbx.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_vf_mbx.c
rename to drivers/net/intel/ice/base/ice_vf_mbx.c
drivers/net/intel/ice/base/ice_vf_mbx.h renamed from drivers/net/ice/base/ice_vf_mbx.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_vf_mbx.h
rename to drivers/net/intel/ice/base/ice_vf_mbx.h
drivers/net/intel/ice/base/ice_vlan_mode.c renamed from drivers/net/ice/base/ice_vlan_mode.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_vlan_mode.c
rename to drivers/net/intel/ice/base/ice_vlan_mode.c
drivers/net/intel/ice/base/ice_vlan_mode.h renamed from drivers/net/ice/base/ice_vlan_mode.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_vlan_mode.h
rename to drivers/net/intel/ice/base/ice_vlan_mode.h
drivers/net/intel/ice/base/ice_xlt_kb.c renamed from drivers/net/ice/base/ice_xlt_kb.c +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_xlt_kb.c
rename to drivers/net/intel/ice/base/ice_xlt_kb.c
drivers/net/intel/ice/base/ice_xlt_kb.h renamed from drivers/net/ice/base/ice_xlt_kb.h +0 -0
similarity index 100%
rename from drivers/net/ice/base/ice_xlt_kb.h
rename to drivers/net/intel/ice/base/ice_xlt_kb.h
drivers/net/intel/ice/base/meson.build renamed from drivers/net/ice/base/meson.build +0 -0
similarity index 100%
rename from drivers/net/ice/base/meson.build
rename to drivers/net/intel/ice/base/meson.build
drivers/net/intel/ice/ice_acl_filter.c renamed from drivers/net/ice/ice_acl_filter.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_acl_filter.c
rename to drivers/net/intel/ice/ice_acl_filter.c
drivers/net/intel/ice/ice_dcf.c renamed from drivers/net/ice/ice_dcf.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_dcf.c
rename to drivers/net/intel/ice/ice_dcf.c
drivers/net/intel/ice/ice_dcf.h renamed from drivers/net/ice/ice_dcf.h +0 -0
similarity index 100%
rename from drivers/net/ice/ice_dcf.h
rename to drivers/net/intel/ice/ice_dcf.h
drivers/net/intel/ice/ice_dcf_ethdev.c renamed from drivers/net/ice/ice_dcf_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_dcf_ethdev.c
rename to drivers/net/intel/ice/ice_dcf_ethdev.c
drivers/net/intel/ice/ice_dcf_ethdev.h renamed from drivers/net/ice/ice_dcf_ethdev.h +0 -0
similarity index 100%
rename from drivers/net/ice/ice_dcf_ethdev.h
rename to drivers/net/intel/ice/ice_dcf_ethdev.h
drivers/net/intel/ice/ice_dcf_parent.c renamed from drivers/net/ice/ice_dcf_parent.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_dcf_parent.c
rename to drivers/net/intel/ice/ice_dcf_parent.c
drivers/net/intel/ice/ice_dcf_sched.c renamed from drivers/net/ice/ice_dcf_sched.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_dcf_sched.c
rename to drivers/net/intel/ice/ice_dcf_sched.c
drivers/net/intel/ice/ice_dcf_vf_representor.c renamed from drivers/net/ice/ice_dcf_vf_representor.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_dcf_vf_representor.c
rename to drivers/net/intel/ice/ice_dcf_vf_representor.c
drivers/net/intel/ice/ice_diagnose.c renamed from drivers/net/ice/ice_diagnose.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_diagnose.c
rename to drivers/net/intel/ice/ice_diagnose.c
drivers/net/intel/ice/ice_ethdev.c renamed from drivers/net/ice/ice_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_ethdev.c
rename to drivers/net/intel/ice/ice_ethdev.c
drivers/net/intel/ice/ice_ethdev.h renamed from drivers/net/ice/ice_ethdev.h +0 -0
similarity index 100%
rename from drivers/net/ice/ice_ethdev.h
rename to drivers/net/intel/ice/ice_ethdev.h
drivers/net/intel/ice/ice_fdir_filter.c renamed from drivers/net/ice/ice_fdir_filter.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_fdir_filter.c
rename to drivers/net/intel/ice/ice_fdir_filter.c
drivers/net/intel/ice/ice_generic_flow.c renamed from drivers/net/ice/ice_generic_flow.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_generic_flow.c
rename to drivers/net/intel/ice/ice_generic_flow.c
drivers/net/intel/ice/ice_generic_flow.h renamed from drivers/net/ice/ice_generic_flow.h +0 -0
similarity index 100%
rename from drivers/net/ice/ice_generic_flow.h
rename to drivers/net/intel/ice/ice_generic_flow.h
drivers/net/intel/ice/ice_hash.c renamed from drivers/net/ice/ice_hash.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_hash.c
rename to drivers/net/intel/ice/ice_hash.c
drivers/net/intel/ice/ice_logs.h renamed from drivers/net/ice/ice_logs.h +0 -0
similarity index 100%
rename from drivers/net/ice/ice_logs.h
rename to drivers/net/intel/ice/ice_logs.h
drivers/net/intel/ice/ice_rxtx.c renamed from drivers/net/ice/ice_rxtx.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_rxtx.c
rename to drivers/net/intel/ice/ice_rxtx.c
drivers/net/intel/ice/ice_rxtx.h renamed from drivers/net/ice/ice_rxtx.h +0 -0
similarity index 100%
rename from drivers/net/ice/ice_rxtx.h
rename to drivers/net/intel/ice/ice_rxtx.h
drivers/net/intel/ice/ice_rxtx_common_avx.h renamed from drivers/net/ice/ice_rxtx_common_avx.h +0 -0
similarity index 100%
rename from drivers/net/ice/ice_rxtx_common_avx.h
rename to drivers/net/intel/ice/ice_rxtx_common_avx.h
drivers/net/intel/ice/ice_rxtx_vec_avx2.c renamed from drivers/net/ice/ice_rxtx_vec_avx2.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_rxtx_vec_avx2.c
rename to drivers/net/intel/ice/ice_rxtx_vec_avx2.c
drivers/net/intel/ice/ice_rxtx_vec_avx512.c renamed from drivers/net/ice/ice_rxtx_vec_avx512.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_rxtx_vec_avx512.c
rename to drivers/net/intel/ice/ice_rxtx_vec_avx512.c
drivers/net/intel/ice/ice_rxtx_vec_common.h renamed from drivers/net/ice/ice_rxtx_vec_common.h +0 -0
similarity index 100%
rename from drivers/net/ice/ice_rxtx_vec_common.h
rename to drivers/net/intel/ice/ice_rxtx_vec_common.h
drivers/net/intel/ice/ice_rxtx_vec_sse.c renamed from drivers/net/ice/ice_rxtx_vec_sse.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_rxtx_vec_sse.c
rename to drivers/net/intel/ice/ice_rxtx_vec_sse.c
drivers/net/intel/ice/ice_switch_filter.c renamed from drivers/net/ice/ice_switch_filter.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_switch_filter.c
rename to drivers/net/intel/ice/ice_switch_filter.c
drivers/net/intel/ice/ice_testpmd.c renamed from drivers/net/ice/ice_testpmd.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_testpmd.c
rename to drivers/net/intel/ice/ice_testpmd.c
drivers/net/intel/ice/ice_tm.c renamed from drivers/net/ice/ice_tm.c +0 -0
similarity index 100%
rename from drivers/net/ice/ice_tm.c
rename to drivers/net/intel/ice/ice_tm.c
drivers/net/intel/ice/meson.build renamed from drivers/net/ice/meson.build +1 -1
similarity index 96%
rename from drivers/net/ice/meson.build
rename to drivers/net/intel/ice/meson.build
index 1c9dc0cc6d..beaf21e176 100644
@@ -19,7 +19,7 @@ sources = files(
 testpmd_sources = files('ice_testpmd.c')
 
 deps += ['hash', 'net', 'common_iavf']
-includes += include_directories('base', '../../common/iavf')
+includes += include_directories('base')
 
 if arch_subdir == 'x86'
     sources += files('ice_rxtx_vec_sse.c')
drivers/net/intel/ice/version.map renamed from drivers/net/ice/version.map +0 -0
similarity index 100%
rename from drivers/net/ice/version.map
rename to drivers/net/intel/ice/version.map
drivers/net/intel/idpf/idpf_ethdev.c renamed from drivers/net/idpf/idpf_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/idpf/idpf_ethdev.c
rename to drivers/net/intel/idpf/idpf_ethdev.c
drivers/net/intel/idpf/idpf_ethdev.h renamed from drivers/net/idpf/idpf_ethdev.h +0 -0
similarity index 100%
rename from drivers/net/idpf/idpf_ethdev.h
rename to drivers/net/intel/idpf/idpf_ethdev.h
drivers/net/intel/idpf/idpf_logs.h renamed from drivers/net/idpf/idpf_logs.h +0 -0
similarity index 100%
rename from drivers/net/idpf/idpf_logs.h
rename to drivers/net/intel/idpf/idpf_logs.h
drivers/net/intel/idpf/idpf_rxtx.c renamed from drivers/net/idpf/idpf_rxtx.c +0 -0
similarity index 100%
rename from drivers/net/idpf/idpf_rxtx.c
rename to drivers/net/intel/idpf/idpf_rxtx.c
drivers/net/intel/idpf/idpf_rxtx.h renamed from drivers/net/idpf/idpf_rxtx.h +0 -0
similarity index 100%
rename from drivers/net/idpf/idpf_rxtx.h
rename to drivers/net/intel/idpf/idpf_rxtx.h
drivers/net/intel/idpf/idpf_rxtx_vec_common.h renamed from drivers/net/idpf/idpf_rxtx_vec_common.h +0 -0
similarity index 100%
rename from drivers/net/idpf/idpf_rxtx_vec_common.h
rename to drivers/net/intel/idpf/idpf_rxtx_vec_common.h
drivers/net/intel/idpf/meson.build renamed from drivers/net/idpf/meson.build +0 -0
similarity index 100%
rename from drivers/net/idpf/meson.build
rename to drivers/net/intel/idpf/meson.build
drivers/net/intel/igc/base/README renamed from drivers/net/igc/base/README +0 -0
similarity index 100%
rename from drivers/net/igc/base/README
rename to drivers/net/intel/igc/base/README
drivers/net/intel/igc/base/igc_82571.h renamed from drivers/net/igc/base/igc_82571.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_82571.h
rename to drivers/net/intel/igc/base/igc_82571.h
drivers/net/intel/igc/base/igc_82575.h renamed from drivers/net/igc/base/igc_82575.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_82575.h
rename to drivers/net/intel/igc/base/igc_82575.h
drivers/net/intel/igc/base/igc_api.c renamed from drivers/net/igc/base/igc_api.c +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_api.c
rename to drivers/net/intel/igc/base/igc_api.c
drivers/net/intel/igc/base/igc_api.h renamed from drivers/net/igc/base/igc_api.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_api.h
rename to drivers/net/intel/igc/base/igc_api.h
drivers/net/intel/igc/base/igc_base.c renamed from drivers/net/igc/base/igc_base.c +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_base.c
rename to drivers/net/intel/igc/base/igc_base.c
drivers/net/intel/igc/base/igc_base.h renamed from drivers/net/igc/base/igc_base.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_base.h
rename to drivers/net/intel/igc/base/igc_base.h
drivers/net/intel/igc/base/igc_defines.h renamed from drivers/net/igc/base/igc_defines.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_defines.h
rename to drivers/net/intel/igc/base/igc_defines.h
drivers/net/intel/igc/base/igc_hw.h renamed from drivers/net/igc/base/igc_hw.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_hw.h
rename to drivers/net/intel/igc/base/igc_hw.h
drivers/net/intel/igc/base/igc_i225.c renamed from drivers/net/igc/base/igc_i225.c +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_i225.c
rename to drivers/net/intel/igc/base/igc_i225.c
drivers/net/intel/igc/base/igc_i225.h renamed from drivers/net/igc/base/igc_i225.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_i225.h
rename to drivers/net/intel/igc/base/igc_i225.h
drivers/net/intel/igc/base/igc_ich8lan.h renamed from drivers/net/igc/base/igc_ich8lan.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_ich8lan.h
rename to drivers/net/intel/igc/base/igc_ich8lan.h
drivers/net/intel/igc/base/igc_mac.c renamed from drivers/net/igc/base/igc_mac.c +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_mac.c
rename to drivers/net/intel/igc/base/igc_mac.c
drivers/net/intel/igc/base/igc_mac.h renamed from drivers/net/igc/base/igc_mac.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_mac.h
rename to drivers/net/intel/igc/base/igc_mac.h
drivers/net/intel/igc/base/igc_manage.c renamed from drivers/net/igc/base/igc_manage.c +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_manage.c
rename to drivers/net/intel/igc/base/igc_manage.c
drivers/net/intel/igc/base/igc_manage.h renamed from drivers/net/igc/base/igc_manage.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_manage.h
rename to drivers/net/intel/igc/base/igc_manage.h
drivers/net/intel/igc/base/igc_nvm.c renamed from drivers/net/igc/base/igc_nvm.c +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_nvm.c
rename to drivers/net/intel/igc/base/igc_nvm.c
drivers/net/intel/igc/base/igc_nvm.h renamed from drivers/net/igc/base/igc_nvm.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_nvm.h
rename to drivers/net/intel/igc/base/igc_nvm.h
drivers/net/intel/igc/base/igc_osdep.c renamed from drivers/net/igc/base/igc_osdep.c +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_osdep.c
rename to drivers/net/intel/igc/base/igc_osdep.c
drivers/net/intel/igc/base/igc_osdep.h renamed from drivers/net/igc/base/igc_osdep.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_osdep.h
rename to drivers/net/intel/igc/base/igc_osdep.h
drivers/net/intel/igc/base/igc_phy.c renamed from drivers/net/igc/base/igc_phy.c +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_phy.c
rename to drivers/net/intel/igc/base/igc_phy.c
drivers/net/intel/igc/base/igc_phy.h renamed from drivers/net/igc/base/igc_phy.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_phy.h
rename to drivers/net/intel/igc/base/igc_phy.h
drivers/net/intel/igc/base/igc_regs.h renamed from drivers/net/igc/base/igc_regs.h +0 -0
similarity index 100%
rename from drivers/net/igc/base/igc_regs.h
rename to drivers/net/intel/igc/base/igc_regs.h
drivers/net/intel/igc/base/meson.build renamed from drivers/net/igc/base/meson.build +0 -0
similarity index 100%
rename from drivers/net/igc/base/meson.build
rename to drivers/net/intel/igc/base/meson.build
drivers/net/intel/igc/igc_ethdev.c renamed from drivers/net/igc/igc_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/igc/igc_ethdev.c
rename to drivers/net/intel/igc/igc_ethdev.c
drivers/net/intel/igc/igc_ethdev.h renamed from drivers/net/igc/igc_ethdev.h +0 -0
similarity index 100%
rename from drivers/net/igc/igc_ethdev.h
rename to drivers/net/intel/igc/igc_ethdev.h
drivers/net/intel/igc/igc_filter.c renamed from drivers/net/igc/igc_filter.c +0 -0
similarity index 100%
rename from drivers/net/igc/igc_filter.c
rename to drivers/net/intel/igc/igc_filter.c
drivers/net/intel/igc/igc_filter.h renamed from drivers/net/igc/igc_filter.h +0 -0
similarity index 100%
rename from drivers/net/igc/igc_filter.h
rename to drivers/net/intel/igc/igc_filter.h
drivers/net/intel/igc/igc_flow.c renamed from drivers/net/igc/igc_flow.c +0 -0
similarity index 100%
rename from drivers/net/igc/igc_flow.c
rename to drivers/net/intel/igc/igc_flow.c
drivers/net/intel/igc/igc_flow.h renamed from drivers/net/igc/igc_flow.h +0 -0
similarity index 100%
rename from drivers/net/igc/igc_flow.h
rename to drivers/net/intel/igc/igc_flow.h
drivers/net/intel/igc/igc_logs.c renamed from drivers/net/igc/igc_logs.c +0 -0
similarity index 100%
rename from drivers/net/igc/igc_logs.c
rename to drivers/net/intel/igc/igc_logs.c
drivers/net/intel/igc/igc_logs.h renamed from drivers/net/igc/igc_logs.h +0 -0
similarity index 100%
rename from drivers/net/igc/igc_logs.h
rename to drivers/net/intel/igc/igc_logs.h
drivers/net/intel/igc/igc_txrx.c renamed from drivers/net/igc/igc_txrx.c +0 -0
similarity index 100%
rename from drivers/net/igc/igc_txrx.c
rename to drivers/net/intel/igc/igc_txrx.c
drivers/net/intel/igc/igc_txrx.h renamed from drivers/net/igc/igc_txrx.h +0 -0
similarity index 100%
rename from drivers/net/igc/igc_txrx.h
rename to drivers/net/intel/igc/igc_txrx.h
drivers/net/intel/igc/meson.build renamed from drivers/net/igc/meson.build +0 -0
similarity index 100%
rename from drivers/net/igc/meson.build
rename to drivers/net/intel/igc/meson.build
drivers/net/intel/ipn3ke/ipn3ke_ethdev.c renamed from drivers/net/ipn3ke/ipn3ke_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/ipn3ke/ipn3ke_ethdev.c
rename to drivers/net/intel/ipn3ke/ipn3ke_ethdev.c
drivers/net/intel/ipn3ke/ipn3ke_ethdev.h renamed from drivers/net/ipn3ke/ipn3ke_ethdev.h +0 -0
similarity index 100%
rename from drivers/net/ipn3ke/ipn3ke_ethdev.h
rename to drivers/net/intel/ipn3ke/ipn3ke_ethdev.h
drivers/net/intel/ipn3ke/ipn3ke_flow.c renamed from drivers/net/ipn3ke/ipn3ke_flow.c +0 -0
similarity index 100%
rename from drivers/net/ipn3ke/ipn3ke_flow.c
rename to drivers/net/intel/ipn3ke/ipn3ke_flow.c
drivers/net/intel/ipn3ke/ipn3ke_flow.h renamed from drivers/net/ipn3ke/ipn3ke_flow.h +0 -0
similarity index 100%
rename from drivers/net/ipn3ke/ipn3ke_flow.h
rename to drivers/net/intel/ipn3ke/ipn3ke_flow.h
drivers/net/intel/ipn3ke/ipn3ke_logs.h renamed from drivers/net/ipn3ke/ipn3ke_logs.h +0 -0
similarity index 100%
rename from drivers/net/ipn3ke/ipn3ke_logs.h
rename to drivers/net/intel/ipn3ke/ipn3ke_logs.h
drivers/net/intel/ipn3ke/ipn3ke_rawdev_api.h renamed from drivers/net/ipn3ke/ipn3ke_rawdev_api.h +0 -0
similarity index 100%
rename from drivers/net/ipn3ke/ipn3ke_rawdev_api.h
rename to drivers/net/intel/ipn3ke/ipn3ke_rawdev_api.h
drivers/net/intel/ipn3ke/ipn3ke_representor.c renamed from drivers/net/ipn3ke/ipn3ke_representor.c +0 -0
similarity index 100%
rename from drivers/net/ipn3ke/ipn3ke_representor.c
rename to drivers/net/intel/ipn3ke/ipn3ke_representor.c
drivers/net/intel/ipn3ke/ipn3ke_tm.c renamed from drivers/net/ipn3ke/ipn3ke_tm.c +0 -0
similarity index 100%
rename from drivers/net/ipn3ke/ipn3ke_tm.c
rename to drivers/net/intel/ipn3ke/ipn3ke_tm.c
drivers/net/intel/ipn3ke/meson.build renamed from drivers/net/ipn3ke/meson.build +1 -1
similarity index 91%
rename from drivers/net/ipn3ke/meson.build
rename to drivers/net/intel/ipn3ke/meson.build
index 464bdbd8b6..23c4d36b4f 100644
@@ -21,7 +21,7 @@ if not has_libfdt
     subdir_done()
 endif
 
-includes += include_directories('../../raw/ifpga')
+includes += include_directories('../../../raw/ifpga')
 
 sources += files(
         'ipn3ke_ethdev.c',
drivers/net/intel/ipn3ke/version.map renamed from drivers/net/ipn3ke/version.map +0 -0
similarity index 100%
rename from drivers/net/ipn3ke/version.map
rename to drivers/net/intel/ipn3ke/version.map
drivers/net/intel/ixgbe/base/README renamed from drivers/net/ixgbe/base/README +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/README
rename to drivers/net/intel/ixgbe/base/README
drivers/net/intel/ixgbe/base/ixgbe_82598.c renamed from drivers/net/ixgbe/base/ixgbe_82598.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_82598.c
rename to drivers/net/intel/ixgbe/base/ixgbe_82598.c
drivers/net/intel/ixgbe/base/ixgbe_82598.h renamed from drivers/net/ixgbe/base/ixgbe_82598.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_82598.h
rename to drivers/net/intel/ixgbe/base/ixgbe_82598.h
drivers/net/intel/ixgbe/base/ixgbe_82599.c renamed from drivers/net/ixgbe/base/ixgbe_82599.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_82599.c
rename to drivers/net/intel/ixgbe/base/ixgbe_82599.c
drivers/net/intel/ixgbe/base/ixgbe_82599.h renamed from drivers/net/ixgbe/base/ixgbe_82599.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_82599.h
rename to drivers/net/intel/ixgbe/base/ixgbe_82599.h
drivers/net/intel/ixgbe/base/ixgbe_api.c renamed from drivers/net/ixgbe/base/ixgbe_api.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_api.c
rename to drivers/net/intel/ixgbe/base/ixgbe_api.c
drivers/net/intel/ixgbe/base/ixgbe_api.h renamed from drivers/net/ixgbe/base/ixgbe_api.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_api.h
rename to drivers/net/intel/ixgbe/base/ixgbe_api.h
drivers/net/intel/ixgbe/base/ixgbe_common.c renamed from drivers/net/ixgbe/base/ixgbe_common.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_common.c
rename to drivers/net/intel/ixgbe/base/ixgbe_common.c
drivers/net/intel/ixgbe/base/ixgbe_common.h renamed from drivers/net/ixgbe/base/ixgbe_common.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_common.h
rename to drivers/net/intel/ixgbe/base/ixgbe_common.h
drivers/net/intel/ixgbe/base/ixgbe_dcb.c renamed from drivers/net/ixgbe/base/ixgbe_dcb.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_dcb.c
rename to drivers/net/intel/ixgbe/base/ixgbe_dcb.c
drivers/net/intel/ixgbe/base/ixgbe_dcb.h renamed from drivers/net/ixgbe/base/ixgbe_dcb.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_dcb.h
rename to drivers/net/intel/ixgbe/base/ixgbe_dcb.h
drivers/net/intel/ixgbe/base/ixgbe_dcb_82598.c renamed from drivers/net/ixgbe/base/ixgbe_dcb_82598.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_dcb_82598.c
rename to drivers/net/intel/ixgbe/base/ixgbe_dcb_82598.c
drivers/net/intel/ixgbe/base/ixgbe_dcb_82598.h renamed from drivers/net/ixgbe/base/ixgbe_dcb_82598.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_dcb_82598.h
rename to drivers/net/intel/ixgbe/base/ixgbe_dcb_82598.h
drivers/net/intel/ixgbe/base/ixgbe_dcb_82599.c renamed from drivers/net/ixgbe/base/ixgbe_dcb_82599.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_dcb_82599.c
rename to drivers/net/intel/ixgbe/base/ixgbe_dcb_82599.c
drivers/net/intel/ixgbe/base/ixgbe_dcb_82599.h renamed from drivers/net/ixgbe/base/ixgbe_dcb_82599.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_dcb_82599.h
rename to drivers/net/intel/ixgbe/base/ixgbe_dcb_82599.h
drivers/net/intel/ixgbe/base/ixgbe_e610.c renamed from drivers/net/ixgbe/base/ixgbe_e610.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_e610.c
rename to drivers/net/intel/ixgbe/base/ixgbe_e610.c
drivers/net/intel/ixgbe/base/ixgbe_e610.h renamed from drivers/net/ixgbe/base/ixgbe_e610.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_e610.h
rename to drivers/net/intel/ixgbe/base/ixgbe_e610.h
drivers/net/intel/ixgbe/base/ixgbe_hv_vf.c renamed from drivers/net/ixgbe/base/ixgbe_hv_vf.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_hv_vf.c
rename to drivers/net/intel/ixgbe/base/ixgbe_hv_vf.c
drivers/net/intel/ixgbe/base/ixgbe_hv_vf.h renamed from drivers/net/ixgbe/base/ixgbe_hv_vf.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_hv_vf.h
rename to drivers/net/intel/ixgbe/base/ixgbe_hv_vf.h
drivers/net/intel/ixgbe/base/ixgbe_mbx.c renamed from drivers/net/ixgbe/base/ixgbe_mbx.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_mbx.c
rename to drivers/net/intel/ixgbe/base/ixgbe_mbx.c
drivers/net/intel/ixgbe/base/ixgbe_mbx.h renamed from drivers/net/ixgbe/base/ixgbe_mbx.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_mbx.h
rename to drivers/net/intel/ixgbe/base/ixgbe_mbx.h
drivers/net/intel/ixgbe/base/ixgbe_osdep.c renamed from drivers/net/ixgbe/base/ixgbe_osdep.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_osdep.c
rename to drivers/net/intel/ixgbe/base/ixgbe_osdep.c
drivers/net/intel/ixgbe/base/ixgbe_osdep.h renamed from drivers/net/ixgbe/base/ixgbe_osdep.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_osdep.h
rename to drivers/net/intel/ixgbe/base/ixgbe_osdep.h
drivers/net/intel/ixgbe/base/ixgbe_phy.c renamed from drivers/net/ixgbe/base/ixgbe_phy.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_phy.c
rename to drivers/net/intel/ixgbe/base/ixgbe_phy.c
drivers/net/intel/ixgbe/base/ixgbe_phy.h renamed from drivers/net/ixgbe/base/ixgbe_phy.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_phy.h
rename to drivers/net/intel/ixgbe/base/ixgbe_phy.h
drivers/net/intel/ixgbe/base/ixgbe_type.h renamed from drivers/net/ixgbe/base/ixgbe_type.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_type.h
rename to drivers/net/intel/ixgbe/base/ixgbe_type.h
drivers/net/intel/ixgbe/base/ixgbe_type_e610.h renamed from drivers/net/ixgbe/base/ixgbe_type_e610.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_type_e610.h
rename to drivers/net/intel/ixgbe/base/ixgbe_type_e610.h
drivers/net/intel/ixgbe/base/ixgbe_vf.c renamed from drivers/net/ixgbe/base/ixgbe_vf.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_vf.c
rename to drivers/net/intel/ixgbe/base/ixgbe_vf.c
drivers/net/intel/ixgbe/base/ixgbe_vf.h renamed from drivers/net/ixgbe/base/ixgbe_vf.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_vf.h
rename to drivers/net/intel/ixgbe/base/ixgbe_vf.h
drivers/net/intel/ixgbe/base/ixgbe_x540.c renamed from drivers/net/ixgbe/base/ixgbe_x540.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_x540.c
rename to drivers/net/intel/ixgbe/base/ixgbe_x540.c
drivers/net/intel/ixgbe/base/ixgbe_x540.h renamed from drivers/net/ixgbe/base/ixgbe_x540.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_x540.h
rename to drivers/net/intel/ixgbe/base/ixgbe_x540.h
drivers/net/intel/ixgbe/base/ixgbe_x550.c renamed from drivers/net/ixgbe/base/ixgbe_x550.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_x550.c
rename to drivers/net/intel/ixgbe/base/ixgbe_x550.c
drivers/net/intel/ixgbe/base/ixgbe_x550.h renamed from drivers/net/ixgbe/base/ixgbe_x550.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/ixgbe_x550.h
rename to drivers/net/intel/ixgbe/base/ixgbe_x550.h
drivers/net/intel/ixgbe/base/meson.build renamed from drivers/net/ixgbe/base/meson.build +0 -0
similarity index 100%
rename from drivers/net/ixgbe/base/meson.build
rename to drivers/net/intel/ixgbe/base/meson.build
drivers/net/intel/ixgbe/ixgbe_82599_bypass.c renamed from drivers/net/ixgbe/ixgbe_82599_bypass.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_82599_bypass.c
rename to drivers/net/intel/ixgbe/ixgbe_82599_bypass.c
drivers/net/intel/ixgbe/ixgbe_bypass.c renamed from drivers/net/ixgbe/ixgbe_bypass.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_bypass.c
rename to drivers/net/intel/ixgbe/ixgbe_bypass.c
drivers/net/intel/ixgbe/ixgbe_bypass.h renamed from drivers/net/ixgbe/ixgbe_bypass.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_bypass.h
rename to drivers/net/intel/ixgbe/ixgbe_bypass.h
drivers/net/intel/ixgbe/ixgbe_bypass_api.h renamed from drivers/net/ixgbe/ixgbe_bypass_api.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_bypass_api.h
rename to drivers/net/intel/ixgbe/ixgbe_bypass_api.h
drivers/net/intel/ixgbe/ixgbe_bypass_defines.h renamed from drivers/net/ixgbe/ixgbe_bypass_defines.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_bypass_defines.h
rename to drivers/net/intel/ixgbe/ixgbe_bypass_defines.h
drivers/net/intel/ixgbe/ixgbe_ethdev.c renamed from drivers/net/ixgbe/ixgbe_ethdev.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_ethdev.c
rename to drivers/net/intel/ixgbe/ixgbe_ethdev.c
drivers/net/intel/ixgbe/ixgbe_ethdev.h renamed from drivers/net/ixgbe/ixgbe_ethdev.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_ethdev.h
rename to drivers/net/intel/ixgbe/ixgbe_ethdev.h
drivers/net/intel/ixgbe/ixgbe_fdir.c renamed from drivers/net/ixgbe/ixgbe_fdir.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_fdir.c
rename to drivers/net/intel/ixgbe/ixgbe_fdir.c
drivers/net/intel/ixgbe/ixgbe_flow.c renamed from drivers/net/ixgbe/ixgbe_flow.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_flow.c
rename to drivers/net/intel/ixgbe/ixgbe_flow.c
drivers/net/intel/ixgbe/ixgbe_ipsec.c renamed from drivers/net/ixgbe/ixgbe_ipsec.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_ipsec.c
rename to drivers/net/intel/ixgbe/ixgbe_ipsec.c
drivers/net/intel/ixgbe/ixgbe_ipsec.h renamed from drivers/net/ixgbe/ixgbe_ipsec.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_ipsec.h
rename to drivers/net/intel/ixgbe/ixgbe_ipsec.h
drivers/net/intel/ixgbe/ixgbe_logs.h renamed from drivers/net/ixgbe/ixgbe_logs.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_logs.h
rename to drivers/net/intel/ixgbe/ixgbe_logs.h
drivers/net/intel/ixgbe/ixgbe_pf.c renamed from drivers/net/ixgbe/ixgbe_pf.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_pf.c
rename to drivers/net/intel/ixgbe/ixgbe_pf.c
drivers/net/intel/ixgbe/ixgbe_recycle_mbufs_vec_common.c renamed from drivers/net/ixgbe/ixgbe_recycle_mbufs_vec_common.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_recycle_mbufs_vec_common.c
rename to drivers/net/intel/ixgbe/ixgbe_recycle_mbufs_vec_common.c
drivers/net/intel/ixgbe/ixgbe_regs.h renamed from drivers/net/ixgbe/ixgbe_regs.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_regs.h
rename to drivers/net/intel/ixgbe/ixgbe_regs.h
drivers/net/intel/ixgbe/ixgbe_rxtx.c renamed from drivers/net/ixgbe/ixgbe_rxtx.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_rxtx.c
rename to drivers/net/intel/ixgbe/ixgbe_rxtx.c
drivers/net/intel/ixgbe/ixgbe_rxtx.h renamed from drivers/net/ixgbe/ixgbe_rxtx.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_rxtx.h
rename to drivers/net/intel/ixgbe/ixgbe_rxtx.h
drivers/net/intel/ixgbe/ixgbe_rxtx_vec_common.h renamed from drivers/net/ixgbe/ixgbe_rxtx_vec_common.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
rename to drivers/net/intel/ixgbe/ixgbe_rxtx_vec_common.h
drivers/net/intel/ixgbe/ixgbe_rxtx_vec_neon.c renamed from drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c
rename to drivers/net/intel/ixgbe/ixgbe_rxtx_vec_neon.c
drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c renamed from drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
rename to drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c
drivers/net/intel/ixgbe/ixgbe_testpmd.c renamed from drivers/net/ixgbe/ixgbe_testpmd.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_testpmd.c
rename to drivers/net/intel/ixgbe/ixgbe_testpmd.c
drivers/net/intel/ixgbe/ixgbe_tm.c renamed from drivers/net/ixgbe/ixgbe_tm.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_tm.c
rename to drivers/net/intel/ixgbe/ixgbe_tm.c
drivers/net/intel/ixgbe/ixgbe_vf_representor.c renamed from drivers/net/ixgbe/ixgbe_vf_representor.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_vf_representor.c
rename to drivers/net/intel/ixgbe/ixgbe_vf_representor.c
drivers/net/intel/ixgbe/meson.build renamed from drivers/net/ixgbe/meson.build +0 -0
similarity index 100%
rename from drivers/net/ixgbe/meson.build
rename to drivers/net/intel/ixgbe/meson.build
drivers/net/intel/ixgbe/rte_pmd_ixgbe.c renamed from drivers/net/ixgbe/rte_pmd_ixgbe.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/rte_pmd_ixgbe.c
rename to drivers/net/intel/ixgbe/rte_pmd_ixgbe.c
drivers/net/intel/ixgbe/rte_pmd_ixgbe.h renamed from drivers/net/ixgbe/rte_pmd_ixgbe.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/rte_pmd_ixgbe.h
rename to drivers/net/intel/ixgbe/rte_pmd_ixgbe.h
drivers/net/intel/ixgbe/version.map renamed from drivers/net/ixgbe/version.map +0 -0
similarity index 100%
rename from drivers/net/ixgbe/version.map
rename to drivers/net/intel/ixgbe/version.map
drivers/net/meson.build +10 -10
index dafd637ba4..02a3f5a0b6 100644
@@ -13,28 +13,28 @@ drivers = [
         'bnxt',
         'bonding',
         'cnxk',
-        'cpfl',
         'cxgbe',
         'dpaa',
         'dpaa2',
-        'e1000',
         'ena',
         'enetc',
         'enetfec',
         'enic',
         'failsafe',
-        'fm10k',
         'gve',
         'hinic',
         'hns3',
-        'i40e',
-        'iavf',
-        'ice',
-        'idpf',
-        'igc',
+        'intel/cpfl',
+        'intel/e1000',
+        'intel/fm10k',
+        'intel/i40e',
+        'intel/iavf',
+        'intel/ice',
+        'intel/idpf',
+        'intel/igc',
+        'intel/ipn3ke',
+        'intel/ixgbe',
         'ionic',
-        'ipn3ke',
-        'ixgbe',
         'mana',
         'memif',
         'mlx4',
drivers/raw/ifpga/meson.build +0 -2
index 20dea23206..444799cfb2 100644
@@ -18,7 +18,5 @@ sources = files('ifpga_rawdev.c', 'rte_pmd_ifpga.c', 'afu_pmd_core.c',
     'afu_pmd_he_hssi.c')
 
 includes += include_directories('base')
-includes += include_directories('../../net/ipn3ke')
-includes += include_directories('../../net/i40e')
 
 headers = files('rte_pmd_ifpga.h')
usertools/dpdk-rss-flows.py +2 -2
index e5e7185884..b60cd18e7b 100755
@@ -213,7 +213,7 @@ def reta_size(self, num_queues: int) -> int:
         key=bytes(
             (
                 # fmt: off
-                # rss_intel_key, see drivers/net/ixgbe/ixgbe_rxtx.c
+                # rss_intel_key, see drivers/net/intel/ixgbe/ixgbe_rxtx.c
                 0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2,
                 0x41, 0x67, 0x25, 0x3d, 0x43, 0xa3, 0x8f, 0xb0,
                 0xd0, 0xca, 0x2b, 0xcb, 0xae, 0x7b, 0x30, 0xb4,
@@ -228,7 +228,7 @@ def reta_size(self, num_queues: int) -> int:
         key=bytes(
             (
                 # fmt: off
-                # rss_key_default, see drivers/net/i40e/i40e_ethdev.c
+                # rss_key_default, see drivers/net/intel/i40e/i40e_ethdev.c
                 # i40e is the only driver that takes 52 bytes keys
                 0x44, 0x39, 0x79, 0x6b, 0xb5, 0x4c, 0x50, 0x23,
                 0xb6, 0x75, 0xea, 0x5b, 0x12, 0x4f, 0x9f, 0x30,
Signature · 1 line
2.43.0
#142 lore raw

Re: [PATCH v5 01/25] net: move intel drivers to intel subdirectory

Hello Bruce, Thomas,

Quoted 6 lines · Bruce Richardson

Consolidate all Intel HW NIC drivers into a driver/net/intel This matches the layout used for drivers in the kernel, and potentially enabling easier sharing among drivers.

- This deserves a RN entry has it impacts how users select compiled drivers.

- Trying to select net/intel/* triggers a meson error:

$ meson configure build -Denable_drivers=net/intel/*
$ ninja -C build
...
Message: drivers/net/intel/i40e: Defining dependency "net_i40e"

../drivers/net/intel/iavf/meson.build:33:46: ERROR: Unknown variable "static_rte_common_iavf".

A full log can be found at /home/dmarchan/git/pub/dpdk.org/dedup/build/meson-logs/meson-log.txt
FAILED: build.ninja
/usr/bin/meson --internal regenerate /home/dmarchan/git/pub/dpdk.org/dedup .

- I see some remaining references to the old path. One is to be fixed:
doc/guides/nics/ice.rst: These ICE_DBG_XXX are defined in ``drivers/net/ice/base/ice_type.h``.

- Thomas, please have a look at this part.

On the check-git-log.sh update, we will have many warnings with current update.

Wrong headline prefix:
net/intel/common: add pkt reassembly fn for intel drivers net/intel/common: provide common Tx entry structures net/intel/common: add Tx mbuf ring replenish fn net/intel: align Tx queue struct field names net/intel: add prefix for driver-specific structs net/intel/common: merge ice and i40e Tx queue struct net/iavf: use common Tx queue structure net/ixgbe: use common Tx queue structure net/intel/common: pack Tx queue structure net/intel/common: add post-Tx buffer free function net/intel/common: add Tx buffer free fn for AVX-512 net/iavf: use common Tx free fn for AVX-512 net/ice: move Tx queue mbuf cleanup fn to common net/iavf: use common Tx queue mbuf cleanup fn net/ice: use vector SW ring for all vector paths net/intel/common: remove unneeded code net/intel/common: create common mbuf initializer fn net/intel/common: extract common Rx vector criteria

Invalid patch(es) found - checked 25 patches

I tried to tweak this a bit, with the following heuristic:
* if touching only net/intel/common, accept net/intel/common:
* if touching multiple drivers under net/intel, then accept net/intel:
as prefix,
* if touching some net/intel/$drv (and optionnally net/intel/common), accept net/$drv,

devtools/check-git-log.sh +0 -2
index b2da013f6c..41c290f0ca 100755
@@ -79,11 +79,18 @@ bad=$(for commit in $commits ; do
        [ -z "$(echo "$files" | grep -v '^\(drivers\|doc\|config\)/')" ] ||
                continue
        drv=$(echo "$files" | grep '^drivers/' | cut -d "/" -f 2,3 | sort -u)
-       # for drivers/net/intel/* use 2nd and 4th fields not 2nd and 3rd
        if [ "$drv" = "net/intel" ] ; then
-               drv=$(echo "$files" | grep '^drivers/' | cut -d "/" -f

2,4 | sort -u)
+ drvgrp="net/intel"
+ drv=$(echo "$files" | grep '^drivers/' | grep -v
'^drivers/net/intel/common' |
+ cut -d "/" -f 2,4 | sort -u)
+ if [ $(echo "$drv" | wc -l) -eq 0 ] ; then
+ drv='net/intel/common:'
+ elif [ $(echo "$drv" | wc -l) -gt 1 ] ; then
+ drv='net/intel:'
+ fi
+ else
+ drvgrp=$(echo "$drv" | cut -d "/" -f 1 | uniq)
fi
- drvgrp=$(echo "$drv" | cut -d "/" -f 1 | uniq)

        if [ $(echo "$drvgrp" | wc -l) -gt 1 ] ; then
                echo "$headline" | grep -v '^drivers:'
        elif [ $(echo "$drv" | wc -l) -gt 1 ] ; then

Which then complains on patches in this series that touch many drivers (but have net/intel/common: as prefix where I would suggest net/intel:
instead).

Wrong headline prefix:
net/intel/common: add pkt reassembly fn for intel drivers net/intel/common: provide common Tx entry structures net/intel/common: add Tx mbuf ring replenish fn net/intel/common: merge ice and i40e Tx queue struct net/intel/common: pack Tx queue structure net/intel/common: add post-Tx buffer free function net/intel/common: add Tx buffer free fn for AVX-512 net/iavf: use common Tx free fn for AVX-512 net/iavf: use common Tx queue mbuf cleanup fn net/intel/common: remove unneeded code net/intel/common: create common mbuf initializer fn net/intel/common: extract common Rx vector criteria

Signature · 1 line
David Marchand
#143 lore raw

Re: [PATCH v5 01/25] net: move intel drivers to intel subdirectory

Quoted 16 lines · David Marchand

Hello Bruce, Thomas,

Quoted 6 lines · Bruce Richardson

Consolidate all Intel HW NIC drivers into a driver/net/intel This matches the layout used for drivers in the kernel, and potentially enabling easier sharing among drivers.

- This deserves a RN entry has it impacts how users select compiled drivers.

- Trying to select net/intel/* triggers a meson error:

Quoted 8 lines
$ meson configure build -Denable_drivers=net/intel/*
$ ninja -C build
...
Message: drivers/net/intel/i40e: Defining dependency "net_i40e"

../drivers/net/intel/iavf/meson.build:33:46: ERROR: Unknown variable "static_rte_common_iavf".

Thanks for catching that. I suspect in my testing with intel/* I also added common/iavf out of habit! Will fix in v6.

Quoted 10 lines

A full log can be found at /home/dmarchan/git/pub/dpdk.org/dedup/build/meson-logs/meson-log.txt
FAILED: build.ninja
/usr/bin/meson --internal regenerate /home/dmarchan/git/pub/dpdk.org/dedup .

- I see some remaining references to the old path. One is to be fixed:
doc/guides/nics/ice.rst: These ICE_DBG_XXX are defined in ``drivers/net/ice/base/ice_type.h``.

Ack, will fix.

Quoted 63 lines

- Thomas, please have a look at this part.

On the check-git-log.sh update, we will have many warnings with current update.

Wrong headline prefix:
net/intel/common: add pkt reassembly fn for intel drivers net/intel/common: provide common Tx entry structures net/intel/common: add Tx mbuf ring replenish fn net/intel: align Tx queue struct field names net/intel: add prefix for driver-specific structs net/intel/common: merge ice and i40e Tx queue struct net/iavf: use common Tx queue structure net/ixgbe: use common Tx queue structure net/intel/common: pack Tx queue structure net/intel/common: add post-Tx buffer free function net/intel/common: add Tx buffer free fn for AVX-512 net/iavf: use common Tx free fn for AVX-512 net/ice: move Tx queue mbuf cleanup fn to common net/iavf: use common Tx queue mbuf cleanup fn net/ice: use vector SW ring for all vector paths net/intel/common: remove unneeded code net/intel/common: create common mbuf initializer fn net/intel/common: extract common Rx vector criteria

Invalid patch(es) found - checked 25 patches

I tried to tweak this a bit, with the following heuristic:
* if touching only net/intel/common, accept net/intel/common:
* if touching multiple drivers under net/intel, then accept net/intel:
as prefix,
* if touching some net/intel/$drv (and optionnally net/intel/common), accept net/$drv,

devtools/check-git-log.sh +2 -2
index b2da013f6c..41c290f0ca 100755
@@ -79,11 +79,18 @@ bad=$(for commit in $commits ; do
        [ -z "$(echo "$files" | grep -v '^\(drivers\|doc\|config\)/')" ] ||
                continue
        drv=$(echo "$files" | grep '^drivers/' | cut -d "/" -f 2,3 | sort -u)
-       # for drivers/net/intel/* use 2nd and 4th fields not 2nd and 3rd
        if [ "$drv" = "net/intel" ] ; then
-               drv=$(echo "$files" | grep '^drivers/' | cut -d "/" -f
 2,4 | sort -u)
+               drvgrp="net/intel"
+               drv=$(echo "$files" | grep '^drivers/' | grep -v

'^drivers/net/intel/common' |

devtools/check-git-log.sh +8 -1
+                       cut -d "/" -f 2,4 | sort -u)
+               if [ $(echo "$drv" | wc -l) -eq 0 ] ; then
+                       drv='net/intel/common:'
+               elif [ $(echo "$drv" | wc -l) -gt 1 ] ; then
+                       drv='net/intel:'
+               fi
+       else
+               drvgrp=$(echo "$drv" | cut -d "/" -f 1 | uniq)
        fi
-       drvgrp=$(echo "$drv" | cut -d "/" -f 1 | uniq)
        if [ $(echo "$drvgrp" | wc -l) -gt 1 ] ; then
                echo "$headline" | grep -v '^drivers:'
        elif [ $(echo "$drv" | wc -l) -gt 1 ] ; then
Quoted 4 lines

Which then complains on patches in this series that touch many drivers (but have net/intel/common: as prefix where I would suggest net/intel:
instead).

I tend to disagree with this suggestion. I think that a prefix can be valid so long as the prefix matches at least one component in the patch. For example, for the first patch in the set, I think net/intel/common is a better prefix than just "net/intel". I don't massively object to your suggestion, I just prefer patches identify the most relevant component, if possible, rather than generalities.

Quoted 19 lines

Wrong headline prefix:
net/intel/common: add pkt reassembly fn for intel drivers net/intel/common: provide common Tx entry structures net/intel/common: add Tx mbuf ring replenish fn net/intel/common: merge ice and i40e Tx queue struct net/intel/common: pack Tx queue structure net/intel/common: add post-Tx buffer free function net/intel/common: add Tx buffer free fn for AVX-512 net/iavf: use common Tx free fn for AVX-512 net/iavf: use common Tx queue mbuf cleanup fn net/intel/common: remove unneeded code net/intel/common: create common mbuf initializer fn net/intel/common: extract common Rx vector criteria

Signature · 1 line
David Marchand
#144 lore raw

Re: [PATCH v5 01/25] net: move intel drivers to intel subdirectory

23/01/2025 15:35, Bruce Richardson:

Quoted 61 lines · David Marchand
Quoted 60 lines

On the check-git-log.sh update, we will have many warnings with current update.

Wrong headline prefix:
net/intel/common: add pkt reassembly fn for intel drivers net/intel/common: provide common Tx entry structures net/intel/common: add Tx mbuf ring replenish fn net/intel: align Tx queue struct field names net/intel: add prefix for driver-specific structs net/intel/common: merge ice and i40e Tx queue struct net/iavf: use common Tx queue structure net/ixgbe: use common Tx queue structure net/intel/common: pack Tx queue structure net/intel/common: add post-Tx buffer free function net/intel/common: add Tx buffer free fn for AVX-512 net/iavf: use common Tx free fn for AVX-512 net/ice: move Tx queue mbuf cleanup fn to common net/iavf: use common Tx queue mbuf cleanup fn net/ice: use vector SW ring for all vector paths net/intel/common: remove unneeded code net/intel/common: create common mbuf initializer fn net/intel/common: extract common Rx vector criteria

Invalid patch(es) found - checked 25 patches

I tried to tweak this a bit, with the following heuristic:
* if touching only net/intel/common, accept net/intel/common:
* if touching multiple drivers under net/intel, then accept net/intel:
as prefix,
* if touching some net/intel/$drv (and optionnally net/intel/common), accept net/$drv,

devtools/check-git-log.sh +2 -2
index b2da013f6c..41c290f0ca 100755
@@ -79,11 +79,18 @@ bad=$(for commit in $commits ; do
        [ -z "$(echo "$files" | grep -v '^\(drivers\|doc\|config\)/')" ] ||
                continue
        drv=$(echo "$files" | grep '^drivers/' | cut -d "/" -f 2,3 | sort -u)
-       # for drivers/net/intel/* use 2nd and 4th fields not 2nd and 3rd
        if [ "$drv" = "net/intel" ] ; then
-               drv=$(echo "$files" | grep '^drivers/' | cut -d "/" -f
 2,4 | sort -u)
+               drvgrp="net/intel"
+               drv=$(echo "$files" | grep '^drivers/' | grep -v

'^drivers/net/intel/common' |

devtools/check-git-log.sh +8 -1
+                       cut -d "/" -f 2,4 | sort -u)
+               if [ $(echo "$drv" | wc -l) -eq 0 ] ; then
+                       drv='net/intel/common:'
+               elif [ $(echo "$drv" | wc -l) -gt 1 ] ; then
+                       drv='net/intel:'
+               fi
+       else
+               drvgrp=$(echo "$drv" | cut -d "/" -f 1 | uniq)
        fi
-       drvgrp=$(echo "$drv" | cut -d "/" -f 1 | uniq)
        if [ $(echo "$drvgrp" | wc -l) -gt 1 ] ; then
                echo "$headline" | grep -v '^drivers:'
        elif [ $(echo "$drv" | wc -l) -gt 1 ] ; then
Quoted 11 lines
Quoted 4 lines

Which then complains on patches in this series that touch many drivers (but have net/intel/common: as prefix where I would suggest net/intel:
instead).

I tend to disagree with this suggestion. I think that a prefix can be valid so long as the prefix matches at least one component in the patch. For example, for the first patch in the set, I think net/intel/common is a better prefix than just "net/intel". I don't massively object to your suggestion, I just prefer patches identify the most relevant component, if possible, rather than generalities.

Saying net/intel means the same thing as net/intel/common to me. Why do we care whether the change is in common or multiple drivers? At the end it impacts multiple Intel drivers.
The goal of the prefix is to quickly catch the scope of the change impact.

One more argument: net/intel is shorter :)

#145 lore raw

Re: [PATCH v5 01/25] net: move intel drivers to intel subdirectory

Quoted 75 lines · Thomas Monjalon

23/01/2025 15:35, Bruce Richardson:

Quoted 61 lines · David Marchand
Quoted 60 lines

On the check-git-log.sh update, we will have many warnings with current update.

Wrong headline prefix:
net/intel/common: add pkt reassembly fn for intel drivers net/intel/common: provide common Tx entry structures net/intel/common: add Tx mbuf ring replenish fn net/intel: align Tx queue struct field names net/intel: add prefix for driver-specific structs net/intel/common: merge ice and i40e Tx queue struct net/iavf: use common Tx queue structure net/ixgbe: use common Tx queue structure net/intel/common: pack Tx queue structure net/intel/common: add post-Tx buffer free function net/intel/common: add Tx buffer free fn for AVX-512 net/iavf: use common Tx free fn for AVX-512 net/ice: move Tx queue mbuf cleanup fn to common net/iavf: use common Tx queue mbuf cleanup fn net/ice: use vector SW ring for all vector paths net/intel/common: remove unneeded code net/intel/common: create common mbuf initializer fn net/intel/common: extract common Rx vector criteria

Invalid patch(es) found - checked 25 patches

I tried to tweak this a bit, with the following heuristic:
* if touching only net/intel/common, accept net/intel/common:
* if touching multiple drivers under net/intel, then accept net/intel:
as prefix,
* if touching some net/intel/$drv (and optionnally net/intel/common), accept net/$drv,

devtools/check-git-log.sh +2 -2
index b2da013f6c..41c290f0ca 100755
@@ -79,11 +79,18 @@ bad=$(for commit in $commits ; do
        [ -z "$(echo "$files" | grep -v '^\(drivers\|doc\|config\)/')" ] ||
                continue
        drv=$(echo "$files" | grep '^drivers/' | cut -d "/" -f 2,3 | sort -u)
-       # for drivers/net/intel/* use 2nd and 4th fields not 2nd and 3rd
        if [ "$drv" = "net/intel" ] ; then
-               drv=$(echo "$files" | grep '^drivers/' | cut -d "/" -f
 2,4 | sort -u)
+               drvgrp="net/intel"
+               drv=$(echo "$files" | grep '^drivers/' | grep -v

'^drivers/net/intel/common' |

devtools/check-git-log.sh +8 -1
+                       cut -d "/" -f 2,4 | sort -u)
+               if [ $(echo "$drv" | wc -l) -eq 0 ] ; then
+                       drv='net/intel/common:'
+               elif [ $(echo "$drv" | wc -l) -gt 1 ] ; then
+                       drv='net/intel:'
+               fi
+       else
+               drvgrp=$(echo "$drv" | cut -d "/" -f 1 | uniq)
        fi
-       drvgrp=$(echo "$drv" | cut -d "/" -f 1 | uniq)
        if [ $(echo "$drvgrp" | wc -l) -gt 1 ] ; then
                echo "$headline" | grep -v '^drivers:'
        elif [ $(echo "$drv" | wc -l) -gt 1 ] ; then
Quoted 11 lines
Quoted 4 lines

Which then complains on patches in this series that touch many drivers (but have net/intel/common: as prefix where I would suggest net/intel:
instead).

I tend to disagree with this suggestion. I think that a prefix can be valid so long as the prefix matches at least one component in the patch. For example, for the first patch in the set, I think net/intel/common is a better prefix than just "net/intel". I don't massively object to your suggestion, I just prefer patches identify the most relevant component, if possible, rather than generalities.

Quoted 6 lines

Saying net/intel means the same thing as net/intel/common to me. Why do we care whether the change is in common or multiple drivers? At the end it impacts multiple Intel drivers.
The goal of the prefix is to quickly catch the scope of the change impact.

One more argument: net/intel is shorter :)

True that any change on net/intel/common will affect many drivers. Whatever is decided, I just want the check to be less prone to false positives.

With current series, output is a bit too vocal to me.

Signature · 1 line
David Marchand
#146 lore raw

Re: [PATCH v5 01/25] net: move intel drivers to intel subdirectory

Quoted 81 lines · David Marchand
Quoted 80 lines · Thomas Monjalon

23/01/2025 15:35, Bruce Richardson:

Quoted 61 lines · David Marchand
Quoted 60 lines

On the check-git-log.sh update, we will have many warnings with current update.

Wrong headline prefix:
net/intel/common: add pkt reassembly fn for intel drivers net/intel/common: provide common Tx entry structures net/intel/common: add Tx mbuf ring replenish fn net/intel: align Tx queue struct field names net/intel: add prefix for driver-specific structs net/intel/common: merge ice and i40e Tx queue struct net/iavf: use common Tx queue structure net/ixgbe: use common Tx queue structure net/intel/common: pack Tx queue structure net/intel/common: add post-Tx buffer free function net/intel/common: add Tx buffer free fn for AVX-512 net/iavf: use common Tx free fn for AVX-512 net/ice: move Tx queue mbuf cleanup fn to common net/iavf: use common Tx queue mbuf cleanup fn net/ice: use vector SW ring for all vector paths net/intel/common: remove unneeded code net/intel/common: create common mbuf initializer fn net/intel/common: extract common Rx vector criteria

Invalid patch(es) found - checked 25 patches

I tried to tweak this a bit, with the following heuristic:
* if touching only net/intel/common, accept net/intel/common:
* if touching multiple drivers under net/intel, then accept net/intel:
as prefix,
* if touching some net/intel/$drv (and optionnally net/intel/common), accept net/$drv,

devtools/check-git-log.sh +2 -2
index b2da013f6c..41c290f0ca 100755
@@ -79,11 +79,18 @@ bad=$(for commit in $commits ; do
        [ -z "$(echo "$files" | grep -v '^\(drivers\|doc\|config\)/')" ] ||
                continue
        drv=$(echo "$files" | grep '^drivers/' | cut -d "/" -f 2,3 | sort -u)
-       # for drivers/net/intel/* use 2nd and 4th fields not 2nd and 3rd
        if [ "$drv" = "net/intel" ] ; then
-               drv=$(echo "$files" | grep '^drivers/' | cut -d "/" -f
 2,4 | sort -u)
+               drvgrp="net/intel"
+               drv=$(echo "$files" | grep '^drivers/' | grep -v

'^drivers/net/intel/common' |

devtools/check-git-log.sh +8 -1
+                       cut -d "/" -f 2,4 | sort -u)
+               if [ $(echo "$drv" | wc -l) -eq 0 ] ; then
+                       drv='net/intel/common:'
+               elif [ $(echo "$drv" | wc -l) -gt 1 ] ; then
+                       drv='net/intel:'
+               fi
+       else
+               drvgrp=$(echo "$drv" | cut -d "/" -f 1 | uniq)
        fi
-       drvgrp=$(echo "$drv" | cut -d "/" -f 1 | uniq)
        if [ $(echo "$drvgrp" | wc -l) -gt 1 ] ; then
                echo "$headline" | grep -v '^drivers:'
        elif [ $(echo "$drv" | wc -l) -gt 1 ] ; then
Quoted 11 lines
Quoted 4 lines

Which then complains on patches in this series that touch many drivers (but have net/intel/common: as prefix where I would suggest net/intel:
instead).

I tend to disagree with this suggestion. I think that a prefix can be valid so long as the prefix matches at least one component in the patch. For example, for the first patch in the set, I think net/intel/common is a better prefix than just "net/intel". I don't massively object to your suggestion, I just prefer patches identify the most relevant component, if possible, rather than generalities.

Saying net/intel means the same thing as net/intel/common to me. Why do we care whether the change is in common or multiple drivers? At the end it impacts multiple Intel drivers.
The goal of the prefix is to quickly catch the scope of the change impact.

Quoted 7 lines
Quoted 1 line

One more argument: net/intel is shorter :)

True that any change on net/intel/common will affect many drivers. Whatever is decided, I just want the check to be less prone to false positives.

With current series, output is a bit too vocal to me.

Reworked this a bit in v6. What should be the heuristics now:
* Use of multiple directories in net/intel/* looks for prefix of net/intel
* For any one directory in net/intel/, use net/<name> e.g. net/i40e as before
* Special case for changes only in net/intel/common, where we use the full net/intel/common rather than net/common

After this, the number of warnings from check-git-log is down to 5, and most patches have prefix of just "net/intel". The 5 warnings could be fixed by changing those to "net/intel" too, but I deliberately kept them with specific driver names e.g. net/iavf, where the vast majority of changes in the patch were to do with that driver, and only a few lines changed in common.

/Bruce

#147 lore raw

PATCH v5 2/25 net/intel/common: add pkt reassembly fn for intel drivers

In reply to Bruce Richardson

The code for reassembling a single, multi-mbuf packet from multiple buffers received from the NIC is duplicated across many drivers. Rather than having multiple copies of this function, we can create an "intel/common" directory to hold such functions and consolidate multiple functions down to a single one for easier maintenance.

---
 drivers/net/intel/common/rx.h                 | 79 +++++++++++++++++++
 .../net/intel/i40e/i40e_rxtx_vec_altivec.c    |  4 +-
 drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c   |  4 +-
 drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c |  4 +-
 drivers/net/intel/i40e/i40e_rxtx_vec_common.h | 64 +--------------
 drivers/net/intel/i40e/i40e_rxtx_vec_neon.c   |  4 +-
 drivers/net/intel/i40e/i40e_rxtx_vec_sse.c    |  4 +-
 drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c   |  8 +-
 drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c |  8 +-
 drivers/net/intel/iavf/iavf_rxtx_vec_common.h | 65 +--------------
 drivers/net/intel/iavf/iavf_rxtx_vec_sse.c    |  8 +-
 drivers/net/intel/ice/ice_rxtx_vec_avx2.c     |  4 +-
 drivers/net/intel/ice/ice_rxtx_vec_avx512.c   |  8 +-
 drivers/net/intel/ice/ice_rxtx_vec_common.h   | 66 +---------------
 drivers/net/intel/ice/ice_rxtx_vec_sse.c      |  4 +-
 .../net/intel/ixgbe/ixgbe_rxtx_vec_common.h   | 63 +--------------
 drivers/net/intel/ixgbe/ixgbe_rxtx_vec_neon.c |  4 +-
 drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c  |  4 +-
 18 files changed, 117 insertions(+), 288 deletions(-)
 create mode 100644 drivers/net/intel/common/rx.h
drivers/net/intel/common/rx.h new file +79 -0
new file mode 100644
index 0000000000..5bd2fea7e3
@@ -0,0 +1,79 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 Intel Corporation
+ */
+
+#ifndef _COMMON_INTEL_RX_H_
+#define _COMMON_INTEL_RX_H_
+
+#include <stdint.h>
+#include <unistd.h>
+#include <rte_mbuf.h>
+
+#define CI_RX_BURST 32
+
+static inline uint16_t
+ci_rx_reassemble_packets(struct rte_mbuf **rx_bufs, uint16_t nb_bufs, uint8_t *split_flags,
+		struct rte_mbuf **pkt_first_seg, struct rte_mbuf **pkt_last_seg,
+		const uint8_t crc_len)
+{
+	struct rte_mbuf *pkts[CI_RX_BURST] = {0}; /*finished pkts*/
+	struct rte_mbuf *start = *pkt_first_seg;
+	struct rte_mbuf *end = *pkt_last_seg;
+	unsigned int pkt_idx, buf_idx;
+
+	for (buf_idx = 0, pkt_idx = 0; buf_idx < nb_bufs; buf_idx++) {
+		if (end) {
+			/* processing a split packet */
+			end->next = rx_bufs[buf_idx];
+			rx_bufs[buf_idx]->data_len += crc_len;
+
+			start->nb_segs++;
+			start->pkt_len += rx_bufs[buf_idx]->data_len;
+			end = end->next;
+
+			if (!split_flags[buf_idx]) {
+				/* it's the last packet of the set */
+				start->hash = end->hash;
+				start->vlan_tci = end->vlan_tci;
+				start->ol_flags = end->ol_flags;
+				/* we need to strip crc for the whole packet */
+				start->pkt_len -= crc_len;
+				if (end->data_len > crc_len) {
+					end->data_len -= crc_len;
+				} else {
+					/* free up last mbuf */
+					struct rte_mbuf *secondlast = start;
+
+					start->nb_segs--;
+					while (secondlast->next != end)
+						secondlast = secondlast->next;
+					secondlast->data_len -= (crc_len - end->data_len);
+					secondlast->next = NULL;
+					rte_pktmbuf_free_seg(end);
+				}
+				pkts[pkt_idx++] = start;
+				start = NULL;
+				end = NULL;
+			}
+		} else {
+			/* not processing a split packet */
+			if (!split_flags[buf_idx]) {
+				/* not a split packet, save and skip */
+				pkts[pkt_idx++] = rx_bufs[buf_idx];
+				continue;
+			}
+			start = rx_bufs[buf_idx];
+			end = start;
+			rx_bufs[buf_idx]->data_len += crc_len;
+			rx_bufs[buf_idx]->pkt_len += crc_len;
+		}
+	}
+
+	/* save the partial packet for next time */
+	*pkt_first_seg = start;
+	*pkt_last_seg = end;
+	memcpy(rx_bufs, pkts, pkt_idx * (sizeof(*pkts)));
+	return pkt_idx;
+}
+
+#endif /* _COMMON_INTEL_RX_H_ */
drivers/net/intel/i40e/i40e_rxtx_vec_altivec.c +2 -2
index b6b0d38ec1..95829f65d5 100644
@@ -494,8 +494,8 @@ i40e_recv_scattered_burst_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
 		if (i == nb_bufs)
 			return nb_bufs;
 	}
-	return i + reassemble_packets(rxq, &rx_pkts[i], nb_bufs - i,
-		&split_flags[i]);
+	return i + ci_rx_reassemble_packets(&rx_pkts[i], nb_bufs - i, &split_flags[i],
+		&rxq->pkt_first_seg, &rxq->pkt_last_seg, rxq->crc_len);
 }
 
 /**
drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c +2 -2
index 19cf0ac718..6dd6e55d9c 100644
@@ -657,8 +657,8 @@ i40e_recv_scattered_burst_vec_avx2(void *rx_queue, struct rte_mbuf **rx_pkts,
 			return nb_bufs;
 		rxq->pkt_first_seg = rx_pkts[i];
 	}
-	return i + reassemble_packets(rxq, &rx_pkts[i], nb_bufs - i,
-		&split_flags[i]);
+	return i + ci_rx_reassemble_packets(&rx_pkts[i], nb_bufs - i,	&split_flags[i],
+			&rxq->pkt_first_seg, &rxq->pkt_last_seg, rxq->crc_len);
 }
 
 /*
drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c +2 -2
index 3b2750221b..506f1b5878 100644
@@ -725,8 +725,8 @@ i40e_recv_scattered_burst_vec_avx512(void *rx_queue,
 			return nb_bufs;
 		rxq->pkt_first_seg = rx_pkts[i];
 	}
-	return i + reassemble_packets(rxq, &rx_pkts[i], nb_bufs - i,
-		&split_flags[i]);
+	return i + ci_rx_reassemble_packets(&rx_pkts[i], nb_bufs - i, &split_flags[i],
+			&rxq->pkt_first_seg, &rxq->pkt_last_seg, rxq->crc_len);
 }
 
 /**
drivers/net/intel/i40e/i40e_rxtx_vec_common.h +1 -63

76 lines not on this page · raw message

drivers/net/intel/i40e/i40e_rxtx_vec_neon.c +2 -2
index e1c5c7041b..159d971796 100644
@@ -623,8 +623,8 @@ i40e_recv_scattered_burst_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
 			return nb_bufs;
 		rxq->pkt_first_seg = rx_pkts[i];
 	}
-	return i + reassemble_packets(rxq, &rx_pkts[i], nb_bufs - i,
-		&split_flags[i]);
+	return i + ci_rx_reassemble_packets(&rx_pkts[i], nb_bufs - i, &split_flags[i],
+		&rxq->pkt_first_seg, &rxq->pkt_last_seg, rxq->crc_len);
 }
 
 /**
drivers/net/intel/i40e/i40e_rxtx_vec_sse.c +2 -2
index ad560d2b6b..3a8128e014 100644
@@ -641,8 +641,8 @@ i40e_recv_scattered_burst_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
 			return nb_bufs;
 		rxq->pkt_first_seg = rx_pkts[i];
 	}
-	return i + reassemble_packets(rxq, &rx_pkts[i], nb_bufs - i,
-		&split_flags[i]);
+	return i + ci_rx_reassemble_packets(&rx_pkts[i], nb_bufs - i, &split_flags[i],
+			&rxq->pkt_first_seg, &rxq->pkt_last_seg, rxq->crc_len);
 }
 
 /**
drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c +4 -4
index 49d41af953..0baf5045c8 100644
@@ -1508,8 +1508,8 @@ iavf_recv_scattered_burst_vec_avx2(void *rx_queue, struct rte_mbuf **rx_pkts,
 			return nb_bufs;
 		rxq->pkt_first_seg = rx_pkts[i];
 	}
-	return i + reassemble_packets(rxq, &rx_pkts[i], nb_bufs - i,
-					     &split_flags[i]);
+	return i + ci_rx_reassemble_packets(&rx_pkts[i], nb_bufs - i, &split_flags[i],
+			&rxq->pkt_first_seg, &rxq->pkt_last_seg, rxq->crc_len);
 }
 
 /**
@@ -1597,8 +1597,8 @@ iavf_recv_scattered_burst_vec_avx2_flex_rxd(void *rx_queue,
 			return nb_bufs;
 		rxq->pkt_first_seg = rx_pkts[i];
 	}
-	return i + reassemble_packets(rxq, &rx_pkts[i], nb_bufs - i,
-					     &split_flags[i]);
+	return i + ci_rx_reassemble_packets(&rx_pkts[i], nb_bufs - i, &split_flags[i],
+		&rxq->pkt_first_seg, &rxq->pkt_last_seg, rxq->crc_len);
 }
 
 /**
drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c +4 -4
index d6a861bf80..5a88007096 100644
@@ -1685,8 +1685,8 @@ iavf_recv_scattered_burst_vec_avx512(void *rx_queue, struct rte_mbuf **rx_pkts,
 			return nb_bufs;
 		rxq->pkt_first_seg = rx_pkts[i];
 	}
-	return i + reassemble_packets(rxq, &rx_pkts[i], nb_bufs - i,
-				      &split_flags[i]);
+	return i + ci_rx_reassemble_packets(&rx_pkts[i], nb_bufs - i, &split_flags[i],
+		&rxq->pkt_first_seg, &rxq->pkt_last_seg, rxq->crc_len);
 }
 
 /**
@@ -1761,8 +1761,8 @@ iavf_recv_scattered_burst_vec_avx512_flex_rxd(void *rx_queue,
 			return nb_bufs;
 		rxq->pkt_first_seg = rx_pkts[i];
 	}
-	return i + reassemble_packets(rxq, &rx_pkts[i], nb_bufs - i,
-				      &split_flags[i]);
+	return i + ci_rx_reassemble_packets(&rx_pkts[i], nb_bufs - i, &split_flags[i],
+			&rxq->pkt_first_seg, &rxq->pkt_last_seg, rxq->crc_len);
 }
 
 /**
drivers/net/intel/iavf/iavf_rxtx_vec_common.h +1 -64

77 lines not on this page · raw message

drivers/net/intel/iavf/iavf_rxtx_vec_sse.c +4 -4
index 0db6fa8bd4..48b01462ea 100644
@@ -1238,8 +1238,8 @@ iavf_recv_scattered_burst_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
 			return nb_bufs;
 		rxq->pkt_first_seg = rx_pkts[i];
 	}
-	return i + reassemble_packets(rxq, &rx_pkts[i], nb_bufs - i,
-		&split_flags[i]);
+	return i + ci_rx_reassemble_packets(&rx_pkts[i], nb_bufs - i, &split_flags[i],
+			&rxq->pkt_first_seg, &rxq->pkt_last_seg, rxq->crc_len);
 }
 
 /**
@@ -1307,8 +1307,8 @@ iavf_recv_scattered_burst_vec_flex_rxd(void *rx_queue,
 			return nb_bufs;
 		rxq->pkt_first_seg = rx_pkts[i];
 	}
-	return i + reassemble_packets(rxq, &rx_pkts[i], nb_bufs - i,
-		&split_flags[i]);
+	return i + ci_rx_reassemble_packets(&rx_pkts[i], nb_bufs - i, &split_flags[i],
+			&rxq->pkt_first_seg, &rxq->pkt_last_seg, rxq->crc_len);
 }
 
 /**
drivers/net/intel/ice/ice_rxtx_vec_avx2.c +2 -2
index d6e88dbb29..ca247b155c 100644
@@ -726,8 +726,8 @@ ice_recv_scattered_burst_vec_avx2(void *rx_queue, struct rte_mbuf **rx_pkts,
 			return nb_bufs;
 		rxq->pkt_first_seg = rx_pkts[i];
 	}
-	return i + ice_rx_reassemble_packets(rxq, &rx_pkts[i], nb_bufs - i,
-					     &split_flags[i]);
+	return i + ci_rx_reassemble_packets(&rx_pkts[i], nb_bufs - i, &split_flags[i],
+			&rxq->pkt_first_seg, &rxq->pkt_last_seg, rxq->crc_len);
 }
 
 /**
drivers/net/intel/ice/ice_rxtx_vec_avx512.c +4 -4
index add095ef06..1e603d5d8f 100644
@@ -763,8 +763,8 @@ ice_recv_scattered_burst_vec_avx512(void *rx_queue, struct rte_mbuf **rx_pkts,
 			return nb_bufs;
 		rxq->pkt_first_seg = rx_pkts[i];
 	}
-	return i + ice_rx_reassemble_packets(rxq, &rx_pkts[i], nb_bufs - i,
-					     &split_flags[i]);
+	return i + ci_rx_reassemble_packets(&rx_pkts[i], nb_bufs - i, &split_flags[i],
+			&rxq->pkt_first_seg, &rxq->pkt_last_seg, rxq->crc_len);
 }
 
 /**
@@ -805,8 +805,8 @@ ice_recv_scattered_burst_vec_avx512_offload(void *rx_queue,
 			return nb_bufs;
 		rxq->pkt_first_seg = rx_pkts[i];
 	}
-	return i + ice_rx_reassemble_packets(rxq, &rx_pkts[i], nb_bufs - i,
-					     &split_flags[i]);
+	return i + ci_rx_reassemble_packets(&rx_pkts[i], nb_bufs - i, &split_flags[i],
+			&rxq->pkt_first_seg, &rxq->pkt_last_seg, rxq->crc_len);
 }
 
 /**
drivers/net/intel/ice/ice_rxtx_vec_common.h +1 -65

78 lines not on this page · raw message

drivers/net/intel/ice/ice_rxtx_vec_sse.c +2 -2
index c01d8ede29..01533454ba 100644
@@ -640,8 +640,8 @@ ice_recv_scattered_burst_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
 			return nb_bufs;
 		rxq->pkt_first_seg = rx_pkts[i];
 	}
-	return i + ice_rx_reassemble_packets(rxq, &rx_pkts[i], nb_bufs - i,
-					     &split_flags[i]);
+	return i + ci_rx_reassemble_packets(&rx_pkts[i], nb_bufs - i, &split_flags[i],
+			&rxq->pkt_first_seg, &rxq->pkt_last_seg, rxq->crc_len);
 }
 
 /**
drivers/net/intel/ixgbe/ixgbe_rxtx_vec_common.h +1 -62

72 lines not on this page · raw message

drivers/net/intel/ixgbe/ixgbe_rxtx_vec_neon.c +2 -2
index 952b032eb6..7b35093075 100644
@@ -516,8 +516,8 @@ ixgbe_recv_scattered_burst_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
 			return nb_bufs;
 		rxq->pkt_first_seg = rx_pkts[i];
 	}
-	return i + reassemble_packets(rxq, &rx_pkts[i], nb_bufs - i,
-		&split_flags[i]);
+	return i + ci_rx_reassemble_packets(&rx_pkts[i], nb_bufs - i, &split_flags[i],
+		&rxq->pkt_first_seg, &rxq->pkt_last_seg, rxq->crc_len);
 }
 
 /**
drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c +2 -2
index a77370cdb7..a709bf8c7f 100644
@@ -639,8 +639,8 @@ ixgbe_recv_scattered_burst_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
 			return nb_bufs;
 		rxq->pkt_first_seg = rx_pkts[i];
 	}
-	return i + reassemble_packets(rxq, &rx_pkts[i], nb_bufs - i,
-		&split_flags[i]);
+	return i + ci_rx_reassemble_packets(&rx_pkts[i], nb_bufs - i, &split_flags[i],
+		&rxq->pkt_first_seg, &rxq->pkt_last_seg, rxq->crc_len);
 }
 
 /**
Signature · 1 line
2.43.0
#148 lore raw

Re: [PATCH v5 02/25] net/intel/common: add pkt reassembly fn for intel drivers

Quoted 8 lines · Bruce Richardson

The code for reassembling a single, multi-mbuf packet from multiple buffers received from the NIC is duplicated across many drivers. Rather than having multiple copies of this function, we can create an "intel/common" directory to hold such functions and consolidate multiple functions down to a single one for easier maintenance.

The new drivers/net/intel/common directory is an orphan. Please add it to MAINTAINERS.

An alternative: to avoid such miss in the future, it could be worth having a dedicated block in MAINTAINERS for drivers/net/intel/ with subtree set to next-net-intel and an associated subtree maintainer name, then move all Intel drivers in this block.

Thomas, opinion?

Signature · 1 line
David Marchand
#149 lore raw

Re: [PATCH v5 02/25] net/intel/common: add pkt reassembly fn for intel drivers

23/01/2025 15:17, David Marchand:

Quoted 14 lines
Quoted 8 lines · Bruce Richardson

The code for reassembling a single, multi-mbuf packet from multiple buffers received from the NIC is duplicated across many drivers. Rather than having multiple copies of this function, we can create an "intel/common" directory to hold such functions and consolidate multiple functions down to a single one for easier maintenance.

The new drivers/net/intel/common directory is an orphan. Please add it to MAINTAINERS.

Quoted 6 lines

An alternative: to avoid such miss in the future, it could be worth having a dedicated block in MAINTAINERS for drivers/net/intel/ with subtree set to next-net-intel and an associated subtree maintainer name, then move all Intel drivers in this block.

Thomas, opinion?

I'm not sure about creating a new level.

It needs to be the last one of the parent block
to make our script working.

Can we start with just a new entry for the common directory?

#150 lore raw

Re: [PATCH v5 02/25] net/intel/common: add pkt reassembly fn for intel drivers

Quoted 8 lines · Thomas Monjalon
Quoted 8 lines

The new drivers/net/intel/common directory is an orphan. Please add it to MAINTAINERS.

An alternative: to avoid such miss in the future, it could be worth having a dedicated block in MAINTAINERS for drivers/net/intel/ with subtree set to next-net-intel and an associated subtree maintainer name, then move all Intel drivers in this block.

Quoted 8 lines
Quoted 1 line

Thomas, opinion?

I'm not sure about creating a new level.

It needs to be the last one of the parent block
to make our script working.

Can we start with just a new entry for the common directory?

I did not try, but it is the simpler and should work.

Signature · 1 line
David Marchand
#151 lore raw

PATCH v5 3/25 net/intel/common: provide common Tx entry structures

In reply to Bruce Richardson

The Tx entry structures, both vector and scalar, are common across Intel drivers, so provide a single definition to be used everywhere.

---
 drivers/net/intel/common/tx.h                 | 27 +++++++++++++++++++
 .../i40e/i40e_recycle_mbufs_vec_common.c      |  2 +-
 drivers/net/intel/i40e/i40e_rxtx.c            | 18 ++++++-------
 drivers/net/intel/i40e/i40e_rxtx.h            | 14 +++-------
 .../net/intel/i40e/i40e_rxtx_vec_altivec.c    |  2 +-
 drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c   |  2 +-
 drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c |  6 ++---
 drivers/net/intel/i40e/i40e_rxtx_vec_common.h |  4 +--
 drivers/net/intel/i40e/i40e_rxtx_vec_neon.c   |  2 +-
 drivers/net/intel/i40e/i40e_rxtx_vec_sse.c    |  2 +-
 drivers/net/intel/iavf/iavf_rxtx.c            | 12 ++++-----
 drivers/net/intel/iavf/iavf_rxtx.h            | 14 +++-------
 drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c   |  2 +-
 drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c | 10 +++----
 drivers/net/intel/iavf/iavf_rxtx_vec_common.h |  4 +--
 drivers/net/intel/iavf/iavf_rxtx_vec_sse.c    |  2 +-
 drivers/net/intel/ice/ice_dcf_ethdev.c        |  2 +-
 drivers/net/intel/ice/ice_rxtx.c              | 16 +++++------
 drivers/net/intel/ice/ice_rxtx.h              | 13 ++-------
 drivers/net/intel/ice/ice_rxtx_vec_avx2.c     |  2 +-
 drivers/net/intel/ice/ice_rxtx_vec_avx512.c   |  6 ++---
 drivers/net/intel/ice/ice_rxtx_vec_common.h   |  6 ++---
 drivers/net/intel/ice/ice_rxtx_vec_sse.c      |  2 +-
 .../ixgbe/ixgbe_recycle_mbufs_vec_common.c    |  2 +-
 drivers/net/intel/ixgbe/ixgbe_rxtx.c          | 16 +++++------
 drivers/net/intel/ixgbe/ixgbe_rxtx.h          | 22 +++------------
 .../net/intel/ixgbe/ixgbe_rxtx_vec_common.h   |  8 +++---
 drivers/net/intel/ixgbe/ixgbe_rxtx_vec_neon.c |  2 +-
 drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c  |  2 +-
 29 files changed, 105 insertions(+), 117 deletions(-)
 create mode 100644 drivers/net/intel/common/tx.h
drivers/net/intel/common/tx.h new file +27 -0
new file mode 100644
index 0000000000..384352b9db
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 Intel Corporation
+ */
+
+#ifndef _COMMON_INTEL_TX_H_
+#define _COMMON_INTEL_TX_H_
+
+#include <stdint.h>
+#include <rte_mbuf.h>
+
+/**
+ * Structure associated with each descriptor of the TX ring of a TX queue.
+ */
+struct ci_tx_entry {
+	struct rte_mbuf *mbuf; /* mbuf associated with TX desc, if any. */
+	uint16_t next_id; /* Index of next descriptor in ring. */
+	uint16_t last_id; /* Index of last scattered descriptor. */
+};
+
+/**
+ * Structure associated with each descriptor of the TX ring of a TX queue in vector Tx.
+ */
+struct ci_tx_entry_vec {
+	struct rte_mbuf *mbuf; /* mbuf associated with TX desc, if any. */
+};
+
+#endif /* _COMMON_INTEL_TX_H_ */
drivers/net/intel/i40e/i40e_recycle_mbufs_vec_common.c +1 -1
index 14424c9921..260d238ce4 100644
@@ -56,7 +56,7 @@ i40e_recycle_tx_mbufs_reuse_vec(void *tx_queue,
 	struct rte_eth_recycle_rxq_info *recycle_rxq_info)
 {
 	struct i40e_tx_queue *txq = tx_queue;
-	struct i40e_tx_entry *txep;
+	struct ci_tx_entry *txep;
 	struct rte_mbuf **rxep;
 	int i, n;
 	uint16_t nb_recycle_mbufs;
drivers/net/intel/i40e/i40e_rxtx.c +9 -9
index 839c8a5442..2e1f07d2a1 100644
@@ -378,7 +378,7 @@ i40e_build_ctob(uint32_t td_cmd,
 static inline int
 i40e_xmit_cleanup(struct i40e_tx_queue *txq)
 {
-	struct i40e_tx_entry *sw_ring = txq->sw_ring;
+	struct ci_tx_entry *sw_ring = txq->sw_ring;
 	volatile struct i40e_tx_desc *txd = txq->tx_ring;
 	uint16_t last_desc_cleaned = txq->last_desc_cleaned;
 	uint16_t nb_tx_desc = txq->nb_tx_desc;
@@ -1081,8 +1081,8 @@ uint16_t
 i40e_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 {
 	struct i40e_tx_queue *txq;
-	struct i40e_tx_entry *sw_ring;
-	struct i40e_tx_entry *txe, *txn;
+	struct ci_tx_entry *sw_ring;
+	struct ci_tx_entry *txe, *txn;
 	volatile struct i40e_tx_desc *txd;
 	volatile struct i40e_tx_desc *txr;
 	struct rte_mbuf *tx_pkt;
@@ -1331,7 +1331,7 @@ i40e_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 static __rte_always_inline int
 i40e_tx_free_bufs(struct i40e_tx_queue *txq)
 {
-	struct i40e_tx_entry *txep;
+	struct ci_tx_entry *txep;
 	uint16_t tx_rs_thresh = txq->tx_rs_thresh;
 	uint16_t i = 0, j = 0;
 	struct rte_mbuf *free[RTE_I40E_TX_MAX_FREE_BUF_SZ];
@@ -1418,7 +1418,7 @@ i40e_tx_fill_hw_ring(struct i40e_tx_queue *txq,
 		     uint16_t nb_pkts)
 {
 	volatile struct i40e_tx_desc *txdp = &(txq->tx_ring[txq->tx_tail]);
-	struct i40e_tx_entry *txep = &(txq->sw_ring[txq->tx_tail]);
+	struct ci_tx_entry *txep = &txq->sw_ring[txq->tx_tail];
 	const int N_PER_LOOP = 4;
 	const int N_PER_LOOP_MASK = N_PER_LOOP - 1;
 	int mainpart, leftover;
@@ -2555,7 +2555,7 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev *dev,
 	/* Allocate software ring */
 	txq->sw_ring =
 		rte_zmalloc_socket("i40e tx sw ring",
-				   sizeof(struct i40e_tx_entry) * nb_desc,
+				   sizeof(struct ci_tx_entry) * nb_desc,
 				   RTE_CACHE_LINE_SIZE,
 				   socket_id);
 	if (!txq->sw_ring) {
@@ -2723,7 +2723,7 @@ i40e_tx_queue_release_mbufs(struct i40e_tx_queue *txq)
 	 */
 #ifdef CC_AVX512_SUPPORT
 	if (dev->tx_pkt_burst == i40e_xmit_pkts_vec_avx512) {
-		struct i40e_vec_tx_entry *swr = (void *)txq->sw_ring;
+		struct ci_tx_entry_vec *swr = (void *)txq->sw_ring;
 
 		i = txq->tx_next_dd - txq->tx_rs_thresh + 1;
 		if (txq->tx_tail < i) {
@@ -2768,7 +2768,7 @@ static int
 i40e_tx_done_cleanup_full(struct i40e_tx_queue *txq,
 			uint32_t free_cnt)
 {
-	struct i40e_tx_entry *swr_ring = txq->sw_ring;
+	struct ci_tx_entry *swr_ring = txq->sw_ring;
 	uint16_t i, tx_last, tx_id;
 	uint16_t nb_tx_free_last;
 	uint16_t nb_tx_to_clean;
@@ -2874,7 +2874,7 @@ i40e_tx_done_cleanup(void *txq, uint32_t free_cnt)
 void
 i40e_reset_tx_queue(struct i40e_tx_queue *txq)
 {
-	struct i40e_tx_entry *txe;
+	struct ci_tx_entry *txe;
 	uint16_t i, prev, size;
 
 	if (!txq) {
drivers/net/intel/i40e/i40e_rxtx.h +3 -11
index 33fc9770d9..fb5399ebd2 100644
@@ -5,6 +5,8 @@
 #ifndef _I40E_RXTX_H_
 #define _I40E_RXTX_H_
 
+#include "../common/tx.h"
+
 #define RTE_PMD_I40E_RX_MAX_BURST 32
 #define RTE_PMD_I40E_TX_MAX_BURST 32
 
@@ -122,16 +124,6 @@ struct i40e_rx_queue {
 	const struct rte_memzone *mz;
 };
 
-struct i40e_tx_entry {
-	struct rte_mbuf *mbuf;
-	uint16_t next_id;
-	uint16_t last_id;
-};
-
-struct i40e_vec_tx_entry {
-	struct rte_mbuf *mbuf;
-};
-
 /*
  * Structure associated with each TX queue.
  */
@@ -139,7 +131,7 @@ struct i40e_tx_queue {
 	uint16_t nb_tx_desc; /**< number of TX descriptors */
 	uint64_t tx_ring_phys_addr; /**< TX ring DMA address */
 	volatile struct i40e_tx_desc *tx_ring; /**< TX ring virtual address */
-	struct i40e_tx_entry *sw_ring; /**< virtual address of SW ring */
+	struct ci_tx_entry *sw_ring; /**< virtual address of SW ring */
 	uint16_t tx_tail; /**< current value of tail register */
 	volatile uint8_t *qtx_tail; /**< register address of tail */
 	uint16_t nb_tx_used; /**< number of TX desc used since RS bit set */
drivers/net/intel/i40e/i40e_rxtx_vec_altivec.c +1 -1
index 95829f65d5..ca1038eaa6 100644
@@ -553,7 +553,7 @@ i40e_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 {
 	struct i40e_tx_queue *txq = (struct i40e_tx_queue *)tx_queue;
 	volatile struct i40e_tx_desc *txdp;
-	struct i40e_tx_entry *txep;
+	struct ci_tx_entry *txep;
 	uint16_t n, nb_commit, tx_id;
 	uint64_t flags = I40E_TD_CMD;
 	uint64_t rs = I40E_TX_DESC_CMD_RS | I40E_TD_CMD;
drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c +1 -1
index 6dd6e55d9c..e8441de759 100644
@@ -745,7 +745,7 @@ i40e_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 {
 	struct i40e_tx_queue *txq = (struct i40e_tx_queue *)tx_queue;
 	volatile struct i40e_tx_desc *txdp;
-	struct i40e_tx_entry *txep;
+	struct ci_tx_entry *txep;
 	uint16_t n, nb_commit, tx_id;
 	uint64_t flags = I40E_TD_CMD;
 	uint64_t rs = I40E_TX_DESC_CMD_RS | I40E_TD_CMD;
drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c +3 -3
index 506f1b5878..8b8a16daa8 100644
@@ -757,7 +757,7 @@ i40e_recv_scattered_pkts_vec_avx512(void *rx_queue,
 static __rte_always_inline int
 i40e_tx_free_bufs_avx512(struct i40e_tx_queue *txq)
 {
-	struct i40e_vec_tx_entry *txep;
+	struct ci_tx_entry_vec *txep;
 	uint32_t n;
 	uint32_t i;
 	int nb_free = 0;
@@ -920,7 +920,7 @@ vtx(volatile struct i40e_tx_desc *txdp,
 }
 
 static __rte_always_inline void
-tx_backlog_entry_avx512(struct i40e_vec_tx_entry *txep,
+tx_backlog_entry_avx512(struct ci_tx_entry_vec *txep,
 			struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 {
 	int i;
@@ -935,7 +935,7 @@ i40e_xmit_fixed_burst_vec_avx512(void *tx_queue, struct rte_mbuf **tx_pkts,
 {
 	struct i40e_tx_queue *txq = (struct i40e_tx_queue *)tx_queue;
 	volatile struct i40e_tx_desc *txdp;
-	struct i40e_vec_tx_entry *txep;
+	struct ci_tx_entry_vec *txep;
 	uint16_t n, nb_commit, tx_id;
 	uint64_t flags = I40E_TD_CMD;
 	uint64_t rs = I40E_TX_DESC_CMD_RS | I40E_TD_CMD;
drivers/net/intel/i40e/i40e_rxtx_vec_common.h +2 -2
index a529cdbddf..ae95e916ff 100644
@@ -19,7 +19,7 @@
 static __rte_always_inline int
 i40e_tx_free_bufs(struct i40e_tx_queue *txq)
 {
-	struct i40e_tx_entry *txep;
+	struct ci_tx_entry *txep;
 	uint32_t n;
 	uint32_t i;
 	int nb_free = 0;
@@ -85,7 +85,7 @@ i40e_tx_free_bufs(struct i40e_tx_queue *txq)
 }
 
 static __rte_always_inline void
-tx_backlog_entry(struct i40e_tx_entry *txep,
+tx_backlog_entry(struct ci_tx_entry *txep,
 		 struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 {
 	int i;
drivers/net/intel/i40e/i40e_rxtx_vec_neon.c +1 -1
index 159d971796..9b90a32e28 100644
@@ -681,7 +681,7 @@ i40e_xmit_fixed_burst_vec(void *__rte_restrict tx_queue,
 {
 	struct i40e_tx_queue *txq = (struct i40e_tx_queue *)tx_queue;
 	volatile struct i40e_tx_desc *txdp;
-	struct i40e_tx_entry *txep;
+	struct ci_tx_entry *txep;
 	uint16_t n, nb_commit, tx_id;
 	uint64_t flags = I40E_TD_CMD;
 	uint64_t rs = I40E_TX_DESC_CMD_RS | I40E_TD_CMD;
drivers/net/intel/i40e/i40e_rxtx_vec_sse.c +1 -1
index 3a8128e014..e1fa2ed543 100644
@@ -700,7 +700,7 @@ i40e_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 {
 	struct i40e_tx_queue *txq = (struct i40e_tx_queue *)tx_queue;
 	volatile struct i40e_tx_desc *txdp;
-	struct i40e_tx_entry *txep;
+	struct ci_tx_entry *txep;
 	uint16_t n, nb_commit, tx_id;
 	uint64_t flags = I40E_TD_CMD;
 	uint64_t rs = I40E_TX_DESC_CMD_RS | I40E_TD_CMD;
drivers/net/intel/iavf/iavf_rxtx.c +6 -6
index f7df5f21f2..0d7a17b209 100644
@@ -284,7 +284,7 @@ reset_rx_queue(struct iavf_rx_queue *rxq)
 static inline void
 reset_tx_queue(struct iavf_tx_queue *txq)
 {
-	struct iavf_tx_entry *txe;
+	struct ci_tx_entry *txe;
 	uint32_t i, size;
 	uint16_t prev;
 
@@ -860,7 +860,7 @@ iavf_dev_tx_queue_setup(struct rte_eth_dev *dev,
 	/* Allocate software ring */
 	txq->sw_ring =
 		rte_zmalloc_socket("iavf tx sw ring",
-				   sizeof(struct iavf_tx_entry) * nb_desc,
+				   sizeof(struct ci_tx_entry) * nb_desc,
 				   RTE_CACHE_LINE_SIZE,
 				   socket_id);
 	if (!txq->sw_ring) {
@@ -2379,7 +2379,7 @@ iavf_recv_pkts_bulk_alloc(void *rx_queue,
 static inline int
 iavf_xmit_cleanup(struct iavf_tx_queue *txq)
 {
-	struct iavf_tx_entry *sw_ring = txq->sw_ring;
+	struct ci_tx_entry *sw_ring = txq->sw_ring;
 	uint16_t last_desc_cleaned = txq->last_desc_cleaned;
 	uint16_t nb_tx_desc = txq->nb_tx_desc;
 	uint16_t desc_to_clean_to;
@@ -2797,8 +2797,8 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 {
 	struct iavf_tx_queue *txq = tx_queue;
 	volatile struct iavf_tx_desc *txr = txq->tx_ring;
-	struct iavf_tx_entry *txe_ring = txq->sw_ring;
-	struct iavf_tx_entry *txe, *txn;
+	struct ci_tx_entry *txe_ring = txq->sw_ring;
+	struct ci_tx_entry *txe, *txn;
 	struct rte_mbuf *mb, *mb_seg;
 	uint64_t buf_dma_addr;
 	uint16_t desc_idx, desc_idx_last;
@@ -4268,7 +4268,7 @@ static int
 iavf_tx_done_cleanup_full(struct iavf_tx_queue *txq,
 			uint32_t free_cnt)
 {
-	struct iavf_tx_entry *swr_ring = txq->sw_ring;
+	struct ci_tx_entry *swr_ring = txq->sw_ring;
 	uint16_t tx_last, tx_id;
 	uint16_t nb_tx_free_last;
 	uint16_t nb_tx_to_clean;
drivers/net/intel/iavf/iavf_rxtx.h +3 -11
index 7b56076d32..f41419592d 100644
@@ -5,6 +5,8 @@
 #ifndef _IAVF_RXTX_H_
 #define _IAVF_RXTX_H_
 
+#include "../common/tx.h"
+
 /* In QLEN must be whole number of 32 descriptors. */
 #define IAVF_ALIGN_RING_DESC      32
 #define IAVF_MIN_RING_DESC        64
@@ -271,22 +273,12 @@ struct iavf_rx_queue {
 	uint64_t hw_time_update;
 };
 
-struct iavf_tx_entry {
-	struct rte_mbuf *mbuf;
-	uint16_t next_id;
-	uint16_t last_id;
-};
-
-struct iavf_tx_vec_entry {
-	struct rte_mbuf *mbuf;
-};
-
 /* Structure associated with each TX queue. */
 struct iavf_tx_queue {
 	const struct rte_memzone *mz;  /* memzone for Tx ring */
 	volatile struct iavf_tx_desc *tx_ring; /* Tx ring virtual address */
 	uint64_t tx_ring_phys_addr;    /* Tx ring DMA address */
-	struct iavf_tx_entry *sw_ring;  /* address array of SW ring */
+	struct ci_tx_entry *sw_ring;  /* address array of SW ring */
 	uint16_t nb_tx_desc;           /* ring length */
 	uint16_t tx_tail;              /* current value of tail */
 	volatile uint8_t *qtx_tail;    /* register address of tail */
drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c +1 -1
index 0baf5045c8..e7d3d52655 100644
@@ -1736,7 +1736,7 @@ iavf_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 {
 	struct iavf_tx_queue *txq = (struct iavf_tx_queue *)tx_queue;
 	volatile struct iavf_tx_desc *txdp;
-	struct iavf_tx_entry *txep;
+	struct ci_tx_entry *txep;
 	uint16_t n, nb_commit, tx_id;
 	/* bit2 is reserved and must be set to 1 according to Spec */
 	uint64_t flags = IAVF_TX_DESC_CMD_EOP | IAVF_TX_DESC_CMD_ICRC;
drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c +5 -5
index 5a88007096..a899309f94 100644
@@ -1847,7 +1847,7 @@ iavf_recv_scattered_pkts_vec_avx512_flex_rxd_offload(void *rx_queue,
 static __rte_always_inline int
 iavf_tx_free_bufs_avx512(struct iavf_tx_queue *txq)
 {
-	struct iavf_tx_vec_entry *txep;
+	struct ci_tx_entry_vec *txep;
 	uint32_t n;
 	uint32_t i;
 	int nb_free = 0;
@@ -1960,7 +1960,7 @@ iavf_tx_free_bufs_avx512(struct iavf_tx_queue *txq)
 }
 
 static __rte_always_inline void
-tx_backlog_entry_avx512(struct iavf_tx_vec_entry *txep,
+tx_backlog_entry_avx512(struct ci_tx_entry_vec *txep,
 			struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 {
 	int i;
@@ -2313,7 +2313,7 @@ iavf_xmit_fixed_burst_vec_avx512(void *tx_queue, struct rte_mbuf **tx_pkts,
 {
 	struct iavf_tx_queue *txq = (struct iavf_tx_queue *)tx_queue;
 	volatile struct iavf_tx_desc *txdp;
-	struct iavf_tx_vec_entry *txep;
+	struct ci_tx_entry_vec *txep;
 	uint16_t n, nb_commit, tx_id;
 	/* bit2 is reserved and must be set to 1 according to Spec */
 	uint64_t flags = IAVF_TX_DESC_CMD_EOP | IAVF_TX_DESC_CMD_ICRC;
@@ -2380,7 +2380,7 @@ iavf_xmit_fixed_burst_vec_avx512_ctx(void *tx_queue, struct rte_mbuf **tx_pkts,
 {
 	struct iavf_tx_queue *txq = (struct iavf_tx_queue *)tx_queue;
 	volatile struct iavf_tx_desc *txdp;
-	struct iavf_tx_vec_entry *txep;
+	struct ci_tx_entry_vec *txep;
 	uint16_t n, nb_commit, nb_mbuf, tx_id;
 	/* bit2 is reserved and must be set to 1 according to Spec */
 	uint64_t flags = IAVF_TX_DESC_CMD_EOP | IAVF_TX_DESC_CMD_ICRC;
@@ -2478,7 +2478,7 @@ iavf_tx_queue_release_mbufs_avx512(struct iavf_tx_queue *txq)
 	const uint16_t max_desc = (uint16_t)(txq->nb_tx_desc - 1);
 	const uint16_t end_desc = txq->tx_tail >> txq->use_ctx; /* next empty slot */
 	const uint16_t wrap_point = txq->nb_tx_desc >> txq->use_ctx;  /* end of SW ring */
-	struct iavf_tx_vec_entry *swr = (void *)txq->sw_ring;
+	struct ci_tx_entry_vec *swr = (void *)txq->sw_ring;
 
 	if (!txq->sw_ring || txq->nb_free == max_desc)
 		return;
drivers/net/intel/iavf/iavf_rxtx_vec_common.h +2 -2
index 69d24ff011..db63a093fa 100644
@@ -19,7 +19,7 @@
 static __rte_always_inline int
 iavf_tx_free_bufs(struct iavf_tx_queue *txq)
 {
-	struct iavf_tx_entry *txep;
+	struct ci_tx_entry *txep;
 	uint32_t n;
 	uint32_t i;
 	int nb_free = 0;
@@ -74,7 +74,7 @@ iavf_tx_free_bufs(struct iavf_tx_queue *txq)
 }
 
 static __rte_always_inline void
-tx_backlog_entry(struct iavf_tx_entry *txep,
+tx_backlog_entry(struct ci_tx_entry *txep,
 		 struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 {
 	int i;
drivers/net/intel/iavf/iavf_rxtx_vec_sse.c +1 -1
index 48b01462ea..0a30b1ef64 100644
@@ -1368,7 +1368,7 @@ iavf_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 {
 	struct iavf_tx_queue *txq = (struct iavf_tx_queue *)tx_queue;
 	volatile struct iavf_tx_desc *txdp;
-	struct iavf_tx_entry *txep;
+	struct ci_tx_entry *txep;
 	uint16_t n, nb_commit, tx_id;
 	uint64_t flags = IAVF_TX_DESC_CMD_EOP | 0x04;  /* bit 2 must be set */
 	uint64_t rs = IAVF_TX_DESC_CMD_RS | flags;
drivers/net/intel/ice/ice_dcf_ethdev.c +1 -1
index 91f4943a11..4b98e4066b 100644
@@ -389,7 +389,7 @@ reset_rx_queue(struct ice_rx_queue *rxq)
 static inline void
 reset_tx_queue(struct ice_tx_queue *txq)
 {
-	struct ice_tx_entry *txe;
+	struct ci_tx_entry *txe;
 	uint32_t i, size;
 	uint16_t prev;
 
drivers/net/intel/ice/ice_rxtx.c +8 -8
index 0c7106c7e0..d584086a36 100644
@@ -1028,7 +1028,7 @@ _ice_tx_queue_release_mbufs(struct ice_tx_queue *txq)
 static void
 ice_reset_tx_queue(struct ice_tx_queue *txq)
 {
-	struct ice_tx_entry *txe;
+	struct ci_tx_entry *txe;
 	uint16_t i, prev, size;
 
 	if (!txq) {
@@ -1509,7 +1509,7 @@ ice_tx_queue_setup(struct rte_eth_dev *dev,
 	/* Allocate software ring */
 	txq->sw_ring =
 		rte_zmalloc_socket(NULL,
-				   sizeof(struct ice_tx_entry) * nb_desc,
+				   sizeof(struct ci_tx_entry) * nb_desc,
 				   RTE_CACHE_LINE_SIZE,
 				   socket_id);
 	if (!txq->sw_ring) {
@@ -2837,7 +2837,7 @@ ice_txd_enable_checksum(uint64_t ol_flags,
 static inline int
 ice_xmit_cleanup(struct ice_tx_queue *txq)
 {
-	struct ice_tx_entry *sw_ring = txq->sw_ring;
+	struct ci_tx_entry *sw_ring = txq->sw_ring;
 	volatile struct ice_tx_desc *txd = txq->tx_ring;
 	uint16_t last_desc_cleaned = txq->last_desc_cleaned;
 	uint16_t nb_tx_desc = txq->nb_tx_desc;
@@ -2961,8 +2961,8 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 	struct ice_tx_queue *txq;
 	volatile struct ice_tx_desc *tx_ring;
 	volatile struct ice_tx_desc *txd;
-	struct ice_tx_entry *sw_ring;
-	struct ice_tx_entry *txe, *txn;
+	struct ci_tx_entry *sw_ring;
+	struct ci_tx_entry *txe, *txn;
 	struct rte_mbuf *tx_pkt;
 	struct rte_mbuf *m_seg;
 	uint32_t cd_tunneling_params;
@@ -3184,7 +3184,7 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 static __rte_always_inline int
 ice_tx_free_bufs(struct ice_tx_queue *txq)
 {
-	struct ice_tx_entry *txep;
+	struct ci_tx_entry *txep;
 	uint16_t i;
 
 	if ((txq->tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
@@ -3221,7 +3221,7 @@ static int
 ice_tx_done_cleanup_full(struct ice_tx_queue *txq,
 			uint32_t free_cnt)
 {
-	struct ice_tx_entry *swr_ring = txq->sw_ring;
+	struct ci_tx_entry *swr_ring = txq->sw_ring;
 	uint16_t i, tx_last, tx_id;
 	uint16_t nb_tx_free_last;
 	uint16_t nb_tx_to_clean;
@@ -3361,7 +3361,7 @@ ice_tx_fill_hw_ring(struct ice_tx_queue *txq, struct rte_mbuf **pkts,
 		    uint16_t nb_pkts)
 {
 	volatile struct ice_tx_desc *txdp = &txq->tx_ring[txq->tx_tail];
-	struct ice_tx_entry *txep = &txq->sw_ring[txq->tx_tail];
+	struct ci_tx_entry *txep = &txq->sw_ring[txq->tx_tail];
 	const int N_PER_LOOP = 4;
 	const int N_PER_LOOP_MASK = N_PER_LOOP - 1;
 	int mainpart, leftover;
drivers/net/intel/ice/ice_rxtx.h +2 -11
index 45f25b3609..597d9ad2b2 100644
@@ -5,6 +5,7 @@
 #ifndef _ICE_RXTX_H_
 #define _ICE_RXTX_H_
 
+#include "../common/tx.h"
 #include "ice_ethdev.h"
 
 #define ICE_ALIGN_RING_DESC  32
@@ -144,21 +145,11 @@ struct ice_rx_queue {
 	bool ts_enable; /* if rxq timestamp is enabled */
 };
 
-struct ice_tx_entry {
-	struct rte_mbuf *mbuf;
-	uint16_t next_id;
-	uint16_t last_id;
-};
-
-struct ice_vec_tx_entry {
-	struct rte_mbuf *mbuf;
-};
-
 struct ice_tx_queue {
 	uint16_t nb_tx_desc; /* number of TX descriptors */
 	rte_iova_t tx_ring_dma; /* TX ring DMA address */
 	volatile struct ice_tx_desc *tx_ring; /* TX ring virtual address */
-	struct ice_tx_entry *sw_ring; /* virtual address of SW ring */
+	struct ci_tx_entry *sw_ring; /* virtual address of SW ring */
 	uint16_t tx_tail; /* current value of tail register */
 	volatile uint8_t *qtx_tail; /* register address of tail */
 	uint16_t nb_tx_used; /* number of TX desc used since RS bit set */
drivers/net/intel/ice/ice_rxtx_vec_avx2.c +1 -1
index ca247b155c..cf1862263a 100644
@@ -858,7 +858,7 @@ ice_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 {
 	struct ice_tx_queue *txq = (struct ice_tx_queue *)tx_queue;
 	volatile struct ice_tx_desc *txdp;
-	struct ice_tx_entry *txep;
+	struct ci_tx_entry *txep;
 	uint16_t n, nb_commit, tx_id;
 	uint64_t flags = ICE_TD_CMD;
 	uint64_t rs = ICE_TX_DESC_CMD_RS | ICE_TD_CMD;
drivers/net/intel/ice/ice_rxtx_vec_avx512.c +3 -3
index 1e603d5d8f..6b6aa3f1fe 100644
@@ -862,7 +862,7 @@ ice_recv_scattered_pkts_vec_avx512_offload(void *rx_queue,
 static __rte_always_inline int
 ice_tx_free_bufs_avx512(struct ice_tx_queue *txq)
 {
-	struct ice_vec_tx_entry *txep;
+	struct ci_tx_entry_vec *txep;
 	uint32_t n;
 	uint32_t i;
 	int nb_free = 0;
@@ -1040,7 +1040,7 @@ ice_vtx(volatile struct ice_tx_desc *txdp, struct rte_mbuf **pkt,
 }
 
 static __rte_always_inline void
-ice_tx_backlog_entry_avx512(struct ice_vec_tx_entry *txep,
+ice_tx_backlog_entry_avx512(struct ci_tx_entry_vec *txep,
 			    struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 {
 	int i;
@@ -1055,7 +1055,7 @@ ice_xmit_fixed_burst_vec_avx512(void *tx_queue, struct rte_mbuf **tx_pkts,
 {
 	struct ice_tx_queue *txq = (struct ice_tx_queue *)tx_queue;
 	volatile struct ice_tx_desc *txdp;
-	struct ice_vec_tx_entry *txep;
+	struct ci_tx_entry_vec *txep;
 	uint16_t n, nb_commit, tx_id;
 	uint64_t flags = ICE_TD_CMD;
 	uint64_t rs = ICE_TX_DESC_CMD_RS | ICE_TD_CMD;
drivers/net/intel/ice/ice_rxtx_vec_common.h +3 -3
index cdae6efea4..d6cc0d2ecf 100644
@@ -15,7 +15,7 @@
 static __rte_always_inline int
 ice_tx_free_bufs_vec(struct ice_tx_queue *txq)
 {
-	struct ice_tx_entry *txep;
+	struct ci_tx_entry *txep;
 	uint32_t n;
 	uint32_t i;
 	int nb_free = 0;
@@ -70,7 +70,7 @@ ice_tx_free_bufs_vec(struct ice_tx_queue *txq)
 }
 
 static __rte_always_inline void
-ice_tx_backlog_entry(struct ice_tx_entry *txep,
+ice_tx_backlog_entry(struct ci_tx_entry *txep,
 		     struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 {
 	int i;
@@ -135,7 +135,7 @@ _ice_tx_queue_release_mbufs_vec(struct ice_tx_queue *txq)
 
 	if (dev->tx_pkt_burst == ice_xmit_pkts_vec_avx512 ||
 	    dev->tx_pkt_burst == ice_xmit_pkts_vec_avx512_offload) {
-		struct ice_vec_tx_entry *swr = (void *)txq->sw_ring;
+		struct ci_tx_entry_vec *swr = (void *)txq->sw_ring;
 
 		if (txq->tx_tail < i) {
 			for (; i < txq->nb_tx_desc; i++) {
drivers/net/intel/ice/ice_rxtx_vec_sse.c +1 -1
index 01533454ba..889b754cc1 100644
@@ -699,7 +699,7 @@ ice_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 {
 	struct ice_tx_queue *txq = (struct ice_tx_queue *)tx_queue;
 	volatile struct ice_tx_desc *txdp;
-	struct ice_tx_entry *txep;
+	struct ci_tx_entry *txep;
 	uint16_t n, nb_commit, tx_id;
 	uint64_t flags = ICE_TD_CMD;
 	uint64_t rs = ICE_TX_DESC_CMD_RS | ICE_TD_CMD;
drivers/net/intel/ixgbe/ixgbe_recycle_mbufs_vec_common.c +1 -1
index d451562269..2241726ad8 100644
@@ -52,7 +52,7 @@ ixgbe_recycle_tx_mbufs_reuse_vec(void *tx_queue,
 		struct rte_eth_recycle_rxq_info *recycle_rxq_info)
 {
 	struct ixgbe_tx_queue *txq = tx_queue;
-	struct ixgbe_tx_entry *txep;
+	struct ci_tx_entry *txep;
 	struct rte_mbuf **rxep;
 	int i, n;
 	uint32_t status;
drivers/net/intel/ixgbe/ixgbe_rxtx.c +8 -8
index 7d16eb9df7..db4b993ebc 100644
@@ -100,7 +100,7 @@
 static __rte_always_inline int
 ixgbe_tx_free_bufs(struct ixgbe_tx_queue *txq)
 {
-	struct ixgbe_tx_entry *txep;
+	struct ci_tx_entry *txep;
 	uint32_t status;
 	int i, nb_free = 0;
 	struct rte_mbuf *m, *free[RTE_IXGBE_TX_MAX_FREE_BUF_SZ];
@@ -199,7 +199,7 @@ ixgbe_tx_fill_hw_ring(struct ixgbe_tx_queue *txq, struct rte_mbuf **pkts,
 		      uint16_t nb_pkts)
 {
 	volatile union ixgbe_adv_tx_desc *txdp = &(txq->tx_ring[txq->tx_tail]);
-	struct ixgbe_tx_entry *txep = &(txq->sw_ring[txq->tx_tail]);
+	struct ci_tx_entry *txep = &txq->sw_ring[txq->tx_tail];
 	const int N_PER_LOOP = 4;
 	const int N_PER_LOOP_MASK = N_PER_LOOP-1;
 	int mainpart, leftover;
@@ -563,7 +563,7 @@ tx_desc_ol_flags_to_cmdtype(uint64_t ol_flags)
 static inline int
 ixgbe_xmit_cleanup(struct ixgbe_tx_queue *txq)
 {
-	struct ixgbe_tx_entry *sw_ring = txq->sw_ring;
+	struct ci_tx_entry *sw_ring = txq->sw_ring;
 	volatile union ixgbe_adv_tx_desc *txr = txq->tx_ring;
 	uint16_t last_desc_cleaned = txq->last_desc_cleaned;
 	uint16_t nb_tx_desc = txq->nb_tx_desc;
@@ -624,8 +624,8 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
 		uint16_t nb_pkts)
 {
 	struct ixgbe_tx_queue *txq;
-	struct ixgbe_tx_entry *sw_ring;
-	struct ixgbe_tx_entry *txe, *txn;
+	struct ci_tx_entry *sw_ring;
+	struct ci_tx_entry *txe, *txn;
 	volatile union ixgbe_adv_tx_desc *txr;
 	volatile union ixgbe_adv_tx_desc *txd, *txp;
 	struct rte_mbuf     *tx_pkt;
@@ -2352,7 +2352,7 @@ ixgbe_tx_queue_release_mbufs(struct ixgbe_tx_queue *txq)
 static int
 ixgbe_tx_done_cleanup_full(struct ixgbe_tx_queue *txq, uint32_t free_cnt)
 {
-	struct ixgbe_tx_entry *swr_ring = txq->sw_ring;
+	struct ci_tx_entry *swr_ring = txq->sw_ring;
 	uint16_t i, tx_last, tx_id;
 	uint16_t nb_tx_free_last;
 	uint16_t nb_tx_to_clean;
@@ -2490,7 +2490,7 @@ static void __rte_cold
 ixgbe_reset_tx_queue(struct ixgbe_tx_queue *txq)
 {
 	static const union ixgbe_adv_tx_desc zeroed_desc = {{0}};
-	struct ixgbe_tx_entry *txe = txq->sw_ring;
+	struct ci_tx_entry *txe = txq->sw_ring;
 	uint16_t prev, i;
 
 	/* Zero out HW ring memory */
@@ -2795,7 +2795,7 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
 
 	/* Allocate software ring */
 	txq->sw_ring = rte_zmalloc_socket("txq->sw_ring",
-				sizeof(struct ixgbe_tx_entry) * nb_desc,
+				sizeof(struct ci_tx_entry) * nb_desc,
 				RTE_CACHE_LINE_SIZE, socket_id);
 	if (txq->sw_ring == NULL) {
 		ixgbe_tx_queue_release(txq);
drivers/net/intel/ixgbe/ixgbe_rxtx.h +4 -18
index 0550c1da60..9d1f7ad3df 100644
@@ -5,6 +5,8 @@
 #ifndef _IXGBE_RXTX_H_
 #define _IXGBE_RXTX_H_
 
+#include "../common/tx.h"
+
 /*
  * Rings setup and release.
  *
@@ -75,22 +77,6 @@ struct ixgbe_scattered_rx_entry {
 	struct rte_mbuf *fbuf; /**< First segment of the fragmented packet. */
 };
 
-/**
- * Structure associated with each descriptor of the TX ring of a TX queue.
- */
-struct ixgbe_tx_entry {
-	struct rte_mbuf *mbuf; /**< mbuf associated with TX desc, if any. */
-	uint16_t next_id; /**< Index of next descriptor in ring. */
-	uint16_t last_id; /**< Index of last scattered descriptor. */
-};
-
-/**
- * Structure associated with each descriptor of the TX ring of a TX queue.
- */
-struct ixgbe_tx_entry_v {
-	struct rte_mbuf *mbuf; /**< mbuf associated with TX desc, if any. */
-};
-
 /**
  * Structure associated with each RX queue.
  */
@@ -202,8 +188,8 @@ struct ixgbe_tx_queue {
 	volatile union ixgbe_adv_tx_desc *tx_ring;
 	uint64_t            tx_ring_phys_addr; /**< TX ring DMA address. */
 	union {
-		struct ixgbe_tx_entry *sw_ring; /**< address of SW ring for scalar PMD. */
-		struct ixgbe_tx_entry_v *sw_ring_v; /**< address of SW ring for vector PMD */
+		struct ci_tx_entry *sw_ring; /**< address of SW ring for scalar PMD. */
+		struct ci_tx_entry_vec *sw_ring_v; /**< address of SW ring for vector PMD */
 	};
 	volatile uint32_t   *tdt_reg_addr; /**< Address of TDT register. */
 	uint16_t            nb_tx_desc;    /**< number of TX descriptors. */
drivers/net/intel/ixgbe/ixgbe_rxtx_vec_common.h +4 -4
index fbb80f7fb5..0d83f6feca 100644
@@ -14,7 +14,7 @@
 static __rte_always_inline int
 ixgbe_tx_free_bufs(struct ixgbe_tx_queue *txq)
 {
-	struct ixgbe_tx_entry_v *txep;
+	struct ci_tx_entry_vec *txep;
 	uint32_t status;
 	uint32_t n;
 	uint32_t i;
@@ -69,7 +69,7 @@ ixgbe_tx_free_bufs(struct ixgbe_tx_queue *txq)
 }
 
 static __rte_always_inline void
-tx_backlog_entry(struct ixgbe_tx_entry_v *txep,
+tx_backlog_entry(struct ci_tx_entry_vec *txep,
 		 struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 {
 	int i;
@@ -82,7 +82,7 @@ static inline void
 _ixgbe_tx_queue_release_mbufs_vec(struct ixgbe_tx_queue *txq)
 {
 	unsigned int i;
-	struct ixgbe_tx_entry_v *txe;
+	struct ci_tx_entry_vec *txe;
 	const uint16_t max_desc = (uint16_t)(txq->nb_tx_desc - 1);
 
 	if (txq->sw_ring == NULL || txq->nb_tx_free == max_desc)
@@ -149,7 +149,7 @@ static inline void
 _ixgbe_reset_tx_queue_vec(struct ixgbe_tx_queue *txq)
 {
 	static const union ixgbe_adv_tx_desc zeroed_desc = { { 0 } };
-	struct ixgbe_tx_entry_v *txe = txq->sw_ring_v;
+	struct ci_tx_entry_vec *txe = txq->sw_ring_v;
 	uint16_t i;
 
 	/* Zero out HW ring memory */
drivers/net/intel/ixgbe/ixgbe_rxtx_vec_neon.c +1 -1
index 7b35093075..02b53c008e 100644
@@ -573,7 +573,7 @@ ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 {
 	struct ixgbe_tx_queue *txq = (struct ixgbe_tx_queue *)tx_queue;
 	volatile union ixgbe_adv_tx_desc *txdp;
-	struct ixgbe_tx_entry_v *txep;
+	struct ci_tx_entry_vec *txep;
 	uint16_t n, nb_commit, tx_id;
 	uint64_t flags = DCMD_DTYP_FLAGS;
 	uint64_t rs = IXGBE_ADVTXD_DCMD_RS | DCMD_DTYP_FLAGS;
drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c +1 -1
index a709bf8c7f..c8b5377c9f 100644
@@ -695,7 +695,7 @@ ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 {
 	struct ixgbe_tx_queue *txq = (struct ixgbe_tx_queue *)tx_queue;
 	volatile union ixgbe_adv_tx_desc *txdp;
-	struct ixgbe_tx_entry_v *txep;
+	struct ci_tx_entry_vec *txep;
 	uint16_t n, nb_commit, tx_id;
 	uint64_t flags = DCMD_DTYP_FLAGS;
 	uint64_t rs = IXGBE_ADVTXD_DCMD_RS|DCMD_DTYP_FLAGS;
Signature · 1 line
2.43.0
#152 lore raw

PATCH v5 4/25 net/intel/common: add Tx mbuf ring replenish fn

In reply to Bruce Richardson

Move the short function used to place mbufs on the SW Tx ring to common code to avoid duplication.

---
 drivers/net/intel/common/tx.h                  |  7 +++++++
 drivers/net/intel/i40e/i40e_rxtx_vec_altivec.c |  4 ++--
 drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c    |  4 ++--
 drivers/net/intel/i40e/i40e_rxtx_vec_common.h  | 10 ----------
 drivers/net/intel/i40e/i40e_rxtx_vec_neon.c    |  4 ++--
 drivers/net/intel/i40e/i40e_rxtx_vec_sse.c     |  4 ++--
 drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c    |  4 ++--
 drivers/net/intel/iavf/iavf_rxtx_vec_common.h  | 10 ----------
 drivers/net/intel/iavf/iavf_rxtx_vec_sse.c     |  4 ++--
 drivers/net/intel/ice/ice_rxtx_vec_avx2.c      |  4 ++--
 drivers/net/intel/ice/ice_rxtx_vec_common.h    | 10 ----------
 drivers/net/intel/ice/ice_rxtx_vec_sse.c       |  4 ++--
 12 files changed, 23 insertions(+), 46 deletions(-)
drivers/net/intel/common/tx.h +7 -0
index 384352b9db..5397007411 100644
@@ -24,4 +24,11 @@ struct ci_tx_entry_vec {
 	struct rte_mbuf *mbuf; /* mbuf associated with TX desc, if any. */
 };
 
+static __rte_always_inline void
+ci_tx_backlog_entry(struct ci_tx_entry *txep, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
+{
+	for (uint16_t i = 0; i < (int)nb_pkts; ++i)
+		txep[i].mbuf = tx_pkts[i];
+}
+
 #endif /* _COMMON_INTEL_TX_H_ */
drivers/net/intel/i40e/i40e_rxtx_vec_altivec.c +2 -2
index ca1038eaa6..80f07a3e10 100644
@@ -575,7 +575,7 @@ i40e_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	n = (uint16_t)(txq->nb_tx_desc - tx_id);
 	if (nb_commit >= n) {
-		tx_backlog_entry(txep, tx_pkts, n);
+		ci_tx_backlog_entry(txep, tx_pkts, n);
 
 		for (i = 0; i < n - 1; ++i, ++tx_pkts, ++txdp)
 			vtx1(txdp, *tx_pkts, flags);
@@ -592,7 +592,7 @@ i40e_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 		txep = &txq->sw_ring[tx_id];
 	}
 
-	tx_backlog_entry(txep, tx_pkts, nb_commit);
+	ci_tx_backlog_entry(txep, tx_pkts, nb_commit);
 
 	vtx(txdp, tx_pkts, nb_commit, flags);
 
drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c +2 -2
index e8441de759..b26bae4757 100644
@@ -765,7 +765,7 @@ i40e_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	n = (uint16_t)(txq->nb_tx_desc - tx_id);
 	if (nb_commit >= n) {
-		tx_backlog_entry(txep, tx_pkts, n);
+		ci_tx_backlog_entry(txep, tx_pkts, n);
 
 		vtx(txdp, tx_pkts, n - 1, flags);
 		tx_pkts += (n - 1);
@@ -783,7 +783,7 @@ i40e_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 		txep = &txq->sw_ring[tx_id];
 	}
 
-	tx_backlog_entry(txep, tx_pkts, nb_commit);
+	ci_tx_backlog_entry(txep, tx_pkts, nb_commit);
 
 	vtx(txdp, tx_pkts, nb_commit, flags);
 
drivers/net/intel/i40e/i40e_rxtx_vec_common.h +0 -10
index ae95e916ff..608805ccd9 100644
@@ -84,16 +84,6 @@ i40e_tx_free_bufs(struct i40e_tx_queue *txq)
 	return txq->tx_rs_thresh;
 }
 
-static __rte_always_inline void
-tx_backlog_entry(struct ci_tx_entry *txep,
-		 struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
-{
-	int i;
-
-	for (i = 0; i < (int)nb_pkts; ++i)
-		txep[i].mbuf = tx_pkts[i];
-}
-
 static inline void
 _i40e_rx_queue_release_mbufs_vec(struct i40e_rx_queue *rxq)
 {
drivers/net/intel/i40e/i40e_rxtx_vec_neon.c +2 -2
index 9b90a32e28..26bc345a0a 100644
@@ -702,7 +702,7 @@ i40e_xmit_fixed_burst_vec(void *__rte_restrict tx_queue,
 
 	n = (uint16_t)(txq->nb_tx_desc - tx_id);
 	if (nb_commit >= n) {
-		tx_backlog_entry(txep, tx_pkts, n);
+		ci_tx_backlog_entry(txep, tx_pkts, n);
 
 		for (i = 0; i < n - 1; ++i, ++tx_pkts, ++txdp)
 			vtx1(txdp, *tx_pkts, flags);
@@ -719,7 +719,7 @@ i40e_xmit_fixed_burst_vec(void *__rte_restrict tx_queue,
 		txep = &txq->sw_ring[tx_id];
 	}
 
-	tx_backlog_entry(txep, tx_pkts, nb_commit);
+	ci_tx_backlog_entry(txep, tx_pkts, nb_commit);
 
 	vtx(txdp, tx_pkts, nb_commit, flags);
 
drivers/net/intel/i40e/i40e_rxtx_vec_sse.c +2 -2
index e1fa2ed543..ebc32b0d27 100644
@@ -721,7 +721,7 @@ i40e_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	n = (uint16_t)(txq->nb_tx_desc - tx_id);
 	if (nb_commit >= n) {
-		tx_backlog_entry(txep, tx_pkts, n);
+		ci_tx_backlog_entry(txep, tx_pkts, n);
 
 		for (i = 0; i < n - 1; ++i, ++tx_pkts, ++txdp)
 			vtx1(txdp, *tx_pkts, flags);
@@ -738,7 +738,7 @@ i40e_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 		txep = &txq->sw_ring[tx_id];
 	}
 
-	tx_backlog_entry(txep, tx_pkts, nb_commit);
+	ci_tx_backlog_entry(txep, tx_pkts, nb_commit);
 
 	vtx(txdp, tx_pkts, nb_commit, flags);
 
drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c +2 -2
index e7d3d52655..28885800e0 100644
@@ -1757,7 +1757,7 @@ iavf_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	n = (uint16_t)(txq->nb_tx_desc - tx_id);
 	if (nb_commit >= n) {
-		tx_backlog_entry(txep, tx_pkts, n);
+		ci_tx_backlog_entry(txep, tx_pkts, n);
 
 		iavf_vtx(txdp, tx_pkts, n - 1, flags, offload);
 		tx_pkts += (n - 1);
@@ -1775,7 +1775,7 @@ iavf_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 		txep = &txq->sw_ring[tx_id];
 	}
 
-	tx_backlog_entry(txep, tx_pkts, nb_commit);
+	ci_tx_backlog_entry(txep, tx_pkts, nb_commit);
 
 	iavf_vtx(txdp, tx_pkts, nb_commit, flags, offload);
 
drivers/net/intel/iavf/iavf_rxtx_vec_common.h +0 -10
index db63a093fa..62bbaadc61 100644
@@ -73,16 +73,6 @@ iavf_tx_free_bufs(struct iavf_tx_queue *txq)
 	return txq->rs_thresh;
 }
 
-static __rte_always_inline void
-tx_backlog_entry(struct ci_tx_entry *txep,
-		 struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
-{
-	int i;
-
-	for (i = 0; i < (int)nb_pkts; ++i)
-		txep[i].mbuf = tx_pkts[i];
-}
-
 static inline void
 _iavf_rx_queue_release_mbufs_vec(struct iavf_rx_queue *rxq)
 {
drivers/net/intel/iavf/iavf_rxtx_vec_sse.c +2 -2
index 0a30b1ef64..bc4b8f14c8 100644
@@ -1390,7 +1390,7 @@ iavf_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	n = (uint16_t)(txq->nb_tx_desc - tx_id);
 	if (nb_commit >= n) {
-		tx_backlog_entry(txep, tx_pkts, n);
+		ci_tx_backlog_entry(txep, tx_pkts, n);
 
 		for (i = 0; i < n - 1; ++i, ++tx_pkts, ++txdp)
 			vtx1(txdp, *tx_pkts, flags);
@@ -1407,7 +1407,7 @@ iavf_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 		txep = &txq->sw_ring[tx_id];
 	}
 
-	tx_backlog_entry(txep, tx_pkts, nb_commit);
+	ci_tx_backlog_entry(txep, tx_pkts, nb_commit);
 
 	iavf_vtx(txdp, tx_pkts, nb_commit, flags);
 
drivers/net/intel/ice/ice_rxtx_vec_avx2.c +2 -2
index cf1862263a..336697e72d 100644
@@ -881,7 +881,7 @@ ice_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	n = (uint16_t)(txq->nb_tx_desc - tx_id);
 	if (nb_commit >= n) {
-		ice_tx_backlog_entry(txep, tx_pkts, n);
+		ci_tx_backlog_entry(txep, tx_pkts, n);
 
 		ice_vtx(txdp, tx_pkts, n - 1, flags, offload);
 		tx_pkts += (n - 1);
@@ -899,7 +899,7 @@ ice_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 		txep = &txq->sw_ring[tx_id];
 	}
 
-	ice_tx_backlog_entry(txep, tx_pkts, nb_commit);
+	ci_tx_backlog_entry(txep, tx_pkts, nb_commit);
 
 	ice_vtx(txdp, tx_pkts, nb_commit, flags, offload);
 
drivers/net/intel/ice/ice_rxtx_vec_common.h +0 -10
index d6cc0d2ecf..9a323ec378 100644
@@ -69,16 +69,6 @@ ice_tx_free_bufs_vec(struct ice_tx_queue *txq)
 	return txq->tx_rs_thresh;
 }
 
-static __rte_always_inline void
-ice_tx_backlog_entry(struct ci_tx_entry *txep,
-		     struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
-{
-	int i;
-
-	for (i = 0; i < (int)nb_pkts; ++i)
-		txep[i].mbuf = tx_pkts[i];
-}
-
 static inline void
 _ice_rx_queue_release_mbufs_vec(struct ice_rx_queue *rxq)
 {
drivers/net/intel/ice/ice_rxtx_vec_sse.c +2 -2
index 889b754cc1..debdd8f6a2 100644
@@ -724,7 +724,7 @@ ice_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	n = (uint16_t)(txq->nb_tx_desc - tx_id);
 	if (nb_commit >= n) {
-		ice_tx_backlog_entry(txep, tx_pkts, n);
+		ci_tx_backlog_entry(txep, tx_pkts, n);
 
 		for (i = 0; i < n - 1; ++i, ++tx_pkts, ++txdp)
 			ice_vtx1(txdp, *tx_pkts, flags);
@@ -741,7 +741,7 @@ ice_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 		txep = &txq->sw_ring[tx_id];
 	}
 
-	ice_tx_backlog_entry(txep, tx_pkts, nb_commit);
+	ci_tx_backlog_entry(txep, tx_pkts, nb_commit);
 
 	ice_vtx(txdp, tx_pkts, nb_commit, flags);
 
Signature · 1 line
2.43.0
#153 lore raw

PATCH v5 5/25 net/intel: align Tx queue struct field names

In reply to Bruce Richardson

Across the various Intel drivers sometimes different names are given to fields in the Tx queue structure which have the same function. Do some renaming in some drivers to align things better for future merging.

---
 drivers/net/intel/i40e/i40e_rxtx.c            |  6 +-
 drivers/net/intel/i40e/i40e_rxtx.h            |  2 +-
 drivers/net/intel/iavf/iavf_rxtx.c            | 60 +++++++++----------
 drivers/net/intel/iavf/iavf_rxtx.h            | 14 ++---
 drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c   | 19 +++---
 drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c | 57 +++++++++---------
 drivers/net/intel/iavf/iavf_rxtx_vec_common.h | 24 ++++----
 drivers/net/intel/iavf/iavf_rxtx_vec_sse.c    | 18 +++---
 drivers/net/intel/iavf/iavf_vchnl.c           |  2 +-
 drivers/net/intel/ixgbe/base/ixgbe_osdep.h    |  2 +-
 drivers/net/intel/ixgbe/ixgbe_rxtx.c          | 16 ++---
 drivers/net/intel/ixgbe/ixgbe_rxtx.h          |  6 +-
 drivers/net/intel/ixgbe/ixgbe_rxtx_vec_neon.c |  2 +-
 drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c  |  2 +-
 14 files changed, 116 insertions(+), 114 deletions(-)
drivers/net/intel/i40e/i40e_rxtx.c +3 -3
index 2e1f07d2a1..b0bb20fe9a 100644
@@ -2549,7 +2549,7 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev *dev,
 	txq->vsi = vsi;
 	txq->tx_deferred_start = tx_conf->tx_deferred_start;
 
-	txq->tx_ring_phys_addr = tz->iova;
+	txq->tx_ring_dma = tz->iova;
 	txq->tx_ring = (struct i40e_tx_desc *)tz->addr;
 
 	/* Allocate software ring */
@@ -2923,7 +2923,7 @@ i40e_tx_queue_init(struct i40e_tx_queue *txq)
 	/* clear the context structure first */
 	memset(&tx_ctx, 0, sizeof(tx_ctx));
 	tx_ctx.new_context = 1;
-	tx_ctx.base = txq->tx_ring_phys_addr / I40E_QUEUE_BASE_ADDR_UNIT;
+	tx_ctx.base = txq->tx_ring_dma / I40E_QUEUE_BASE_ADDR_UNIT;
 	tx_ctx.qlen = txq->nb_tx_desc;
 
 #ifdef RTE_LIBRTE_IEEE1588
@@ -3209,7 +3209,7 @@ i40e_fdir_setup_tx_resources(struct i40e_pf *pf)
 	txq->reg_idx = pf->fdir.fdir_vsi->base_queue;
 	txq->vsi = pf->fdir.fdir_vsi;
 
-	txq->tx_ring_phys_addr = tz->iova;
+	txq->tx_ring_dma = tz->iova;
 	txq->tx_ring = (struct i40e_tx_desc *)tz->addr;
 
 	/*
drivers/net/intel/i40e/i40e_rxtx.h +1 -1
index fb5399ebd2..66abd955fb 100644
@@ -129,7 +129,7 @@ struct i40e_rx_queue {
  */
 struct i40e_tx_queue {
 	uint16_t nb_tx_desc; /**< number of TX descriptors */
-	uint64_t tx_ring_phys_addr; /**< TX ring DMA address */
+	rte_iova_t tx_ring_dma; /**< TX ring DMA address */
 	volatile struct i40e_tx_desc *tx_ring; /**< TX ring virtual address */
 	struct ci_tx_entry *sw_ring; /**< virtual address of SW ring */
 	uint16_t tx_tail; /**< current value of tail register */
drivers/net/intel/iavf/iavf_rxtx.c +30 -30

161 lines not on this page · raw message

drivers/net/intel/iavf/iavf_rxtx.h +7 -7
index f41419592d..fb6775cd9c 100644
@@ -277,25 +277,25 @@ struct iavf_rx_queue {
 struct iavf_tx_queue {
 	const struct rte_memzone *mz;  /* memzone for Tx ring */
 	volatile struct iavf_tx_desc *tx_ring; /* Tx ring virtual address */
-	uint64_t tx_ring_phys_addr;    /* Tx ring DMA address */
+	rte_iova_t tx_ring_dma;    /* Tx ring DMA address */
 	struct ci_tx_entry *sw_ring;  /* address array of SW ring */
 	uint16_t nb_tx_desc;           /* ring length */
 	uint16_t tx_tail;              /* current value of tail */
 	volatile uint8_t *qtx_tail;    /* register address of tail */
 	/* number of used desc since RS bit set */
-	uint16_t nb_used;
-	uint16_t nb_free;
+	uint16_t nb_tx_used;
+	uint16_t nb_tx_free;
 	uint16_t last_desc_cleaned;    /* last desc have been cleaned*/
-	uint16_t free_thresh;
-	uint16_t rs_thresh;
+	uint16_t tx_free_thresh;
+	uint16_t tx_rs_thresh;
 	uint8_t rel_mbufs_type;
 	struct iavf_vsi *vsi; /**< the VSI this queue belongs to */
 
 	uint16_t port_id;
 	uint16_t queue_id;
 	uint64_t offloads;
-	uint16_t next_dd;              /* next to set RS, for VPMD */
-	uint16_t next_rs;              /* next to check DD,  for VPMD */
+	uint16_t tx_next_dd;              /* next to set RS, for VPMD */
+	uint16_t tx_next_rs;              /* next to check DD,  for VPMD */
 	uint16_t ipsec_crypto_pkt_md_offset;
 
 	uint64_t mbuf_errors;
drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c +10 -9
index 28885800e0..42e09a2adf 100644
@@ -1742,18 +1742,19 @@ iavf_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 	uint64_t flags = IAVF_TX_DESC_CMD_EOP | IAVF_TX_DESC_CMD_ICRC;
 	uint64_t rs = IAVF_TX_DESC_CMD_RS | flags;
 
-	if (txq->nb_free < txq->free_thresh)
+	if (txq->nb_tx_free < txq->tx_free_thresh)
 		iavf_tx_free_bufs(txq);
 
-	nb_commit = nb_pkts = (uint16_t)RTE_MIN(txq->nb_free, nb_pkts);
+	nb_pkts = (uint16_t)RTE_MIN(txq->nb_tx_free, nb_pkts);
 	if (unlikely(nb_pkts == 0))
 		return 0;
+	nb_commit = nb_pkts;
 
 	tx_id = txq->tx_tail;
 	txdp = &txq->tx_ring[tx_id];
 	txep = &txq->sw_ring[tx_id];
 
-	txq->nb_free = (uint16_t)(txq->nb_free - nb_pkts);
+	txq->nb_tx_free = (uint16_t)(txq->nb_tx_free - nb_pkts);
 
 	n = (uint16_t)(txq->nb_tx_desc - tx_id);
 	if (nb_commit >= n) {
@@ -1768,7 +1769,7 @@ iavf_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 		nb_commit = (uint16_t)(nb_commit - n);
 
 		tx_id = 0;
-		txq->next_rs = (uint16_t)(txq->rs_thresh - 1);
+		txq->tx_next_rs = (uint16_t)(txq->tx_rs_thresh - 1);
 
 		/* avoid reach the end of ring */
 		txdp = &txq->tx_ring[tx_id];
@@ -1780,12 +1781,12 @@ iavf_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 	iavf_vtx(txdp, tx_pkts, nb_commit, flags, offload);
 
 	tx_id = (uint16_t)(tx_id + nb_commit);
-	if (tx_id > txq->next_rs) {
-		txq->tx_ring[txq->next_rs].cmd_type_offset_bsz |=
+	if (tx_id > txq->tx_next_rs) {
+		txq->tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
 			rte_cpu_to_le_64(((uint64_t)IAVF_TX_DESC_CMD_RS) <<
 					 IAVF_TXD_QW1_CMD_SHIFT);
-		txq->next_rs =
-			(uint16_t)(txq->next_rs + txq->rs_thresh);
+		txq->tx_next_rs =
+			(uint16_t)(txq->tx_next_rs + txq->tx_rs_thresh);
 	}
 
 	txq->tx_tail = tx_id;
@@ -1806,7 +1807,7 @@ iavf_xmit_pkts_vec_avx2_common(void *tx_queue, struct rte_mbuf **tx_pkts,
 		uint16_t ret, num;
 
 		/* cross rs_thresh boundary is not allowed */
-		num = (uint16_t)RTE_MIN(nb_pkts, txq->rs_thresh);
+		num = (uint16_t)RTE_MIN(nb_pkts, txq->tx_rs_thresh);
 		ret = iavf_xmit_fixed_burst_vec_avx2(tx_queue, &tx_pkts[nb_tx],
 						     num, offload);
 		nb_tx += ret;
drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c +29 -28

157 lines not on this page · raw message

drivers/net/intel/iavf/iavf_rxtx_vec_common.h +12 -12
index 62bbaadc61..fdd93bad35 100644
@@ -26,17 +26,17 @@ iavf_tx_free_bufs(struct iavf_tx_queue *txq)
 	struct rte_mbuf *m, *free[IAVF_VPMD_TX_MAX_FREE_BUF];
 
 	/* check DD bits on threshold descriptor */
-	if ((txq->tx_ring[txq->next_dd].cmd_type_offset_bsz &
+	if ((txq->tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
 			rte_cpu_to_le_64(IAVF_TXD_QW1_DTYPE_MASK)) !=
 			rte_cpu_to_le_64(IAVF_TX_DESC_DTYPE_DESC_DONE))
 		return 0;
 
-	n = txq->rs_thresh;
+	n = txq->tx_rs_thresh;
 
 	 /* first buffer to free from S/W ring is at index
 	  * tx_next_dd - (tx_rs_thresh-1)
 	  */
-	txep = &txq->sw_ring[txq->next_dd - (n - 1)];
+	txep = &txq->sw_ring[txq->tx_next_dd - (n - 1)];
 	m = rte_pktmbuf_prefree_seg(txep[0].mbuf);
 	if (likely(m != NULL)) {
 		free[0] = m;
@@ -65,12 +65,12 @@ iavf_tx_free_bufs(struct iavf_tx_queue *txq)
 	}
 
 	/* buffers were freed, update counters */
-	txq->nb_free = (uint16_t)(txq->nb_free + txq->rs_thresh);
-	txq->next_dd = (uint16_t)(txq->next_dd + txq->rs_thresh);
-	if (txq->next_dd >= txq->nb_tx_desc)
-		txq->next_dd = (uint16_t)(txq->rs_thresh - 1);
+	txq->nb_tx_free = (uint16_t)(txq->nb_tx_free + txq->tx_rs_thresh);
+	txq->tx_next_dd = (uint16_t)(txq->tx_next_dd + txq->tx_rs_thresh);
+	if (txq->tx_next_dd >= txq->nb_tx_desc)
+		txq->tx_next_dd = (uint16_t)(txq->tx_rs_thresh - 1);
 
-	return txq->rs_thresh;
+	return txq->tx_rs_thresh;
 }
 
 static inline void
@@ -109,10 +109,10 @@ _iavf_tx_queue_release_mbufs_vec(struct iavf_tx_queue *txq)
 	unsigned i;
 	const uint16_t max_desc = (uint16_t)(txq->nb_tx_desc - 1);
 
-	if (!txq->sw_ring || txq->nb_free == max_desc)
+	if (!txq->sw_ring || txq->nb_tx_free == max_desc)
 		return;
 
-	i = txq->next_dd - txq->rs_thresh + 1;
+	i = txq->tx_next_dd - txq->tx_rs_thresh + 1;
 	while (i != txq->tx_tail) {
 		rte_pktmbuf_free_seg(txq->sw_ring[i].mbuf);
 		txq->sw_ring[i].mbuf = NULL;
@@ -169,8 +169,8 @@ iavf_tx_vec_queue_default(struct iavf_tx_queue *txq)
 	if (!txq)
 		return -1;
 
-	if (txq->rs_thresh < IAVF_VPMD_TX_MAX_BURST ||
-	    txq->rs_thresh > IAVF_VPMD_TX_MAX_FREE_BUF)
+	if (txq->tx_rs_thresh < IAVF_VPMD_TX_MAX_BURST ||
+	    txq->tx_rs_thresh > IAVF_VPMD_TX_MAX_FREE_BUF)
 		return -1;
 
 	if (txq->offloads & IAVF_TX_NO_VECTOR_FLAGS)
drivers/net/intel/iavf/iavf_rxtx_vec_sse.c +9 -9
index bc4b8f14c8..ed8455d669 100644
@@ -1374,10 +1374,10 @@ iavf_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 	uint64_t rs = IAVF_TX_DESC_CMD_RS | flags;
 	int i;
 
-	if (txq->nb_free < txq->free_thresh)
+	if (txq->nb_tx_free < txq->tx_free_thresh)
 		iavf_tx_free_bufs(txq);
 
-	nb_pkts = (uint16_t)RTE_MIN(txq->nb_free, nb_pkts);
+	nb_pkts = (uint16_t)RTE_MIN(txq->nb_tx_free, nb_pkts);
 	if (unlikely(nb_pkts == 0))
 		return 0;
 	nb_commit = nb_pkts;
@@ -1386,7 +1386,7 @@ iavf_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 	txdp = &txq->tx_ring[tx_id];
 	txep = &txq->sw_ring[tx_id];
 
-	txq->nb_free = (uint16_t)(txq->nb_free - nb_pkts);
+	txq->nb_tx_free = (uint16_t)(txq->nb_tx_free - nb_pkts);
 
 	n = (uint16_t)(txq->nb_tx_desc - tx_id);
 	if (nb_commit >= n) {
@@ -1400,7 +1400,7 @@ iavf_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 		nb_commit = (uint16_t)(nb_commit - n);
 
 		tx_id = 0;
-		txq->next_rs = (uint16_t)(txq->rs_thresh - 1);
+		txq->tx_next_rs = (uint16_t)(txq->tx_rs_thresh - 1);
 
 		/* avoid reach the end of ring */
 		txdp = &txq->tx_ring[tx_id];
@@ -1412,12 +1412,12 @@ iavf_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 	iavf_vtx(txdp, tx_pkts, nb_commit, flags);
 
 	tx_id = (uint16_t)(tx_id + nb_commit);
-	if (tx_id > txq->next_rs) {
-		txq->tx_ring[txq->next_rs].cmd_type_offset_bsz |=
+	if (tx_id > txq->tx_next_rs) {
+		txq->tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
 			rte_cpu_to_le_64(((uint64_t)IAVF_TX_DESC_CMD_RS) <<
 					 IAVF_TXD_QW1_CMD_SHIFT);
-		txq->next_rs =
-			(uint16_t)(txq->next_rs + txq->rs_thresh);
+		txq->tx_next_rs =
+			(uint16_t)(txq->tx_next_rs + txq->tx_rs_thresh);
 	}
 
 	txq->tx_tail = tx_id;
@@ -1441,7 +1441,7 @@ iavf_xmit_pkts_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 		uint16_t ret, num;
 
 		/* cross rs_thresh boundary is not allowed */
-		num = (uint16_t)RTE_MIN(nb_pkts, txq->rs_thresh);
+		num = (uint16_t)RTE_MIN(nb_pkts, txq->tx_rs_thresh);
 		ret = iavf_xmit_fixed_burst_vec(tx_queue, &tx_pkts[nb_tx], num);
 		nb_tx += ret;
 		nb_pkts -= ret;
drivers/net/intel/iavf/iavf_vchnl.c +1 -1
index 065ab3594c..0646a2f978 100644
@@ -1247,7 +1247,7 @@ iavf_configure_queues(struct iavf_adapter *adapter,
 		/* Virtchnnl configure tx queues by pairs */
 		if (i < adapter->dev_data->nb_tx_queues) {
 			vc_qp->txq.ring_len = txq[i]->nb_tx_desc;
-			vc_qp->txq.dma_ring_addr = txq[i]->tx_ring_phys_addr;
+			vc_qp->txq.dma_ring_addr = txq[i]->tx_ring_dma;
 		}
 
 		vc_qp->rxq.vsi_id = vf->vsi_res->vsi_id;
drivers/net/intel/ixgbe/base/ixgbe_osdep.h +1 -1
index 59d29866bd..cffc6a4ce8 100644
@@ -124,7 +124,7 @@ static inline uint32_t ixgbe_read_addr(volatile void* addr)
 	rte_write32_wc_relaxed((rte_cpu_to_le_32(value)), reg)
 
 #define IXGBE_PCI_REG_ADDR(hw, reg) \
-	((volatile uint32_t *)((char *)(hw)->hw_addr + (reg)))
+	((volatile void *)((char *)(hw)->hw_addr + (reg)))
 
 #define IXGBE_PCI_REG_ARRAY_ADDR(hw, reg, index) \
 	IXGBE_PCI_REG_ADDR((hw), (reg) + ((index) << 2))
drivers/net/intel/ixgbe/ixgbe_rxtx.c +8 -8
index db4b993ebc..0a80b944f0 100644
@@ -308,7 +308,7 @@ tx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	/* update tail pointer */
 	rte_wmb();
-	IXGBE_PCI_REG_WC_WRITE_RELAXED(txq->tdt_reg_addr, txq->tx_tail);
+	IXGBE_PCI_REG_WC_WRITE_RELAXED(txq->qtx_tail, txq->tx_tail);
 
 	return nb_pkts;
 }
@@ -946,7 +946,7 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
 	PMD_TX_LOG(DEBUG, "port_id=%u queue_id=%u tx_tail=%u nb_tx=%u",
 		   (unsigned) txq->port_id, (unsigned) txq->queue_id,
 		   (unsigned) tx_id, (unsigned) nb_tx);
-	IXGBE_PCI_REG_WC_WRITE_RELAXED(txq->tdt_reg_addr, tx_id);
+	IXGBE_PCI_REG_WC_WRITE_RELAXED(txq->qtx_tail, tx_id);
 	txq->tx_tail = tx_id;
 
 	return nb_tx;
@@ -2786,11 +2786,11 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
 	    hw->mac.type == ixgbe_mac_X550_vf ||
 	    hw->mac.type == ixgbe_mac_X550EM_x_vf ||
 	    hw->mac.type == ixgbe_mac_X550EM_a_vf)
-		txq->tdt_reg_addr = IXGBE_PCI_REG_ADDR(hw, IXGBE_VFTDT(queue_idx));
+		txq->qtx_tail = IXGBE_PCI_REG_ADDR(hw, IXGBE_VFTDT(queue_idx));
 	else
-		txq->tdt_reg_addr = IXGBE_PCI_REG_ADDR(hw, IXGBE_TDT(txq->reg_idx));
+		txq->qtx_tail = IXGBE_PCI_REG_ADDR(hw, IXGBE_TDT(txq->reg_idx));
 
-	txq->tx_ring_phys_addr = tz->iova;
+	txq->tx_ring_dma = tz->iova;
 	txq->tx_ring = (union ixgbe_adv_tx_desc *) tz->addr;
 
 	/* Allocate software ring */
@@ -2802,7 +2802,7 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
 		return -ENOMEM;
 	}
 	PMD_INIT_LOG(DEBUG, "sw_ring=%p hw_ring=%p dma_addr=0x%"PRIx64,
-		     txq->sw_ring, txq->tx_ring, txq->tx_ring_phys_addr);
+		     txq->sw_ring, txq->tx_ring, txq->tx_ring_dma);
 
 	/* set up vector or scalar TX function as appropriate */
 	ixgbe_set_tx_function(dev, txq);
@@ -5303,7 +5303,7 @@ ixgbe_dev_tx_init(struct rte_eth_dev *dev)
 	for (i = 0; i < dev->data->nb_tx_queues; i++) {
 		txq = dev->data->tx_queues[i];
 
-		bus_addr = txq->tx_ring_phys_addr;
+		bus_addr = txq->tx_ring_dma;
 		IXGBE_WRITE_REG(hw, IXGBE_TDBAL(txq->reg_idx),
 				(uint32_t)(bus_addr & 0x00000000ffffffffULL));
 		IXGBE_WRITE_REG(hw, IXGBE_TDBAH(txq->reg_idx),
@@ -5887,7 +5887,7 @@ ixgbevf_dev_tx_init(struct rte_eth_dev *dev)
 	/* Setup the Base and Length of the Tx Descriptor Rings */
 	for (i = 0; i < dev->data->nb_tx_queues; i++) {
 		txq = dev->data->tx_queues[i];
-		bus_addr = txq->tx_ring_phys_addr;
+		bus_addr = txq->tx_ring_dma;
 		IXGBE_WRITE_REG(hw, IXGBE_VFTDBAL(i),
 				(uint32_t)(bus_addr & 0x00000000ffffffffULL));
 		IXGBE_WRITE_REG(hw, IXGBE_VFTDBAH(i),
drivers/net/intel/ixgbe/ixgbe_rxtx.h +3 -3
index 9d1f7ad3df..236de014c8 100644
@@ -186,12 +186,12 @@ struct ixgbe_advctx_info {
 struct ixgbe_tx_queue {
 	/** TX ring virtual address. */
 	volatile union ixgbe_adv_tx_desc *tx_ring;
-	uint64_t            tx_ring_phys_addr; /**< TX ring DMA address. */
+	rte_iova_t tx_ring_dma; /**< TX ring DMA address. */
 	union {
 		struct ci_tx_entry *sw_ring; /**< address of SW ring for scalar PMD. */
 		struct ci_tx_entry_vec *sw_ring_v; /**< address of SW ring for vector PMD */
 	};
-	volatile uint32_t   *tdt_reg_addr; /**< Address of TDT register. */
+	volatile uint8_t *qtx_tail; /**< Address of TDT register. */
 	uint16_t            nb_tx_desc;    /**< number of TX descriptors. */
 	uint16_t            tx_tail;       /**< current value of TDT reg. */
 	/**< Start freeing TX buffers if there are less free descriptors than
@@ -218,7 +218,7 @@ struct ixgbe_tx_queue {
 	/** Hardware context0 history. */
 	struct ixgbe_advctx_info ctx_cache[IXGBE_CTX_NUM];
 	const struct ixgbe_txq_ops *ops;       /**< txq ops */
-	uint8_t             tx_deferred_start; /**< not in global dev start. */
+	bool            tx_deferred_start; /**< not in global dev start. */
 #ifdef RTE_LIB_SECURITY
 	uint8_t		    using_ipsec;
 	/**< indicates that IPsec TX feature is in use */
drivers/net/intel/ixgbe/ixgbe_rxtx_vec_neon.c +1 -1
index 02b53c008e..871c1a7cd2 100644
@@ -628,7 +628,7 @@ ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	txq->tx_tail = tx_id;
 
-	IXGBE_PCI_REG_WRITE(txq->tdt_reg_addr, txq->tx_tail);
+	IXGBE_PCI_REG_WRITE(txq->qtx_tail, txq->tx_tail);
 
 	return nb_pkts;
 }
drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c +1 -1
index c8b5377c9f..37f2079519 100644
@@ -751,7 +751,7 @@ ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	txq->tx_tail = tx_id;
 
-	IXGBE_PCI_REG_WC_WRITE(txq->tdt_reg_addr, txq->tx_tail);
+	IXGBE_PCI_REG_WC_WRITE(txq->qtx_tail, txq->tx_tail);
 
 	return nb_pkts;
 }
Signature · 1 line
2.43.0
#154 lore raw

PATCH v5 6/25 net/intel: add prefix for driver-specific structs

In reply to Bruce Richardson

In preparation for merging the Tx structs for multiple drivers into a single struct, rename the driver-specific pointers in each struct to have a prefix on it, to avoid conflicts.

---
 drivers/net/intel/i40e/i40e_fdir.c            |  6 +--
 .../i40e/i40e_recycle_mbufs_vec_common.c      |  2 +-
 drivers/net/intel/i40e/i40e_rxtx.c            | 30 ++++++------
 drivers/net/intel/i40e/i40e_rxtx.h            |  4 +-
 .../net/intel/i40e/i40e_rxtx_vec_altivec.c    |  6 +--
 drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c   |  6 +--
 drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c |  8 ++--
 drivers/net/intel/i40e/i40e_rxtx_vec_common.h |  2 +-
 drivers/net/intel/i40e/i40e_rxtx_vec_neon.c   |  6 +--
 drivers/net/intel/i40e/i40e_rxtx_vec_sse.c    |  6 +--
 drivers/net/intel/iavf/iavf_rxtx.c            | 24 +++++-----
 drivers/net/intel/iavf/iavf_rxtx.h            |  4 +-
 drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c   |  6 +--
 drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c | 14 +++---
 drivers/net/intel/iavf/iavf_rxtx_vec_common.h |  2 +-
 drivers/net/intel/iavf/iavf_rxtx_vec_sse.c    |  6 +--
 drivers/net/intel/ice/ice_dcf_ethdev.c        |  4 +-
 drivers/net/intel/ice/ice_rxtx.c              | 48 +++++++++----------
 drivers/net/intel/ice/ice_rxtx.h              |  4 +-
 drivers/net/intel/ice/ice_rxtx_vec_avx2.c     |  6 +--
 drivers/net/intel/ice/ice_rxtx_vec_avx512.c   |  8 ++--
 drivers/net/intel/ice/ice_rxtx_vec_common.h   |  4 +-
 drivers/net/intel/ice/ice_rxtx_vec_sse.c      |  6 +--
 .../ixgbe/ixgbe_recycle_mbufs_vec_common.c    |  2 +-
 drivers/net/intel/ixgbe/ixgbe_rxtx.c          | 22 ++++-----
 drivers/net/intel/ixgbe/ixgbe_rxtx.h          |  2 +-
 .../net/intel/ixgbe/ixgbe_rxtx_vec_common.h   |  6 +--
 drivers/net/intel/ixgbe/ixgbe_rxtx_vec_neon.c |  6 +--
 drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c  |  6 +--
 29 files changed, 128 insertions(+), 128 deletions(-)
drivers/net/intel/i40e/i40e_fdir.c +3 -3
index 47f79ecf11..c600167634 100644
@@ -1383,7 +1383,7 @@ i40e_find_available_buffer(struct rte_eth_dev *dev)
 		volatile struct i40e_tx_desc *tmp_txdp;
 
 		tmp_tail = txq->tx_tail;
-		tmp_txdp = &txq->tx_ring[tmp_tail + 1];
+		tmp_txdp = &txq->i40e_tx_ring[tmp_tail + 1];
 
 		do {
 			if ((tmp_txdp->cmd_type_offset_bsz &
@@ -1640,7 +1640,7 @@ i40e_flow_fdir_filter_programming(struct i40e_pf *pf,
 
 	PMD_DRV_LOG(INFO, "filling filter programming descriptor.");
 	fdirdp = (volatile struct i40e_filter_program_desc *)
-				(&txq->tx_ring[txq->tx_tail]);
+				(&txq->i40e_tx_ring[txq->tx_tail]);
 
 	fdirdp->qindex_flex_ptype_vsi =
 			rte_cpu_to_le_32((fdir_action->rx_queue <<
@@ -1710,7 +1710,7 @@ i40e_flow_fdir_filter_programming(struct i40e_pf *pf,
 	fdirdp->fd_id = rte_cpu_to_le_32(filter->soft_id);
 
 	PMD_DRV_LOG(INFO, "filling transmit descriptor.");
-	txdp = &txq->tx_ring[txq->tx_tail + 1];
+	txdp = &txq->i40e_tx_ring[txq->tx_tail + 1];
 	txdp->buffer_addr = rte_cpu_to_le_64(pf->fdir.dma_addr[txq->tx_tail >> 1]);
 
 	td_cmd = I40E_TX_DESC_CMD_EOP |
drivers/net/intel/i40e/i40e_recycle_mbufs_vec_common.c +1 -1
index 260d238ce4..8679e5c1fd 100644
@@ -75,7 +75,7 @@ i40e_recycle_tx_mbufs_reuse_vec(void *tx_queue,
 		return 0;
 
 	/* check DD bits on threshold descriptor */
-	if ((txq->tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
+	if ((txq->i40e_tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
 				rte_cpu_to_le_64(I40E_TXD_QW1_DTYPE_MASK)) !=
 			rte_cpu_to_le_64(I40E_TX_DESC_DTYPE_DESC_DONE))
 		return 0;
drivers/net/intel/i40e/i40e_rxtx.c +15 -15
index b0bb20fe9a..34ef931859 100644
@@ -379,7 +379,7 @@ static inline int
 i40e_xmit_cleanup(struct i40e_tx_queue *txq)
 {
 	struct ci_tx_entry *sw_ring = txq->sw_ring;
-	volatile struct i40e_tx_desc *txd = txq->tx_ring;
+	volatile struct i40e_tx_desc *txd = txq->i40e_tx_ring;
 	uint16_t last_desc_cleaned = txq->last_desc_cleaned;
 	uint16_t nb_tx_desc = txq->nb_tx_desc;
 	uint16_t desc_to_clean_to;
@@ -1103,7 +1103,7 @@ i40e_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 
 	txq = tx_queue;
 	sw_ring = txq->sw_ring;
-	txr = txq->tx_ring;
+	txr = txq->i40e_tx_ring;
 	tx_id = txq->tx_tail;
 	txe = &sw_ring[tx_id];
 
@@ -1338,7 +1338,7 @@ i40e_tx_free_bufs(struct i40e_tx_queue *txq)
 	const uint16_t k = RTE_ALIGN_FLOOR(tx_rs_thresh, RTE_I40E_TX_MAX_FREE_BUF_SZ);
 	const uint16_t m = tx_rs_thresh % RTE_I40E_TX_MAX_FREE_BUF_SZ;
 
-	if ((txq->tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
+	if ((txq->i40e_tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
 			rte_cpu_to_le_64(I40E_TXD_QW1_DTYPE_MASK)) !=
 			rte_cpu_to_le_64(I40E_TX_DESC_DTYPE_DESC_DONE))
 		return 0;
@@ -1417,7 +1417,7 @@ i40e_tx_fill_hw_ring(struct i40e_tx_queue *txq,
 		     struct rte_mbuf **pkts,
 		     uint16_t nb_pkts)
 {
-	volatile struct i40e_tx_desc *txdp = &(txq->tx_ring[txq->tx_tail]);
+	volatile struct i40e_tx_desc *txdp = &txq->i40e_tx_ring[txq->tx_tail];
 	struct ci_tx_entry *txep = &txq->sw_ring[txq->tx_tail];
 	const int N_PER_LOOP = 4;
 	const int N_PER_LOOP_MASK = N_PER_LOOP - 1;
@@ -1445,7 +1445,7 @@ tx_xmit_pkts(struct i40e_tx_queue *txq,
 	     struct rte_mbuf **tx_pkts,
 	     uint16_t nb_pkts)
 {
-	volatile struct i40e_tx_desc *txr = txq->tx_ring;
+	volatile struct i40e_tx_desc *txr = txq->i40e_tx_ring;
 	uint16_t n = 0;
 
 	/**
@@ -1556,7 +1556,7 @@ i40e_xmit_pkts_check(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts
 	bool pkt_error = false;
 	const char *reason = NULL;
 	uint16_t good_pkts = nb_pkts;
-	struct i40e_adapter *adapter = txq->vsi->adapter;
+	struct i40e_adapter *adapter = txq->i40e_vsi->adapter;
 
 	for (idx = 0; idx < nb_pkts; idx++) {
 		mb = tx_pkts[idx];
@@ -2329,7 +2329,7 @@ i40e_dev_tx_descriptor_status(void *tx_queue, uint16_t offset)
 			desc -= txq->nb_tx_desc;
 	}
 
-	status = &txq->tx_ring[desc].cmd_type_offset_bsz;
+	status = &txq->i40e_tx_ring[desc].cmd_type_offset_bsz;
 	mask = rte_le_to_cpu_64(I40E_TXD_QW1_DTYPE_MASK);
 	expect = rte_cpu_to_le_64(
 		I40E_TX_DESC_DTYPE_DESC_DONE << I40E_TXD_QW1_DTYPE_SHIFT);
@@ -2527,7 +2527,7 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev *dev,
 	/* Allocate TX hardware ring descriptors. */
 	ring_size = sizeof(struct i40e_tx_desc) * I40E_MAX_RING_DESC;
 	ring_size = RTE_ALIGN(ring_size, I40E_DMA_MEM_ALIGN);
-	tz = rte_eth_dma_zone_reserve(dev, "tx_ring", queue_idx,
+	tz = rte_eth_dma_zone_reserve(dev, "i40e_tx_ring", queue_idx,
 			      ring_size, I40E_RING_BASE_ALIGN, socket_id);
 	if (!tz) {
 		i40e_tx_queue_release(txq);
@@ -2546,11 +2546,11 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev *dev,
 	txq->reg_idx = reg_idx;
 	txq->port_id = dev->data->port_id;
 	txq->offloads = offloads;
-	txq->vsi = vsi;
+	txq->i40e_vsi = vsi;
 	txq->tx_deferred_start = tx_conf->tx_deferred_start;
 
 	txq->tx_ring_dma = tz->iova;
-	txq->tx_ring = (struct i40e_tx_desc *)tz->addr;
+	txq->i40e_tx_ring = (struct i40e_tx_desc *)tz->addr;
 
 	/* Allocate software ring */
 	txq->sw_ring =
@@ -2885,11 +2885,11 @@ i40e_reset_tx_queue(struct i40e_tx_queue *txq)
 	txe = txq->sw_ring;
 	size = sizeof(struct i40e_tx_desc) * txq->nb_tx_desc;
 	for (i = 0; i < size; i++)
-		((volatile char *)txq->tx_ring)[i] = 0;
+		((volatile char *)txq->i40e_tx_ring)[i] = 0;
 
 	prev = (uint16_t)(txq->nb_tx_desc - 1);
 	for (i = 0; i < txq->nb_tx_desc; i++) {
-		volatile struct i40e_tx_desc *txd = &txq->tx_ring[i];
+		volatile struct i40e_tx_desc *txd = &txq->i40e_tx_ring[i];
 
 		txd->cmd_type_offset_bsz =
 			rte_cpu_to_le_64(I40E_TX_DESC_DTYPE_DESC_DONE);
@@ -2914,7 +2914,7 @@ int
 i40e_tx_queue_init(struct i40e_tx_queue *txq)
 {
 	enum i40e_status_code err = I40E_SUCCESS;
-	struct i40e_vsi *vsi = txq->vsi;
+	struct i40e_vsi *vsi = txq->i40e_vsi;
 	struct i40e_hw *hw = I40E_VSI_TO_HW(vsi);
 	uint16_t pf_q = txq->reg_idx;
 	struct i40e_hmc_obj_txq tx_ctx;
@@ -3207,10 +3207,10 @@ i40e_fdir_setup_tx_resources(struct i40e_pf *pf)
 	txq->nb_tx_desc = I40E_FDIR_NUM_TX_DESC;
 	txq->queue_id = I40E_FDIR_QUEUE_ID;
 	txq->reg_idx = pf->fdir.fdir_vsi->base_queue;
-	txq->vsi = pf->fdir.fdir_vsi;
+	txq->i40e_vsi = pf->fdir.fdir_vsi;
 
 	txq->tx_ring_dma = tz->iova;
-	txq->tx_ring = (struct i40e_tx_desc *)tz->addr;
+	txq->i40e_tx_ring = (struct i40e_tx_desc *)tz->addr;
 
 	/*
 	 * don't need to allocate software ring and reset for the fdir
drivers/net/intel/i40e/i40e_rxtx.h +2 -2
index 66abd955fb..a5f9f3b9e3 100644
@@ -130,7 +130,7 @@ struct i40e_rx_queue {
 struct i40e_tx_queue {
 	uint16_t nb_tx_desc; /**< number of TX descriptors */
 	rte_iova_t tx_ring_dma; /**< TX ring DMA address */
-	volatile struct i40e_tx_desc *tx_ring; /**< TX ring virtual address */
+	volatile struct i40e_tx_desc *i40e_tx_ring; /**< TX ring virtual address */
 	struct ci_tx_entry *sw_ring; /**< virtual address of SW ring */
 	uint16_t tx_tail; /**< current value of tail register */
 	volatile uint8_t *qtx_tail; /**< register address of tail */
@@ -150,7 +150,7 @@ struct i40e_tx_queue {
 	uint16_t port_id; /**< Device port identifier. */
 	uint16_t queue_id; /**< TX queue index. */
 	uint16_t reg_idx;
-	struct i40e_vsi *vsi; /**< the VSI this queue belongs to */
+	struct i40e_vsi *i40e_vsi; /**< the VSI this queue belongs to */
 	uint16_t tx_next_dd;
 	uint16_t tx_next_rs;
 	bool q_set; /**< indicate if tx queue has been configured */
drivers/net/intel/i40e/i40e_rxtx_vec_altivec.c +3 -3
index 80f07a3e10..bf0e9ebd71 100644
@@ -568,7 +568,7 @@ i40e_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 		return 0;
 
 	tx_id = txq->tx_tail;
-	txdp = &txq->tx_ring[tx_id];
+	txdp = &txq->i40e_tx_ring[tx_id];
 	txep = &txq->sw_ring[tx_id];
 
 	txq->nb_tx_free = (uint16_t)(txq->nb_tx_free - nb_pkts);
@@ -588,7 +588,7 @@ i40e_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 		txq->tx_next_rs = (uint16_t)(txq->tx_rs_thresh - 1);
 
 		/* avoid reach the end of ring */
-		txdp = &txq->tx_ring[tx_id];
+		txdp = &txq->i40e_tx_ring[tx_id];
 		txep = &txq->sw_ring[tx_id];
 	}
 
@@ -598,7 +598,7 @@ i40e_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	tx_id = (uint16_t)(tx_id + nb_commit);
 	if (tx_id > txq->tx_next_rs) {
-		txq->tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
+		txq->i40e_tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
 			rte_cpu_to_le_64(((uint64_t)I40E_TX_DESC_CMD_RS) <<
 						I40E_TXD_QW1_CMD_SHIFT);
 		txq->tx_next_rs =
drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c +3 -3
index b26bae4757..5042e348db 100644
@@ -758,7 +758,7 @@ i40e_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 		return 0;
 
 	tx_id = txq->tx_tail;
-	txdp = &txq->tx_ring[tx_id];
+	txdp = &txq->i40e_tx_ring[tx_id];
 	txep = &txq->sw_ring[tx_id];
 
 	txq->nb_tx_free = (uint16_t)(txq->nb_tx_free - nb_pkts);
@@ -779,7 +779,7 @@ i40e_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 		txq->tx_next_rs = (uint16_t)(txq->tx_rs_thresh - 1);
 
 		/* avoid reach the end of ring */
-		txdp = &txq->tx_ring[tx_id];
+		txdp = &txq->i40e_tx_ring[tx_id];
 		txep = &txq->sw_ring[tx_id];
 	}
 
@@ -789,7 +789,7 @@ i40e_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	tx_id = (uint16_t)(tx_id + nb_commit);
 	if (tx_id > txq->tx_next_rs) {
-		txq->tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
+		txq->i40e_tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
 			rte_cpu_to_le_64(((uint64_t)I40E_TX_DESC_CMD_RS) <<
 						I40E_TXD_QW1_CMD_SHIFT);
 		txq->tx_next_rs =
drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c +4 -4
index 8b8a16daa8..04fbe3b2e3 100644
@@ -764,7 +764,7 @@ i40e_tx_free_bufs_avx512(struct i40e_tx_queue *txq)
 	struct rte_mbuf *m, *free[RTE_I40E_TX_MAX_FREE_BUF_SZ];
 
 	/* check DD bits on threshold descriptor */
-	if ((txq->tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
+	if ((txq->i40e_tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
 			rte_cpu_to_le_64(I40E_TXD_QW1_DTYPE_MASK)) !=
 			rte_cpu_to_le_64(I40E_TX_DESC_DTYPE_DESC_DONE))
 		return 0;
@@ -948,7 +948,7 @@ i40e_xmit_fixed_burst_vec_avx512(void *tx_queue, struct rte_mbuf **tx_pkts,
 		return 0;
 
 	tx_id = txq->tx_tail;
-	txdp = &txq->tx_ring[tx_id];
+	txdp = &txq->i40e_tx_ring[tx_id];
 	txep = (void *)txq->sw_ring;
 	txep += tx_id;
 
@@ -970,7 +970,7 @@ i40e_xmit_fixed_burst_vec_avx512(void *tx_queue, struct rte_mbuf **tx_pkts,
 		txq->tx_next_rs = (uint16_t)(txq->tx_rs_thresh - 1);
 
 		/* avoid reach the end of ring */
-		txdp = txq->tx_ring;
+		txdp = txq->i40e_tx_ring;
 		txep = (void *)txq->sw_ring;
 	}
 
@@ -980,7 +980,7 @@ i40e_xmit_fixed_burst_vec_avx512(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	tx_id = (uint16_t)(tx_id + nb_commit);
 	if (tx_id > txq->tx_next_rs) {
-		txq->tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
+		txq->i40e_tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
 			rte_cpu_to_le_64(((uint64_t)I40E_TX_DESC_CMD_RS) <<
 						I40E_TXD_QW1_CMD_SHIFT);
 		txq->tx_next_rs =
drivers/net/intel/i40e/i40e_rxtx_vec_common.h +1 -1
index 608805ccd9..e98031cbd1 100644
@@ -26,7 +26,7 @@ i40e_tx_free_bufs(struct i40e_tx_queue *txq)
 	struct rte_mbuf *m, *free[RTE_I40E_TX_MAX_FREE_BUF_SZ];
 
 	/* check DD bits on threshold descriptor */
-	if ((txq->tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
+	if ((txq->i40e_tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
 			rte_cpu_to_le_64(I40E_TXD_QW1_DTYPE_MASK)) !=
 			rte_cpu_to_le_64(I40E_TX_DESC_DTYPE_DESC_DONE))
 		return 0;
drivers/net/intel/i40e/i40e_rxtx_vec_neon.c +3 -3
index 26bc345a0a..05191e4884 100644
@@ -695,7 +695,7 @@ i40e_xmit_fixed_burst_vec(void *__rte_restrict tx_queue,
 		return 0;
 
 	tx_id = txq->tx_tail;
-	txdp = &txq->tx_ring[tx_id];
+	txdp = &txq->i40e_tx_ring[tx_id];
 	txep = &txq->sw_ring[tx_id];
 
 	txq->nb_tx_free = (uint16_t)(txq->nb_tx_free - nb_pkts);
@@ -715,7 +715,7 @@ i40e_xmit_fixed_burst_vec(void *__rte_restrict tx_queue,
 		txq->tx_next_rs = (uint16_t)(txq->tx_rs_thresh - 1);
 
 		/* avoid reach the end of ring */
-		txdp = &txq->tx_ring[tx_id];
+		txdp = &txq->i40e_tx_ring[tx_id];
 		txep = &txq->sw_ring[tx_id];
 	}
 
@@ -725,7 +725,7 @@ i40e_xmit_fixed_burst_vec(void *__rte_restrict tx_queue,
 
 	tx_id = (uint16_t)(tx_id + nb_commit);
 	if (tx_id > txq->tx_next_rs) {
-		txq->tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
+		txq->i40e_tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
 			rte_cpu_to_le_64(((uint64_t)I40E_TX_DESC_CMD_RS) <<
 						I40E_TXD_QW1_CMD_SHIFT);
 		txq->tx_next_rs =
drivers/net/intel/i40e/i40e_rxtx_vec_sse.c +3 -3
index ebc32b0d27..d81b553842 100644
@@ -714,7 +714,7 @@ i40e_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 		return 0;
 
 	tx_id = txq->tx_tail;
-	txdp = &txq->tx_ring[tx_id];
+	txdp = &txq->i40e_tx_ring[tx_id];
 	txep = &txq->sw_ring[tx_id];
 
 	txq->nb_tx_free = (uint16_t)(txq->nb_tx_free - nb_pkts);
@@ -734,7 +734,7 @@ i40e_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 		txq->tx_next_rs = (uint16_t)(txq->tx_rs_thresh - 1);
 
 		/* avoid reach the end of ring */
-		txdp = &txq->tx_ring[tx_id];
+		txdp = &txq->i40e_tx_ring[tx_id];
 		txep = &txq->sw_ring[tx_id];
 	}
 
@@ -744,7 +744,7 @@ i40e_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	tx_id = (uint16_t)(tx_id + nb_commit);
 	if (tx_id > txq->tx_next_rs) {
-		txq->tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
+		txq->i40e_tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
 			rte_cpu_to_le_64(((uint64_t)I40E_TX_DESC_CMD_RS) <<
 						I40E_TXD_QW1_CMD_SHIFT);
 		txq->tx_next_rs =
drivers/net/intel/iavf/iavf_rxtx.c +12 -12
index e2f4983b75..c20c236591 100644
@@ -296,11 +296,11 @@ reset_tx_queue(struct iavf_tx_queue *txq)
 	txe = txq->sw_ring;
 	size = sizeof(struct iavf_tx_desc) * txq->nb_tx_desc;
 	for (i = 0; i < size; i++)
-		((volatile char *)txq->tx_ring)[i] = 0;
+		((volatile char *)txq->iavf_tx_ring)[i] = 0;
 
 	prev = (uint16_t)(txq->nb_tx_desc - 1);
 	for (i = 0; i < txq->nb_tx_desc; i++) {
-		txq->tx_ring[i].cmd_type_offset_bsz =
+		txq->iavf_tx_ring[i].cmd_type_offset_bsz =
 			rte_cpu_to_le_64(IAVF_TX_DESC_DTYPE_DESC_DONE);
 		txe[i].mbuf =  NULL;
 		txe[i].last_id = i;
@@ -851,7 +851,7 @@ iavf_dev_tx_queue_setup(struct rte_eth_dev *dev,
 	txq->port_id = dev->data->port_id;
 	txq->offloads = offloads;
 	txq->tx_deferred_start = tx_conf->tx_deferred_start;
-	txq->vsi = vsi;
+	txq->iavf_vsi = vsi;
 
 	if (iavf_ipsec_crypto_supported(adapter))
 		txq->ipsec_crypto_pkt_md_offset =
@@ -872,7 +872,7 @@ iavf_dev_tx_queue_setup(struct rte_eth_dev *dev,
 	/* Allocate TX hardware ring descriptors. */
 	ring_size = sizeof(struct iavf_tx_desc) * IAVF_MAX_RING_DESC;
 	ring_size = RTE_ALIGN(ring_size, IAVF_DMA_MEM_ALIGN);
-	mz = rte_eth_dma_zone_reserve(dev, "tx_ring", queue_idx,
+	mz = rte_eth_dma_zone_reserve(dev, "iavf_tx_ring", queue_idx,
 				      ring_size, IAVF_RING_BASE_ALIGN,
 				      socket_id);
 	if (!mz) {
@@ -882,7 +882,7 @@ iavf_dev_tx_queue_setup(struct rte_eth_dev *dev,
 		return -ENOMEM;
 	}
 	txq->tx_ring_dma = mz->iova;
-	txq->tx_ring = (struct iavf_tx_desc *)mz->addr;
+	txq->iavf_tx_ring = (struct iavf_tx_desc *)mz->addr;
 
 	txq->mz = mz;
 	reset_tx_queue(txq);
@@ -2385,7 +2385,7 @@ iavf_xmit_cleanup(struct iavf_tx_queue *txq)
 	uint16_t desc_to_clean_to;
 	uint16_t nb_tx_to_clean;
 
-	volatile struct iavf_tx_desc *txd = txq->tx_ring;
+	volatile struct iavf_tx_desc *txd = txq->iavf_tx_ring;
 
 	desc_to_clean_to = (uint16_t)(last_desc_cleaned + txq->tx_rs_thresh);
 	if (desc_to_clean_to >= nb_tx_desc)
@@ -2796,7 +2796,7 @@ uint16_t
 iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 {
 	struct iavf_tx_queue *txq = tx_queue;
-	volatile struct iavf_tx_desc *txr = txq->tx_ring;
+	volatile struct iavf_tx_desc *txr = txq->iavf_tx_ring;
 	struct ci_tx_entry *txe_ring = txq->sw_ring;
 	struct ci_tx_entry *txe, *txn;
 	struct rte_mbuf *mb, *mb_seg;
@@ -3803,10 +3803,10 @@ iavf_xmit_pkts_no_poll(void *tx_queue, struct rte_mbuf **tx_pkts,
 	struct iavf_tx_queue *txq = tx_queue;
 	enum iavf_tx_burst_type tx_burst_type;
 
-	if (!txq->vsi || txq->vsi->adapter->no_poll)
+	if (!txq->iavf_vsi || txq->iavf_vsi->adapter->no_poll)
 		return 0;
 
-	tx_burst_type = txq->vsi->adapter->tx_burst_type;
+	tx_burst_type = txq->iavf_vsi->adapter->tx_burst_type;
 
 	return iavf_tx_pkt_burst_ops[tx_burst_type](tx_queue,
 								tx_pkts, nb_pkts);
@@ -3824,9 +3824,9 @@ iavf_xmit_pkts_check(void *tx_queue, struct rte_mbuf **tx_pkts,
 	const char *reason = NULL;
 	bool pkt_error = false;
 	struct iavf_tx_queue *txq = tx_queue;
-	struct iavf_adapter *adapter = txq->vsi->adapter;
+	struct iavf_adapter *adapter = txq->iavf_vsi->adapter;
 	enum iavf_tx_burst_type tx_burst_type =
-		txq->vsi->adapter->tx_burst_type;
+		txq->iavf_vsi->adapter->tx_burst_type;
 
 	for (idx = 0; idx < nb_pkts; idx++) {
 		mb = tx_pkts[idx];
@@ -4440,7 +4440,7 @@ iavf_dev_tx_desc_status(void *tx_queue, uint16_t offset)
 			desc -= txq->nb_tx_desc;
 	}
 
-	status = &txq->tx_ring[desc].cmd_type_offset_bsz;
+	status = &txq->iavf_tx_ring[desc].cmd_type_offset_bsz;
 	mask = rte_le_to_cpu_64(IAVF_TXD_QW1_DTYPE_MASK);
 	expect = rte_cpu_to_le_64(
 		 IAVF_TX_DESC_DTYPE_DESC_DONE << IAVF_TXD_QW1_DTYPE_SHIFT);
drivers/net/intel/iavf/iavf_rxtx.h +2 -2
index fb6775cd9c..29995697a6 100644
@@ -276,7 +276,7 @@ struct iavf_rx_queue {
 /* Structure associated with each TX queue. */
 struct iavf_tx_queue {
 	const struct rte_memzone *mz;  /* memzone for Tx ring */
-	volatile struct iavf_tx_desc *tx_ring; /* Tx ring virtual address */
+	volatile struct iavf_tx_desc *iavf_tx_ring; /* Tx ring virtual address */
 	rte_iova_t tx_ring_dma;    /* Tx ring DMA address */
 	struct ci_tx_entry *sw_ring;  /* address array of SW ring */
 	uint16_t nb_tx_desc;           /* ring length */
@@ -289,7 +289,7 @@ struct iavf_tx_queue {
 	uint16_t tx_free_thresh;
 	uint16_t tx_rs_thresh;
 	uint8_t rel_mbufs_type;
-	struct iavf_vsi *vsi; /**< the VSI this queue belongs to */
+	struct iavf_vsi *iavf_vsi; /**< the VSI this queue belongs to */
 
 	uint16_t port_id;
 	uint16_t queue_id;
drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c +3 -3
index 42e09a2adf..f33ceceee1 100644
@@ -1751,7 +1751,7 @@ iavf_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 	nb_commit = nb_pkts;
 
 	tx_id = txq->tx_tail;
-	txdp = &txq->tx_ring[tx_id];
+	txdp = &txq->iavf_tx_ring[tx_id];
 	txep = &txq->sw_ring[tx_id];
 
 	txq->nb_tx_free = (uint16_t)(txq->nb_tx_free - nb_pkts);
@@ -1772,7 +1772,7 @@ iavf_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 		txq->tx_next_rs = (uint16_t)(txq->tx_rs_thresh - 1);
 
 		/* avoid reach the end of ring */
-		txdp = &txq->tx_ring[tx_id];
+		txdp = &txq->iavf_tx_ring[tx_id];
 		txep = &txq->sw_ring[tx_id];
 	}
 
@@ -1782,7 +1782,7 @@ iavf_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	tx_id = (uint16_t)(tx_id + nb_commit);
 	if (tx_id > txq->tx_next_rs) {
-		txq->tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
+		txq->iavf_tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
 			rte_cpu_to_le_64(((uint64_t)IAVF_TX_DESC_CMD_RS) <<
 					 IAVF_TXD_QW1_CMD_SHIFT);
 		txq->tx_next_rs =
drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c +7 -7
index dc1fef24f0..97420a75fd 100644
@@ -1854,7 +1854,7 @@ iavf_tx_free_bufs_avx512(struct iavf_tx_queue *txq)
 	struct rte_mbuf *m, *free[IAVF_VPMD_TX_MAX_FREE_BUF];
 
 	/* check DD bits on threshold descriptor */
-	if ((txq->tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
+	if ((txq->iavf_tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
 	     rte_cpu_to_le_64(IAVF_TXD_QW1_DTYPE_MASK)) !=
 	    rte_cpu_to_le_64(IAVF_TX_DESC_DTYPE_DESC_DONE))
 		return 0;
@@ -2328,7 +2328,7 @@ iavf_xmit_fixed_burst_vec_avx512(void *tx_queue, struct rte_mbuf **tx_pkts,
 	nb_commit = nb_pkts;
 
 	tx_id = txq->tx_tail;
-	txdp = &txq->tx_ring[tx_id];
+	txdp = &txq->iavf_tx_ring[tx_id];
 	txep = (void *)txq->sw_ring;
 	txep += tx_id;
 
@@ -2350,7 +2350,7 @@ iavf_xmit_fixed_burst_vec_avx512(void *tx_queue, struct rte_mbuf **tx_pkts,
 		txq->tx_next_rs = (uint16_t)(txq->tx_rs_thresh - 1);
 
 		/* avoid reach the end of ring */
-		txdp = &txq->tx_ring[tx_id];
+		txdp = &txq->iavf_tx_ring[tx_id];
 		txep = (void *)txq->sw_ring;
 		txep += tx_id;
 	}
@@ -2361,7 +2361,7 @@ iavf_xmit_fixed_burst_vec_avx512(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	tx_id = (uint16_t)(tx_id + nb_commit);
 	if (tx_id > txq->tx_next_rs) {
-		txq->tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
+		txq->iavf_tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
 			rte_cpu_to_le_64(((uint64_t)IAVF_TX_DESC_CMD_RS) <<
 					 IAVF_TXD_QW1_CMD_SHIFT);
 		txq->tx_next_rs =
@@ -2397,7 +2397,7 @@ iavf_xmit_fixed_burst_vec_avx512_ctx(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	nb_pkts = nb_commit >> 1;
 	tx_id = txq->tx_tail;
-	txdp = &txq->tx_ring[tx_id];
+	txdp = &txq->iavf_tx_ring[tx_id];
 	txep = (void *)txq->sw_ring;
 	txep += (tx_id >> 1);
 
@@ -2418,7 +2418,7 @@ iavf_xmit_fixed_burst_vec_avx512_ctx(void *tx_queue, struct rte_mbuf **tx_pkts,
 		txq->tx_next_rs = (uint16_t)(txq->tx_rs_thresh - 1);
 		tx_id = 0;
 		/* avoid reach the end of ring */
-		txdp = txq->tx_ring;
+		txdp = txq->iavf_tx_ring;
 		txep = (void *)txq->sw_ring;
 	}
 
@@ -2429,7 +2429,7 @@ iavf_xmit_fixed_burst_vec_avx512_ctx(void *tx_queue, struct rte_mbuf **tx_pkts,
 	tx_id = (uint16_t)(tx_id + nb_commit);
 
 	if (tx_id > txq->tx_next_rs) {
-		txq->tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
+		txq->iavf_tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
 			rte_cpu_to_le_64(((uint64_t)IAVF_TX_DESC_CMD_RS) <<
 					 IAVF_TXD_QW1_CMD_SHIFT);
 		txq->tx_next_rs =
drivers/net/intel/iavf/iavf_rxtx_vec_common.h +1 -1
index fdd93bad35..a875113620 100644
@@ -26,7 +26,7 @@ iavf_tx_free_bufs(struct iavf_tx_queue *txq)
 	struct rte_mbuf *m, *free[IAVF_VPMD_TX_MAX_FREE_BUF];
 
 	/* check DD bits on threshold descriptor */
-	if ((txq->tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
+	if ((txq->iavf_tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
 			rte_cpu_to_le_64(IAVF_TXD_QW1_DTYPE_MASK)) !=
 			rte_cpu_to_le_64(IAVF_TX_DESC_DTYPE_DESC_DONE))
 		return 0;
drivers/net/intel/iavf/iavf_rxtx_vec_sse.c +3 -3
index ed8455d669..64c3bf0eaa 100644
@@ -1383,7 +1383,7 @@ iavf_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 	nb_commit = nb_pkts;
 
 	tx_id = txq->tx_tail;
-	txdp = &txq->tx_ring[tx_id];
+	txdp = &txq->iavf_tx_ring[tx_id];
 	txep = &txq->sw_ring[tx_id];
 
 	txq->nb_tx_free = (uint16_t)(txq->nb_tx_free - nb_pkts);
@@ -1403,7 +1403,7 @@ iavf_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 		txq->tx_next_rs = (uint16_t)(txq->tx_rs_thresh - 1);
 
 		/* avoid reach the end of ring */
-		txdp = &txq->tx_ring[tx_id];
+		txdp = &txq->iavf_tx_ring[tx_id];
 		txep = &txq->sw_ring[tx_id];
 	}
 
@@ -1413,7 +1413,7 @@ iavf_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	tx_id = (uint16_t)(tx_id + nb_commit);
 	if (tx_id > txq->tx_next_rs) {
-		txq->tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
+		txq->iavf_tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
 			rte_cpu_to_le_64(((uint64_t)IAVF_TX_DESC_CMD_RS) <<
 					 IAVF_TXD_QW1_CMD_SHIFT);
 		txq->tx_next_rs =
drivers/net/intel/ice/ice_dcf_ethdev.c +2 -2
index 4b98e4066b..4ffd1f5567 100644
@@ -401,11 +401,11 @@ reset_tx_queue(struct ice_tx_queue *txq)
 	txe = txq->sw_ring;
 	size = sizeof(struct ice_tx_desc) * txq->nb_tx_desc;
 	for (i = 0; i < size; i++)
-		((volatile char *)txq->tx_ring)[i] = 0;
+		((volatile char *)txq->ice_tx_ring)[i] = 0;
 
 	prev = (uint16_t)(txq->nb_tx_desc - 1);
 	for (i = 0; i < txq->nb_tx_desc; i++) {
-		txq->tx_ring[i].cmd_type_offset_bsz =
+		txq->ice_tx_ring[i].cmd_type_offset_bsz =
 			rte_cpu_to_le_64(IAVF_TX_DESC_DTYPE_DESC_DONE);
 		txe[i].mbuf =  NULL;
 		txe[i].last_id = i;
drivers/net/intel/ice/ice_rxtx.c +24 -24

179 lines not on this page · raw message

drivers/net/intel/ice/ice_rxtx.h +2 -2
index 597d9ad2b2..de662496a0 100644
@@ -148,7 +148,7 @@ struct ice_rx_queue {
 struct ice_tx_queue {
 	uint16_t nb_tx_desc; /* number of TX descriptors */
 	rte_iova_t tx_ring_dma; /* TX ring DMA address */
-	volatile struct ice_tx_desc *tx_ring; /* TX ring virtual address */
+	volatile struct ice_tx_desc *ice_tx_ring; /* TX ring virtual address */
 	struct ci_tx_entry *sw_ring; /* virtual address of SW ring */
 	uint16_t tx_tail; /* current value of tail register */
 	volatile uint8_t *qtx_tail; /* register address of tail */
@@ -171,7 +171,7 @@ struct ice_tx_queue {
 	uint32_t q_teid; /* TX schedule node id. */
 	uint16_t reg_idx;
 	uint64_t offloads;
-	struct ice_vsi *vsi; /* the VSI this queue belongs to */
+	struct ice_vsi *ice_vsi; /* the VSI this queue belongs to */
 	uint16_t tx_next_dd;
 	uint16_t tx_next_rs;
 	uint64_t mbuf_errors;
drivers/net/intel/ice/ice_rxtx_vec_avx2.c +3 -3
index 336697e72d..dde07ac99e 100644
@@ -874,7 +874,7 @@ ice_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 		return 0;
 
 	tx_id = txq->tx_tail;
-	txdp = &txq->tx_ring[tx_id];
+	txdp = &txq->ice_tx_ring[tx_id];
 	txep = &txq->sw_ring[tx_id];
 
 	txq->nb_tx_free = (uint16_t)(txq->nb_tx_free - nb_pkts);
@@ -895,7 +895,7 @@ ice_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 		txq->tx_next_rs = (uint16_t)(txq->tx_rs_thresh - 1);
 
 		/* avoid reach the end of ring */
-		txdp = &txq->tx_ring[tx_id];
+		txdp = &txq->ice_tx_ring[tx_id];
 		txep = &txq->sw_ring[tx_id];
 	}
 
@@ -905,7 +905,7 @@ ice_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	tx_id = (uint16_t)(tx_id + nb_commit);
 	if (tx_id > txq->tx_next_rs) {
-		txq->tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
+		txq->ice_tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
 			rte_cpu_to_le_64(((uint64_t)ICE_TX_DESC_CMD_RS) <<
 					 ICE_TXD_QW1_CMD_S);
 		txq->tx_next_rs =
drivers/net/intel/ice/ice_rxtx_vec_avx512.c +4 -4
index 6b6aa3f1fe..e4d0270176 100644
@@ -869,7 +869,7 @@ ice_tx_free_bufs_avx512(struct ice_tx_queue *txq)
 	struct rte_mbuf *m, *free[ICE_TX_MAX_FREE_BUF_SZ];
 
 	/* check DD bits on threshold descriptor */
-	if ((txq->tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
+	if ((txq->ice_tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
 			rte_cpu_to_le_64(ICE_TXD_QW1_DTYPE_M)) !=
 			rte_cpu_to_le_64(ICE_TX_DESC_DTYPE_DESC_DONE))
 		return 0;
@@ -1071,7 +1071,7 @@ ice_xmit_fixed_burst_vec_avx512(void *tx_queue, struct rte_mbuf **tx_pkts,
 		return 0;
 
 	tx_id = txq->tx_tail;
-	txdp = &txq->tx_ring[tx_id];
+	txdp = &txq->ice_tx_ring[tx_id];
 	txep = (void *)txq->sw_ring;
 	txep += tx_id;
 
@@ -1093,7 +1093,7 @@ ice_xmit_fixed_burst_vec_avx512(void *tx_queue, struct rte_mbuf **tx_pkts,
 		txq->tx_next_rs = (uint16_t)(txq->tx_rs_thresh - 1);
 
 		/* avoid reach the end of ring */
-		txdp = txq->tx_ring;
+		txdp = txq->ice_tx_ring;
 		txep = (void *)txq->sw_ring;
 	}
 
@@ -1103,7 +1103,7 @@ ice_xmit_fixed_burst_vec_avx512(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	tx_id = (uint16_t)(tx_id + nb_commit);
 	if (tx_id > txq->tx_next_rs) {
-		txq->tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
+		txq->ice_tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
 			rte_cpu_to_le_64(((uint64_t)ICE_TX_DESC_CMD_RS) <<
 					 ICE_TXD_QW1_CMD_S);
 		txq->tx_next_rs =
drivers/net/intel/ice/ice_rxtx_vec_common.h +2 -2
index 9a323ec378..de1d570d70 100644
@@ -22,7 +22,7 @@ ice_tx_free_bufs_vec(struct ice_tx_queue *txq)
 	struct rte_mbuf *m, *free[ICE_TX_MAX_FREE_BUF_SZ];
 
 	/* check DD bits on threshold descriptor */
-	if ((txq->tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
+	if ((txq->ice_tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
 			rte_cpu_to_le_64(ICE_TXD_QW1_DTYPE_M)) !=
 			rte_cpu_to_le_64(ICE_TX_DESC_DTYPE_DESC_DONE))
 		return 0;
@@ -121,7 +121,7 @@ _ice_tx_queue_release_mbufs_vec(struct ice_tx_queue *txq)
 	i = txq->tx_next_dd - txq->tx_rs_thresh + 1;
 
 #ifdef __AVX512VL__
-	struct rte_eth_dev *dev = &rte_eth_devices[txq->vsi->adapter->pf.dev_data->port_id];
+	struct rte_eth_dev *dev = &rte_eth_devices[txq->ice_vsi->adapter->pf.dev_data->port_id];
 
 	if (dev->tx_pkt_burst == ice_xmit_pkts_vec_avx512 ||
 	    dev->tx_pkt_burst == ice_xmit_pkts_vec_avx512_offload) {
drivers/net/intel/ice/ice_rxtx_vec_sse.c +3 -3
index debdd8f6a2..364207e8a8 100644
@@ -717,7 +717,7 @@ ice_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 		return 0;
 
 	tx_id = txq->tx_tail;
-	txdp = &txq->tx_ring[tx_id];
+	txdp = &txq->ice_tx_ring[tx_id];
 	txep = &txq->sw_ring[tx_id];
 
 	txq->nb_tx_free = (uint16_t)(txq->nb_tx_free - nb_pkts);
@@ -737,7 +737,7 @@ ice_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 		txq->tx_next_rs = (uint16_t)(txq->tx_rs_thresh - 1);
 
 		/* avoid reach the end of ring */
-		txdp = &txq->tx_ring[tx_id];
+		txdp = &txq->ice_tx_ring[tx_id];
 		txep = &txq->sw_ring[tx_id];
 	}
 
@@ -747,7 +747,7 @@ ice_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	tx_id = (uint16_t)(tx_id + nb_commit);
 	if (tx_id > txq->tx_next_rs) {
-		txq->tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
+		txq->ice_tx_ring[txq->tx_next_rs].cmd_type_offset_bsz |=
 			rte_cpu_to_le_64(((uint64_t)ICE_TX_DESC_CMD_RS) <<
 					 ICE_TXD_QW1_CMD_S);
 		txq->tx_next_rs =
drivers/net/intel/ixgbe/ixgbe_recycle_mbufs_vec_common.c +1 -1
index 2241726ad8..a878db3150 100644
@@ -72,7 +72,7 @@ ixgbe_recycle_tx_mbufs_reuse_vec(void *tx_queue,
 		return 0;
 
 	/* check DD bits on threshold descriptor */
-	status = txq->tx_ring[txq->tx_next_dd].wb.status;
+	status = txq->ixgbe_tx_ring[txq->tx_next_dd].wb.status;
 	if (!(status & IXGBE_ADVTXD_STAT_DD))
 		return 0;
 
drivers/net/intel/ixgbe/ixgbe_rxtx.c +11 -11
index 0a80b944f0..f7ddbba1b6 100644
@@ -106,7 +106,7 @@ ixgbe_tx_free_bufs(struct ixgbe_tx_queue *txq)
 	struct rte_mbuf *m, *free[RTE_IXGBE_TX_MAX_FREE_BUF_SZ];
 
 	/* check DD bit on threshold descriptor */
-	status = txq->tx_ring[txq->tx_next_dd].wb.status;
+	status = txq->ixgbe_tx_ring[txq->tx_next_dd].wb.status;
 	if (!(status & rte_cpu_to_le_32(IXGBE_ADVTXD_STAT_DD)))
 		return 0;
 
@@ -198,7 +198,7 @@ static inline void
 ixgbe_tx_fill_hw_ring(struct ixgbe_tx_queue *txq, struct rte_mbuf **pkts,
 		      uint16_t nb_pkts)
 {
-	volatile union ixgbe_adv_tx_desc *txdp = &(txq->tx_ring[txq->tx_tail]);
+	volatile union ixgbe_adv_tx_desc *txdp = &txq->ixgbe_tx_ring[txq->tx_tail];
 	struct ci_tx_entry *txep = &txq->sw_ring[txq->tx_tail];
 	const int N_PER_LOOP = 4;
 	const int N_PER_LOOP_MASK = N_PER_LOOP-1;
@@ -232,7 +232,7 @@ tx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
 	     uint16_t nb_pkts)
 {
 	struct ixgbe_tx_queue *txq = (struct ixgbe_tx_queue *)tx_queue;
-	volatile union ixgbe_adv_tx_desc *tx_r = txq->tx_ring;
+	volatile union ixgbe_adv_tx_desc *tx_r = txq->ixgbe_tx_ring;
 	uint16_t n = 0;
 
 	/*
@@ -564,7 +564,7 @@ static inline int
 ixgbe_xmit_cleanup(struct ixgbe_tx_queue *txq)
 {
 	struct ci_tx_entry *sw_ring = txq->sw_ring;
-	volatile union ixgbe_adv_tx_desc *txr = txq->tx_ring;
+	volatile union ixgbe_adv_tx_desc *txr = txq->ixgbe_tx_ring;
 	uint16_t last_desc_cleaned = txq->last_desc_cleaned;
 	uint16_t nb_tx_desc = txq->nb_tx_desc;
 	uint16_t desc_to_clean_to;
@@ -652,7 +652,7 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
 	tx_offload.data[1] = 0;
 	txq = tx_queue;
 	sw_ring = txq->sw_ring;
-	txr     = txq->tx_ring;
+	txr     = txq->ixgbe_tx_ring;
 	tx_id   = txq->tx_tail;
 	txe = &sw_ring[tx_id];
 	txp = NULL;
@@ -2495,13 +2495,13 @@ ixgbe_reset_tx_queue(struct ixgbe_tx_queue *txq)
 
 	/* Zero out HW ring memory */
 	for (i = 0; i < txq->nb_tx_desc; i++) {
-		txq->tx_ring[i] = zeroed_desc;
+		txq->ixgbe_tx_ring[i] = zeroed_desc;
 	}
 
 	/* Initialize SW ring entries */
 	prev = (uint16_t) (txq->nb_tx_desc - 1);
 	for (i = 0; i < txq->nb_tx_desc; i++) {
-		volatile union ixgbe_adv_tx_desc *txd = &txq->tx_ring[i];
+		volatile union ixgbe_adv_tx_desc *txd = &txq->ixgbe_tx_ring[i];
 
 		txd->wb.status = rte_cpu_to_le_32(IXGBE_TXD_STAT_DD);
 		txe[i].mbuf = NULL;
@@ -2751,7 +2751,7 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
 	 * handle the maximum ring size is allocated in order to allow for
 	 * resizing in later calls to the queue setup function.
 	 */
-	tz = rte_eth_dma_zone_reserve(dev, "tx_ring", queue_idx,
+	tz = rte_eth_dma_zone_reserve(dev, "ixgbe_tx_ring", queue_idx,
 			sizeof(union ixgbe_adv_tx_desc) * IXGBE_MAX_RING_DESC,
 			IXGBE_ALIGN, socket_id);
 	if (tz == NULL) {
@@ -2791,7 +2791,7 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
 		txq->qtx_tail = IXGBE_PCI_REG_ADDR(hw, IXGBE_TDT(txq->reg_idx));
 
 	txq->tx_ring_dma = tz->iova;
-	txq->tx_ring = (union ixgbe_adv_tx_desc *) tz->addr;
+	txq->ixgbe_tx_ring = (union ixgbe_adv_tx_desc *)tz->addr;
 
 	/* Allocate software ring */
 	txq->sw_ring = rte_zmalloc_socket("txq->sw_ring",
@@ -2802,7 +2802,7 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
 		return -ENOMEM;
 	}
 	PMD_INIT_LOG(DEBUG, "sw_ring=%p hw_ring=%p dma_addr=0x%"PRIx64,
-		     txq->sw_ring, txq->tx_ring, txq->tx_ring_dma);
+		     txq->sw_ring, txq->ixgbe_tx_ring, txq->tx_ring_dma);
 
 	/* set up vector or scalar TX function as appropriate */
 	ixgbe_set_tx_function(dev, txq);
@@ -3328,7 +3328,7 @@ ixgbe_dev_tx_descriptor_status(void *tx_queue, uint16_t offset)
 			desc -= txq->nb_tx_desc;
 	}
 
-	status = &txq->tx_ring[desc].wb.status;
+	status = &txq->ixgbe_tx_ring[desc].wb.status;
 	if (*status & rte_cpu_to_le_32(IXGBE_ADVTXD_STAT_DD))
 		return RTE_ETH_TX_DESC_DONE;
 
drivers/net/intel/ixgbe/ixgbe_rxtx.h +1 -1
index 236de014c8..581676d01c 100644
@@ -185,7 +185,7 @@ struct ixgbe_advctx_info {
  */
 struct ixgbe_tx_queue {
 	/** TX ring virtual address. */
-	volatile union ixgbe_adv_tx_desc *tx_ring;
+	volatile union ixgbe_adv_tx_desc *ixgbe_tx_ring;
 	rte_iova_t tx_ring_dma; /**< TX ring DMA address. */
 	union {
 		struct ci_tx_entry *sw_ring; /**< address of SW ring for scalar PMD. */
drivers/net/intel/ixgbe/ixgbe_rxtx_vec_common.h +3 -3
index 0d83f6feca..6e6b24e5fd 100644
@@ -22,7 +22,7 @@ ixgbe_tx_free_bufs(struct ixgbe_tx_queue *txq)
 	struct rte_mbuf *m, *free[RTE_IXGBE_TX_MAX_FREE_BUF_SZ];
 
 	/* check DD bit on threshold descriptor */
-	status = txq->tx_ring[txq->tx_next_dd].wb.status;
+	status = txq->ixgbe_tx_ring[txq->tx_next_dd].wb.status;
 	if (!(status & IXGBE_ADVTXD_STAT_DD))
 		return 0;
 
@@ -154,11 +154,11 @@ _ixgbe_reset_tx_queue_vec(struct ixgbe_tx_queue *txq)
 
 	/* Zero out HW ring memory */
 	for (i = 0; i < txq->nb_tx_desc; i++)
-		txq->tx_ring[i] = zeroed_desc;
+		txq->ixgbe_tx_ring[i] = zeroed_desc;
 
 	/* Initialize SW ring entries */
 	for (i = 0; i < txq->nb_tx_desc; i++) {
-		volatile union ixgbe_adv_tx_desc *txd = &txq->tx_ring[i];
+		volatile union ixgbe_adv_tx_desc *txd = &txq->ixgbe_tx_ring[i];
 
 		txd->wb.status = IXGBE_TXD_STAT_DD;
 		txe[i].mbuf = NULL;
drivers/net/intel/ixgbe/ixgbe_rxtx_vec_neon.c +3 -3
index 871c1a7cd2..06be7ec82a 100644
@@ -590,7 +590,7 @@ ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 		return 0;
 
 	tx_id = txq->tx_tail;
-	txdp = &txq->tx_ring[tx_id];
+	txdp = &txq->ixgbe_tx_ring[tx_id];
 	txep = &txq->sw_ring_v[tx_id];
 
 	txq->nb_tx_free = (uint16_t)(txq->nb_tx_free - nb_pkts);
@@ -610,7 +610,7 @@ ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 		txq->tx_next_rs = (uint16_t)(txq->tx_rs_thresh - 1);
 
 		/* avoid reach the end of ring */
-		txdp = &txq->tx_ring[tx_id];
+		txdp = &txq->ixgbe_tx_ring[tx_id];
 		txep = &txq->sw_ring_v[tx_id];
 	}
 
@@ -620,7 +620,7 @@ ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	tx_id = (uint16_t)(tx_id + nb_commit);
 	if (tx_id > txq->tx_next_rs) {
-		txq->tx_ring[txq->tx_next_rs].read.cmd_type_len |=
+		txq->ixgbe_tx_ring[txq->tx_next_rs].read.cmd_type_len |=
 			rte_cpu_to_le_32(IXGBE_ADVTXD_DCMD_RS);
 		txq->tx_next_rs = (uint16_t)(txq->tx_next_rs +
 			txq->tx_rs_thresh);
drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c +3 -3
index 37f2079519..a21a57bd55 100644
@@ -712,7 +712,7 @@ ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 		return 0;
 
 	tx_id = txq->tx_tail;
-	txdp = &txq->tx_ring[tx_id];
+	txdp = &txq->ixgbe_tx_ring[tx_id];
 	txep = &txq->sw_ring_v[tx_id];
 
 	txq->nb_tx_free = (uint16_t)(txq->nb_tx_free - nb_pkts);
@@ -733,7 +733,7 @@ ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 		txq->tx_next_rs = (uint16_t)(txq->tx_rs_thresh - 1);
 
 		/* avoid reach the end of ring */
-		txdp = &(txq->tx_ring[tx_id]);
+		txdp = &txq->ixgbe_tx_ring[tx_id];
 		txep = &txq->sw_ring_v[tx_id];
 	}
 
@@ -743,7 +743,7 @@ ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	tx_id = (uint16_t)(tx_id + nb_commit);
 	if (tx_id > txq->tx_next_rs) {
-		txq->tx_ring[txq->tx_next_rs].read.cmd_type_len |=
+		txq->ixgbe_tx_ring[txq->tx_next_rs].read.cmd_type_len |=
 			rte_cpu_to_le_32(IXGBE_ADVTXD_DCMD_RS);
 		txq->tx_next_rs = (uint16_t)(txq->tx_next_rs +
 			txq->tx_rs_thresh);
Signature · 1 line
2.43.0
#155 lore raw

PATCH v5 7/25 net/intel/common: merge ice and i40e Tx queue struct

In reply to Bruce Richardson

The queue structures of i40e and ice drivers are virtually identical, so merge them into a common struct. This should allow easier function merging in future using that common struct.

---
 drivers/net/intel/common/tx.h                 | 55 +++++++++++++++++
 drivers/net/intel/i40e/i40e_ethdev.c          |  4 +-
 drivers/net/intel/i40e/i40e_ethdev.h          |  4 +-
 drivers/net/intel/i40e/i40e_fdir.c            |  4 +-
 .../i40e/i40e_recycle_mbufs_vec_common.c      |  2 +-
 drivers/net/intel/i40e/i40e_rxtx.c            | 58 +++++++++---------
 drivers/net/intel/i40e/i40e_rxtx.h            | 50 ++--------------
 .../net/intel/i40e/i40e_rxtx_vec_altivec.c    |  4 +-
 drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c   |  4 +-
 drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c |  6 +-
 drivers/net/intel/i40e/i40e_rxtx_vec_common.h |  2 +-
 drivers/net/intel/i40e/i40e_rxtx_vec_neon.c   |  4 +-
 drivers/net/intel/i40e/i40e_rxtx_vec_sse.c    |  4 +-
 drivers/net/intel/ice/ice_dcf.c               |  4 +-
 drivers/net/intel/ice/ice_dcf_ethdev.c        | 10 ++--
 drivers/net/intel/ice/ice_diagnose.c          |  2 +-
 drivers/net/intel/ice/ice_ethdev.c            |  2 +-
 drivers/net/intel/ice/ice_ethdev.h            |  4 +-
 drivers/net/intel/ice/ice_rxtx.c              | 60 +++++++++----------
 drivers/net/intel/ice/ice_rxtx.h              | 41 +------------
 drivers/net/intel/ice/ice_rxtx_vec_avx2.c     |  4 +-
 drivers/net/intel/ice/ice_rxtx_vec_avx512.c   |  8 +--
 drivers/net/intel/ice/ice_rxtx_vec_common.h   |  8 +--
 drivers/net/intel/ice/ice_rxtx_vec_sse.c      |  6 +-
 24 files changed, 165 insertions(+), 185 deletions(-)
drivers/net/intel/common/tx.h +55 -0
index 5397007411..c965f5ee6c 100644
@@ -8,6 +8,9 @@
 #include <stdint.h>
 #include <rte_mbuf.h>
 
+/* forward declaration of the common intel (ci) queue structure */
+struct ci_tx_queue;
+
 /**
  * Structure associated with each descriptor of the TX ring of a TX queue.
  */
@@ -24,6 +27,58 @@ struct ci_tx_entry_vec {
 	struct rte_mbuf *mbuf; /* mbuf associated with TX desc, if any. */
 };
 
+typedef void (*ice_tx_release_mbufs_t)(struct ci_tx_queue *txq);
+
+struct ci_tx_queue {
+	union { /* TX ring virtual address */
+		volatile struct ice_tx_desc *ice_tx_ring;
+		volatile struct i40e_tx_desc *i40e_tx_ring;
+	};
+	volatile uint8_t *qtx_tail;               /* register address of tail */
+	struct ci_tx_entry *sw_ring; /* virtual address of SW ring */
+	rte_iova_t tx_ring_dma;        /* TX ring DMA address */
+	uint16_t nb_tx_desc;           /* number of TX descriptors */
+	uint16_t tx_tail; /* current value of tail register */
+	uint16_t nb_tx_used; /* number of TX desc used since RS bit set */
+	/* index to last TX descriptor to have been cleaned */
+	uint16_t last_desc_cleaned;
+	/* Total number of TX descriptors ready to be allocated. */
+	uint16_t nb_tx_free;
+	/* Start freeing TX buffers if there are less free descriptors than
+	 * this value.
+	 */
+	uint16_t tx_free_thresh;
+	/* Number of TX descriptors to use before RS bit is set. */
+	uint16_t tx_rs_thresh;
+	uint8_t pthresh;   /**< Prefetch threshold register. */
+	uint8_t hthresh;   /**< Host threshold register. */
+	uint8_t wthresh;   /**< Write-back threshold reg. */
+	uint16_t port_id;  /* Device port identifier. */
+	uint16_t queue_id; /* TX queue index. */
+	uint16_t reg_idx;
+	uint64_t offloads;
+	uint16_t tx_next_dd;
+	uint16_t tx_next_rs;
+	uint64_t mbuf_errors;
+	bool tx_deferred_start; /* don't start this queue in dev start */
+	bool q_set;             /* indicate if tx queue has been configured */
+	union {                  /* the VSI this queue belongs to */
+		struct ice_vsi *ice_vsi;
+		struct i40e_vsi *i40e_vsi;
+	};
+	const struct rte_memzone *mz;
+
+	union {
+		struct { /* ICE driver specific values */
+			ice_tx_release_mbufs_t tx_rel_mbufs;
+			uint32_t q_teid; /* TX schedule node id. */
+		};
+		struct { /* I40E driver specific values */
+			uint8_t dcb_tc;
+		};
+	};
+};
+
 static __rte_always_inline void
 ci_tx_backlog_entry(struct ci_tx_entry *txep, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 {
drivers/net/intel/i40e/i40e_ethdev.c +2 -2
index 30dcdc68a8..bf5560ccc8 100644
@@ -3685,7 +3685,7 @@ i40e_dev_update_mbuf_stats(struct rte_eth_dev *ethdev,
 		struct i40e_mbuf_stats *mbuf_stats)
 {
 	uint16_t idx;
-	struct i40e_tx_queue *txq;
+	struct ci_tx_queue *txq;
 
 	for (idx = 0; idx < ethdev->data->nb_tx_queues; idx++) {
 		txq = ethdev->data->tx_queues[idx];
@@ -6585,7 +6585,7 @@ i40e_dev_tx_init(struct i40e_pf *pf)
 	struct rte_eth_dev_data *data = pf->dev_data;
 	uint16_t i;
 	uint32_t ret = I40E_SUCCESS;
-	struct i40e_tx_queue *txq;
+	struct ci_tx_queue *txq;
 
 	for (i = 0; i < data->nb_tx_queues; i++) {
 		txq = data->tx_queues[i];
drivers/net/intel/i40e/i40e_ethdev.h +2 -2
index 98213948b4..d351193ed9 100644
@@ -334,7 +334,7 @@ struct i40e_vsi_list {
 };
 
 struct i40e_rx_queue;
-struct i40e_tx_queue;
+struct ci_tx_queue;
 
 /* Bandwidth limit information */
 struct i40e_bw_info {
@@ -738,7 +738,7 @@ TAILQ_HEAD(i40e_fdir_filter_list, i40e_fdir_filter);
 struct i40e_fdir_info {
 	struct i40e_vsi *fdir_vsi;     /* pointer to fdir VSI structure */
 	uint16_t match_counter_index;  /* Statistic counter index used for fdir*/
-	struct i40e_tx_queue *txq;
+	struct ci_tx_queue *txq;
 	struct i40e_rx_queue *rxq;
 	void *prg_pkt[I40E_FDIR_PRG_PKT_CNT];     /* memory for fdir program packet */
 	uint64_t dma_addr[I40E_FDIR_PRG_PKT_CNT]; /* physic address of packet memory*/
drivers/net/intel/i40e/i40e_fdir.c +2 -2
index c600167634..349627a2ed 100644
@@ -1372,7 +1372,7 @@ i40e_find_available_buffer(struct rte_eth_dev *dev)
 {
 	struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
 	struct i40e_fdir_info *fdir_info = &pf->fdir;
-	struct i40e_tx_queue *txq = pf->fdir.txq;
+	struct ci_tx_queue *txq = pf->fdir.txq;
 
 	/* no available buffer
 	 * search for more available buffers from the current
@@ -1628,7 +1628,7 @@ i40e_flow_fdir_filter_programming(struct i40e_pf *pf,
 				  const struct i40e_fdir_filter_conf *filter,
 				  bool add, bool wait_status)
 {
-	struct i40e_tx_queue *txq = pf->fdir.txq;
+	struct ci_tx_queue *txq = pf->fdir.txq;
 	struct i40e_rx_queue *rxq = pf->fdir.rxq;
 	const struct i40e_fdir_action *fdir_action = &filter->action;
 	volatile struct i40e_tx_desc *txdp;
drivers/net/intel/i40e/i40e_recycle_mbufs_vec_common.c +1 -1
index 8679e5c1fd..5a65c80d90 100644
@@ -55,7 +55,7 @@ uint16_t
 i40e_recycle_tx_mbufs_reuse_vec(void *tx_queue,
 	struct rte_eth_recycle_rxq_info *recycle_rxq_info)
 {
-	struct i40e_tx_queue *txq = tx_queue;
+	struct ci_tx_queue *txq = tx_queue;
 	struct ci_tx_entry *txep;
 	struct rte_mbuf **rxep;
 	int i, n;
drivers/net/intel/i40e/i40e_rxtx.c +29 -29

232 lines not on this page · raw message

drivers/net/intel/i40e/i40e_rxtx.h +6 -44

78 lines not on this page · raw message

drivers/net/intel/i40e/i40e_rxtx_vec_altivec.c +2 -2
index bf0e9ebd71..500bba2cef 100644
@@ -551,7 +551,7 @@ uint16_t
 i40e_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 			  uint16_t nb_pkts)
 {
-	struct i40e_tx_queue *txq = (struct i40e_tx_queue *)tx_queue;
+	struct ci_tx_queue *txq = (struct ci_tx_queue *)tx_queue;
 	volatile struct i40e_tx_desc *txdp;
 	struct ci_tx_entry *txep;
 	uint16_t n, nb_commit, tx_id;
@@ -625,7 +625,7 @@ i40e_rxq_vec_setup(struct i40e_rx_queue *rxq)
 }
 
 int __rte_cold
-i40e_txq_vec_setup(struct i40e_tx_queue __rte_unused * txq)
+i40e_txq_vec_setup(struct ci_tx_queue __rte_unused * txq)
 {
 	return 0;
 }
drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c +2 -2
index 5042e348db..29bef64287 100644
@@ -743,7 +743,7 @@ static inline uint16_t
 i40e_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 			  uint16_t nb_pkts)
 {
-	struct i40e_tx_queue *txq = (struct i40e_tx_queue *)tx_queue;
+	struct ci_tx_queue *txq = (struct ci_tx_queue *)tx_queue;
 	volatile struct i40e_tx_desc *txdp;
 	struct ci_tx_entry *txep;
 	uint16_t n, nb_commit, tx_id;
@@ -808,7 +808,7 @@ i40e_xmit_pkts_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 		   uint16_t nb_pkts)
 {
 	uint16_t nb_tx = 0;
-	struct i40e_tx_queue *txq = (struct i40e_tx_queue *)tx_queue;
+	struct ci_tx_queue *txq = (struct ci_tx_queue *)tx_queue;
 
 	while (nb_pkts) {
 		uint16_t ret, num;
drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c +3 -3
index 04fbe3b2e3..a3f6d1667f 100644
@@ -755,7 +755,7 @@ i40e_recv_scattered_pkts_vec_avx512(void *rx_queue,
 }
 
 static __rte_always_inline int
-i40e_tx_free_bufs_avx512(struct i40e_tx_queue *txq)
+i40e_tx_free_bufs_avx512(struct ci_tx_queue *txq)
 {
 	struct ci_tx_entry_vec *txep;
 	uint32_t n;
@@ -933,7 +933,7 @@ static inline uint16_t
 i40e_xmit_fixed_burst_vec_avx512(void *tx_queue, struct rte_mbuf **tx_pkts,
 				 uint16_t nb_pkts)
 {
-	struct i40e_tx_queue *txq = (struct i40e_tx_queue *)tx_queue;
+	struct ci_tx_queue *txq = (struct ci_tx_queue *)tx_queue;
 	volatile struct i40e_tx_desc *txdp;
 	struct ci_tx_entry_vec *txep;
 	uint16_t n, nb_commit, tx_id;
@@ -999,7 +999,7 @@ i40e_xmit_pkts_vec_avx512(void *tx_queue, struct rte_mbuf **tx_pkts,
 			  uint16_t nb_pkts)
 {
 	uint16_t nb_tx = 0;
-	struct i40e_tx_queue *txq = (struct i40e_tx_queue *)tx_queue;
+	struct ci_tx_queue *txq = (struct ci_tx_queue *)tx_queue;
 
 	while (nb_pkts) {
 		uint16_t ret, num;
drivers/net/intel/i40e/i40e_rxtx_vec_common.h +1 -1
index e98031cbd1..726fa716c9 100644
@@ -17,7 +17,7 @@
 #endif
 
 static __rte_always_inline int
-i40e_tx_free_bufs(struct i40e_tx_queue *txq)
+i40e_tx_free_bufs(struct ci_tx_queue *txq)
 {
 	struct ci_tx_entry *txep;
 	uint32_t n;
drivers/net/intel/i40e/i40e_rxtx_vec_neon.c +2 -2
index 05191e4884..c97f337e43 100644
@@ -679,7 +679,7 @@ uint16_t
 i40e_xmit_fixed_burst_vec(void *__rte_restrict tx_queue,
 	struct rte_mbuf **__rte_restrict tx_pkts, uint16_t nb_pkts)
 {
-	struct i40e_tx_queue *txq = (struct i40e_tx_queue *)tx_queue;
+	struct ci_tx_queue *txq = (struct ci_tx_queue *)tx_queue;
 	volatile struct i40e_tx_desc *txdp;
 	struct ci_tx_entry *txep;
 	uint16_t n, nb_commit, tx_id;
@@ -753,7 +753,7 @@ i40e_rxq_vec_setup(struct i40e_rx_queue *rxq)
 }
 
 int __rte_cold
-i40e_txq_vec_setup(struct i40e_tx_queue __rte_unused *txq)
+i40e_txq_vec_setup(struct ci_tx_queue *txq __rte_unused)
 {
 	return 0;
 }
drivers/net/intel/i40e/i40e_rxtx_vec_sse.c +2 -2
index d81b553842..2c467e2089 100644
@@ -698,7 +698,7 @@ uint16_t
 i40e_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 			  uint16_t nb_pkts)
 {
-	struct i40e_tx_queue *txq = (struct i40e_tx_queue *)tx_queue;
+	struct ci_tx_queue *txq = (struct ci_tx_queue *)tx_queue;
 	volatile struct i40e_tx_desc *txdp;
 	struct ci_tx_entry *txep;
 	uint16_t n, nb_commit, tx_id;
@@ -771,7 +771,7 @@ i40e_rxq_vec_setup(struct i40e_rx_queue *rxq)
 }
 
 int __rte_cold
-i40e_txq_vec_setup(struct i40e_tx_queue __rte_unused *txq)
+i40e_txq_vec_setup(struct ci_tx_queue *txq __rte_unused)
 {
 	return 0;
 }
drivers/net/intel/ice/ice_dcf.c +2 -2
index 204d4eadbb..65c18921f4 100644
@@ -1177,8 +1177,8 @@ ice_dcf_configure_queues(struct ice_dcf_hw *hw)
 {
 	struct ice_rx_queue **rxq =
 		(struct ice_rx_queue **)hw->eth_dev->data->rx_queues;
-	struct ice_tx_queue **txq =
-		(struct ice_tx_queue **)hw->eth_dev->data->tx_queues;
+	struct ci_tx_queue **txq =
+		(struct ci_tx_queue **)hw->eth_dev->data->tx_queues;
 	struct virtchnl_vsi_queue_config_info *vc_config;
 	struct virtchnl_queue_pair_info *vc_qp;
 	struct dcf_virtchnl_cmd args;
drivers/net/intel/ice/ice_dcf_ethdev.c +5 -5
index 4ffd1f5567..a0c065d78c 100644
@@ -387,7 +387,7 @@ reset_rx_queue(struct ice_rx_queue *rxq)
 }
 
 static inline void
-reset_tx_queue(struct ice_tx_queue *txq)
+reset_tx_queue(struct ci_tx_queue *txq)
 {
 	struct ci_tx_entry *txe;
 	uint32_t i, size;
@@ -454,7 +454,7 @@ ice_dcf_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id)
 {
 	struct ice_dcf_adapter *ad = dev->data->dev_private;
 	struct iavf_hw *hw = &ad->real_hw.avf;
-	struct ice_tx_queue *txq;
+	struct ci_tx_queue *txq;
 	int err = 0;
 
 	if (tx_queue_id >= dev->data->nb_tx_queues)
@@ -486,7 +486,7 @@ ice_dcf_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)
 {
 	struct ice_dcf_adapter *ad = dev->data->dev_private;
 	struct ice_dcf_hw *hw = &ad->real_hw;
-	struct ice_tx_queue *txq;
+	struct ci_tx_queue *txq;
 	int err;
 
 	if (tx_queue_id >= dev->data->nb_tx_queues)
@@ -511,7 +511,7 @@ static int
 ice_dcf_start_queues(struct rte_eth_dev *dev)
 {
 	struct ice_rx_queue *rxq;
-	struct ice_tx_queue *txq;
+	struct ci_tx_queue *txq;
 	int nb_rxq = 0;
 	int nb_txq, i;
 
@@ -638,7 +638,7 @@ ice_dcf_stop_queues(struct rte_eth_dev *dev)
 	struct ice_dcf_adapter *ad = dev->data->dev_private;
 	struct ice_dcf_hw *hw = &ad->real_hw;
 	struct ice_rx_queue *rxq;
-	struct ice_tx_queue *txq;
+	struct ci_tx_queue *txq;
 	int ret, i;
 
 	/* Stop All queues */
drivers/net/intel/ice/ice_diagnose.c +1 -1
index 5bec9d00ad..a50068441a 100644
@@ -605,7 +605,7 @@ void print_node(const struct rte_eth_dev_data *ethdata,
 			get_elem_type(data->data.elem_type));
 	if (data->data.elem_type == ICE_AQC_ELEM_TYPE_LEAF) {
 		for (uint16_t i = 0; i < ethdata->nb_tx_queues; i++) {
-			struct ice_tx_queue *q = ethdata->tx_queues[i];
+			struct ci_tx_queue *q = ethdata->tx_queues[i];
 			if (q->q_teid == data->node_teid) {
 				fprintf(stream, "\t\t\t\t<tr><td>TXQ</td><td>%u</td></tr>\n", i);
 				break;
drivers/net/intel/ice/ice_ethdev.c +1 -1
index 93a6308a86..80eee03204 100644
@@ -6448,7 +6448,7 @@ ice_update_mbuf_stats(struct rte_eth_dev *ethdev,
 		struct ice_mbuf_stats *mbuf_stats)
 {
 	uint16_t idx;
-	struct ice_tx_queue *txq;
+	struct ci_tx_queue *txq;
 
 	for (idx = 0; idx < ethdev->data->nb_tx_queues; idx++) {
 		txq = ethdev->data->tx_queues[idx];
drivers/net/intel/ice/ice_ethdev.h +2 -2
index a5b27fabd2..ba54655499 100644
@@ -258,7 +258,7 @@ struct ice_vsi_list {
 };
 
 struct ice_rx_queue;
-struct ice_tx_queue;
+struct ci_tx_queue;
 
 /**
  * Structure that defines a VSI, associated with a adapter.
@@ -408,7 +408,7 @@ struct ice_fdir_counter_pool_container {
  */
 struct ice_fdir_info {
 	struct ice_vsi *fdir_vsi;     /* pointer to fdir VSI structure */
-	struct ice_tx_queue *txq;
+	struct ci_tx_queue *txq;
 	struct ice_rx_queue *rxq;
 	void *prg_pkt;                 /* memory for fdir program packet */
 	uint64_t dma_addr;             /* physic address of packet memory*/
drivers/net/intel/ice/ice_rxtx.c +30 -30

240 lines not on this page · raw message

drivers/net/intel/ice/ice_rxtx.h +2 -39

65 lines not on this page · raw message

drivers/net/intel/ice/ice_rxtx_vec_avx2.c +2 -2
index dde07ac99e..12ffa0fa9a 100644
@@ -856,7 +856,7 @@ static __rte_always_inline uint16_t
 ice_xmit_fixed_burst_vec_avx2(void *tx_queue, struct rte_mbuf **tx_pkts,
 			      uint16_t nb_pkts, bool offload)
 {
-	struct ice_tx_queue *txq = (struct ice_tx_queue *)tx_queue;
+	struct ci_tx_queue *txq = (struct ci_tx_queue *)tx_queue;
 	volatile struct ice_tx_desc *txdp;
 	struct ci_tx_entry *txep;
 	uint16_t n, nb_commit, tx_id;
@@ -924,7 +924,7 @@ ice_xmit_pkts_vec_avx2_common(void *tx_queue, struct rte_mbuf **tx_pkts,
 			      uint16_t nb_pkts, bool offload)
 {
 	uint16_t nb_tx = 0;
-	struct ice_tx_queue *txq = (struct ice_tx_queue *)tx_queue;
+	struct ci_tx_queue *txq = (struct ci_tx_queue *)tx_queue;
 
 	while (nb_pkts) {
 		uint16_t ret, num;
drivers/net/intel/ice/ice_rxtx_vec_avx512.c +4 -4
index e4d0270176..eabd8b04a0 100644
@@ -860,7 +860,7 @@ ice_recv_scattered_pkts_vec_avx512_offload(void *rx_queue,
 }
 
 static __rte_always_inline int
-ice_tx_free_bufs_avx512(struct ice_tx_queue *txq)
+ice_tx_free_bufs_avx512(struct ci_tx_queue *txq)
 {
 	struct ci_tx_entry_vec *txep;
 	uint32_t n;
@@ -1053,7 +1053,7 @@ static __rte_always_inline uint16_t
 ice_xmit_fixed_burst_vec_avx512(void *tx_queue, struct rte_mbuf **tx_pkts,
 				uint16_t nb_pkts, bool do_offload)
 {
-	struct ice_tx_queue *txq = (struct ice_tx_queue *)tx_queue;
+	struct ci_tx_queue *txq = (struct ci_tx_queue *)tx_queue;
 	volatile struct ice_tx_desc *txdp;
 	struct ci_tx_entry_vec *txep;
 	uint16_t n, nb_commit, tx_id;
@@ -1122,7 +1122,7 @@ ice_xmit_pkts_vec_avx512(void *tx_queue, struct rte_mbuf **tx_pkts,
 			 uint16_t nb_pkts)
 {
 	uint16_t nb_tx = 0;
-	struct ice_tx_queue *txq = (struct ice_tx_queue *)tx_queue;
+	struct ci_tx_queue *txq = (struct ci_tx_queue *)tx_queue;
 
 	while (nb_pkts) {
 		uint16_t ret, num;
@@ -1144,7 +1144,7 @@ ice_xmit_pkts_vec_avx512_offload(void *tx_queue, struct rte_mbuf **tx_pkts,
 				 uint16_t nb_pkts)
 {
 	uint16_t nb_tx = 0;
-	struct ice_tx_queue *txq = (struct ice_tx_queue *)tx_queue;
+	struct ci_tx_queue *txq = (struct ci_tx_queue *)tx_queue;
 
 	while (nb_pkts) {
 		uint16_t ret, num;
drivers/net/intel/ice/ice_rxtx_vec_common.h +4 -4
index de1d570d70..1182f0a12d 100644
@@ -13,7 +13,7 @@
 #endif
 
 static __rte_always_inline int
-ice_tx_free_bufs_vec(struct ice_tx_queue *txq)
+ice_tx_free_bufs_vec(struct ci_tx_queue *txq)
 {
 	struct ci_tx_entry *txep;
 	uint32_t n;
@@ -105,7 +105,7 @@ _ice_rx_queue_release_mbufs_vec(struct ice_rx_queue *rxq)
 }
 
 static inline void
-_ice_tx_queue_release_mbufs_vec(struct ice_tx_queue *txq)
+_ice_tx_queue_release_mbufs_vec(struct ci_tx_queue *txq)
 {
 	uint16_t i;
 
@@ -231,7 +231,7 @@ ice_rx_vec_queue_default(struct ice_rx_queue *rxq)
 }
 
 static inline int
-ice_tx_vec_queue_default(struct ice_tx_queue *txq)
+ice_tx_vec_queue_default(struct ci_tx_queue *txq)
 {
 	if (!txq)
 		return -1;
@@ -273,7 +273,7 @@ static inline int
 ice_tx_vec_dev_check_default(struct rte_eth_dev *dev)
 {
 	int i;
-	struct ice_tx_queue *txq;
+	struct ci_tx_queue *txq;
 	int ret = 0;
 	int result = 0;
 
drivers/net/intel/ice/ice_rxtx_vec_sse.c +3 -3
index 364207e8a8..f11528385a 100644
@@ -697,7 +697,7 @@ static uint16_t
 ice_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 			 uint16_t nb_pkts)
 {
-	struct ice_tx_queue *txq = (struct ice_tx_queue *)tx_queue;
+	struct ci_tx_queue *txq = (struct ci_tx_queue *)tx_queue;
 	volatile struct ice_tx_desc *txdp;
 	struct ci_tx_entry *txep;
 	uint16_t n, nb_commit, tx_id;
@@ -766,7 +766,7 @@ ice_xmit_pkts_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 		  uint16_t nb_pkts)
 {
 	uint16_t nb_tx = 0;
-	struct ice_tx_queue *txq = (struct ice_tx_queue *)tx_queue;
+	struct ci_tx_queue *txq = (struct ci_tx_queue *)tx_queue;
 
 	while (nb_pkts) {
 		uint16_t ret, num;
@@ -793,7 +793,7 @@ ice_rxq_vec_setup(struct ice_rx_queue *rxq)
 }
 
 int __rte_cold
-ice_txq_vec_setup(struct ice_tx_queue __rte_unused *txq)
+ice_txq_vec_setup(struct ci_tx_queue *txq __rte_unused)
 {
 	if (!txq)
 		return -1;
Signature · 1 line
2.43.0
#156 lore raw

Re: [PATCH v5 07/25] net/intel/common: merge ice and i40e Tx queue struct

Quoted 48 lines · Bruce Richardson

The queue structures of i40e and ice drivers are virtually identical, so merge them into a common struct. This should allow easier function merging in future using that common struct.

---
 drivers/net/intel/common/tx.h                 | 55 +++++++++++++++++
 drivers/net/intel/i40e/i40e_ethdev.c          |  4 +-
 drivers/net/intel/i40e/i40e_ethdev.h          |  4 +-
 drivers/net/intel/i40e/i40e_fdir.c            |  4 +-
 .../i40e/i40e_recycle_mbufs_vec_common.c      |  2 +-
 drivers/net/intel/i40e/i40e_rxtx.c            | 58 +++++++++---------
 drivers/net/intel/i40e/i40e_rxtx.h            | 50 ++--------------
 .../net/intel/i40e/i40e_rxtx_vec_altivec.c    |  4 +-
 drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c   |  4 +-
 drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c |  6 +-
 drivers/net/intel/i40e/i40e_rxtx_vec_common.h |  2 +-
 drivers/net/intel/i40e/i40e_rxtx_vec_neon.c   |  4 +-
 drivers/net/intel/i40e/i40e_rxtx_vec_sse.c    |  4 +-
 drivers/net/intel/ice/ice_dcf.c               |  4 +-
 drivers/net/intel/ice/ice_dcf_ethdev.c        | 10 ++--
 drivers/net/intel/ice/ice_diagnose.c          |  2 +-
 drivers/net/intel/ice/ice_ethdev.c            |  2 +-
 drivers/net/intel/ice/ice_ethdev.h            |  4 +-
 drivers/net/intel/ice/ice_rxtx.c              | 60 +++++++++----------
 drivers/net/intel/ice/ice_rxtx.h              | 41 +------------
 drivers/net/intel/ice/ice_rxtx_vec_avx2.c     |  4 +-
 drivers/net/intel/ice/ice_rxtx_vec_avx512.c   |  8 +--
 drivers/net/intel/ice/ice_rxtx_vec_common.h   |  8 +--
 drivers/net/intel/ice/ice_rxtx_vec_sse.c      |  6 +-
 24 files changed, 165 insertions(+), 185 deletions(-)
drivers/net/intel/common/tx.h +3 -0
index 5397007411..c965f5ee6c 100644
@@ -8,6 +8,9 @@
 #include <stdint.h>
 #include <rte_mbuf.h>
 
+/* forward declaration of the common intel (ci) queue structure */
+struct ci_tx_queue;
+
 /**
  * Structure associated with each descriptor of the TX ring of a TX queue.
  */

drivers/net/intel/common/tx.h struct ci_tx_entry_vec { · line 36

Quoted 10 lines
drivers/net/intel/common/tx.h +7 -0
@@ -24,6 +27,58 @@ struct ci_tx_entry_vec {
        struct rte_mbuf *mbuf; /* mbuf associated with TX desc, if any. */
 };
 
+typedef void (*ice_tx_release_mbufs_t)(struct ci_tx_queue *txq);
+
+struct ci_tx_queue {
+       union { /* TX ring virtual address */
+               volatile struct ice_tx_desc *ice_tx_ring;
+               volatile struct i40e_tx_desc *i40e_tx_ring;
+       };

Minor nit.. this gets alphabetically sorted in a later patch.

Quoted 22 lines
drivers/net/intel/common/tx.h +22 -0
+       volatile uint8_t *qtx_tail;               /* register address of tail */
+       struct ci_tx_entry *sw_ring; /* virtual address of SW ring */
+       rte_iova_t tx_ring_dma;        /* TX ring DMA address */
+       uint16_t nb_tx_desc;           /* number of TX descriptors */
+       uint16_t tx_tail; /* current value of tail register */
+       uint16_t nb_tx_used; /* number of TX desc used since RS bit set */
+       /* index to last TX descriptor to have been cleaned */
+       uint16_t last_desc_cleaned;
+       /* Total number of TX descriptors ready to be allocated. */
+       uint16_t nb_tx_free;
+       /* Start freeing TX buffers if there are less free descriptors than
+        * this value.
+        */
+       uint16_t tx_free_thresh;
+       /* Number of TX descriptors to use before RS bit is set. */
+       uint16_t tx_rs_thresh;
+       uint8_t pthresh;   /**< Prefetch threshold register. */
+       uint8_t hthresh;   /**< Host threshold register. */
+       uint8_t wthresh;   /**< Write-back threshold reg. */
+       uint16_t port_id;  /* Device port identifier. */
+       uint16_t queue_id; /* TX queue index. */
+       uint16_t reg_idx;

drivers/net/intel/common/tx.h struct ci_tx_entry_vec { · line 68

Quoted 10 lines
drivers/net/intel/common/tx.h +10 -0
+       uint64_t offloads;
+       uint16_t tx_next_dd;
+       uint16_t tx_next_rs;
+       uint64_t mbuf_errors;
+       bool tx_deferred_start; /* don't start this queue in dev start */
+       bool q_set;             /* indicate if tx queue has been configured */
+       union {                  /* the VSI this queue belongs to */
+               struct ice_vsi *ice_vsi;
+               struct i40e_vsi *i40e_vsi;
+       };

Idem.

Quoted 16 lines
drivers/net/intel/common/tx.h +13 -0
+       const struct rte_memzone *mz;
+
+       union {
+               struct { /* ICE driver specific values */
+                       ice_tx_release_mbufs_t tx_rel_mbufs;
+                       uint32_t q_teid; /* TX schedule node id. */
+               };
+               struct { /* I40E driver specific values */
+                       uint8_t dcb_tc;
+               };
+       };
+};
+
 static __rte_always_inline void
 ci_tx_backlog_entry(struct ci_tx_entry *txep, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 {
Signature · 1 line
David Marchand
#157 lore raw

Re: [PATCH v5 07/25] net/intel/common: merge ice and i40e Tx queue struct

Quoted 53 lines · David Marchand
Quoted 51 lines · Bruce Richardson

The queue structures of i40e and ice drivers are virtually identical, so merge them into a common struct. This should allow easier function merging in future using that common struct.

---
 drivers/net/intel/common/tx.h                 | 55 +++++++++++++++++
 drivers/net/intel/i40e/i40e_ethdev.c          |  4 +-
 drivers/net/intel/i40e/i40e_ethdev.h          |  4 +-
 drivers/net/intel/i40e/i40e_fdir.c            |  4 +-
 .../i40e/i40e_recycle_mbufs_vec_common.c      |  2 +-
 drivers/net/intel/i40e/i40e_rxtx.c            | 58 +++++++++---------
 drivers/net/intel/i40e/i40e_rxtx.h            | 50 ++--------------
 .../net/intel/i40e/i40e_rxtx_vec_altivec.c    |  4 +-
 drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c   |  4 +-
 drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c |  6 +-
 drivers/net/intel/i40e/i40e_rxtx_vec_common.h |  2 +-
 drivers/net/intel/i40e/i40e_rxtx_vec_neon.c   |  4 +-
 drivers/net/intel/i40e/i40e_rxtx_vec_sse.c    |  4 +-
 drivers/net/intel/ice/ice_dcf.c               |  4 +-
 drivers/net/intel/ice/ice_dcf_ethdev.c        | 10 ++--
 drivers/net/intel/ice/ice_diagnose.c          |  2 +-
 drivers/net/intel/ice/ice_ethdev.c            |  2 +-
 drivers/net/intel/ice/ice_ethdev.h            |  4 +-
 drivers/net/intel/ice/ice_rxtx.c              | 60 +++++++++----------
 drivers/net/intel/ice/ice_rxtx.h              | 41 +------------
 drivers/net/intel/ice/ice_rxtx_vec_avx2.c     |  4 +-
 drivers/net/intel/ice/ice_rxtx_vec_avx512.c   |  8 +--
 drivers/net/intel/ice/ice_rxtx_vec_common.h   |  8 +--
 drivers/net/intel/ice/ice_rxtx_vec_sse.c      |  6 +-
 24 files changed, 165 insertions(+), 185 deletions(-)
drivers/net/intel/common/tx.h +3 -0
index 5397007411..c965f5ee6c 100644
@@ -8,6 +8,9 @@
 #include <stdint.h>
 #include <rte_mbuf.h>
 
+/* forward declaration of the common intel (ci) queue structure */
+struct ci_tx_queue;
+
 /**
  * Structure associated with each descriptor of the TX ring of a TX queue.
  */
@@ -24,6 +27,58 @@ struct ci_tx_entry_vec {
        struct rte_mbuf *mbuf; /* mbuf associated with TX desc, if any. */
 };
 
Quoted 10 lines

drivers/net/intel/common/tx.h struct ci_tx_entry_vec { · line 36

Quoted 7 lines
drivers/net/intel/common/tx.h +7 -0
+typedef void (*ice_tx_release_mbufs_t)(struct ci_tx_queue *txq);
+
+struct ci_tx_queue {
+       union { /* TX ring virtual address */
+               volatile struct ice_tx_desc *ice_tx_ring;
+               volatile struct i40e_tx_desc *i40e_tx_ring;
+       };

Minor nit.. this gets alphabetically sorted in a later patch.

Right. I'll get that sorted (pun very much intended!) in v6. :-)

/Bruce