From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C97C2A054F; Tue, 2 Mar 2021 07:19:58 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8752F4014E; Tue, 2 Mar 2021 07:19:58 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mails.dpdk.org (Postfix) with ESMTP id 7B6EA40142 for ; Tue, 2 Mar 2021 07:19:56 +0100 (CET) IronPort-SDR: JhcTQ7E3jjbSiMGLDZOF0LhCbuPnlhayfJHWp8+q3nEA0S6sh4soE9It6iFh4fKj3D923ul7eE jHwP7Nmfxf0Q== X-IronPort-AV: E=McAfee;i="6000,8403,9910"; a="173841243" X-IronPort-AV: E=Sophos;i="5.81,216,1610438400"; d="scan'208";a="173841243" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Mar 2021 22:19:55 -0800 IronPort-SDR: fbuPEel/ltWcZE9fe3aijSBHfmfH5MXBM0UCg20cSsbs9IbPzkp3pIBJieatqkL01gI3Ux3kVB 50783HKJXjIg== X-IronPort-AV: E=Sophos;i="5.81,216,1610438400"; d="scan'208";a="599559499" Received: from unknown (HELO intel-npg-odc-srv03.cd.intel.com) ([10.240.178.145]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Mar 2021 22:19:52 -0800 From: Robin Zhang To: dev@dpdk.org Cc: mdr@ashroe.eu, nhorman@tuxdriver.com, beilei.xing@intel.com, jia.guo@intel.com, jingjing.wu@intel.com, Robin Zhang Date: Tue, 2 Mar 2021 06:13:23 +0000 Message-Id: <20210302061323.165998-1-robinx.zhang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH] net/iavf: deprecate i40evf pmd X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Avf PMD was introduced from DPDK 18.02 to promote Intel Adaptive Virtual Function with device ID is 0x1889 aligned with AVF public spec. At the meanwhile, i40evf PMD was co-existed to support other existing device IDs of i40e devices. So on i40e devices, iavf PMD can only run in the VM whose hypervisor has emulated the VF’s device to 0x1889. At that time, linux i40evf kernel driver covers device ID of i40e VF and 0x1889. Start from ice, all the VFs will be AVF, that is to say their device ID is 0x1889. Currently in i40e VF driver, when one new feature is added, DPDK SW need to maintain two drivers even for one device. Validation team also need to keep the behavior of those two drivers are the same. Meanwhile, container deploy becomes more popular, and device ID cannot be changed as there is no device emulate. So the user in container can only use i40evf PMD on i40e devices, when upgrade to ice devices, driver should be switched to iavf. That will break iavf continuity on i40e devices. Also, one driver would force the developing the interface to be consistent for customers using both i40e, ice and later products. So, i40evf PMD is no need to maintain, as iavf will be used instead of i40evf. Impact: If the customers are using i40evf PMD on Intel 700 series NICs, when they upgrade to latest DPDK SW, they do not need to modify device ID anymore. Signed-off-by: Robin Zhang --- doc/guides/rel_notes/deprecation.rst | 6 ++++++ drivers/common/iavf/iavf_devids.h | 3 +++ drivers/net/i40e/i40e_ethdev_vf.c | 4 ---- drivers/net/iavf/iavf_ethdev.c | 6 ++++++ 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 82c1a90a3..069ab04e9 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -125,3 +125,9 @@ Deprecation Notices * cmdline: ``cmdline`` structure will be made opaque to hide platform-specific content. On Linux and FreeBSD, supported prior to DPDK 20.11, original structure will be kept until DPDK 21.11. + +* i40e: As there are both i40evf and iavf pmd, the functions of them are + duplicated. And now more and more advanced features are developed on iavf. + To keep consistent with kernel driver's name + (https://patchwork.ozlabs.org/patch/970154/), i40evf is no need to maintain, + will use iavf to instead of i40evf in DPDK 21.11. diff --git a/drivers/common/iavf/iavf_devids.h b/drivers/common/iavf/iavf_devids.h index 722c2e4f4..5047525fc 100644 --- a/drivers/common/iavf/iavf_devids.h +++ b/drivers/common/iavf/iavf_devids.h @@ -13,5 +13,8 @@ #define IAVF_DEV_ID_VF_HV 0x1571 #define IAVF_DEV_ID_ADAPTIVE_VF 0x1889 #define IAVF_DEV_ID_X722_VF 0x37CD +#ifdef X722_A0_SUPPORT +#define I40E_DEV_ID_X722_A0_VF 0x374D +#endif #endif /* _IAVF_DEVIDS_H_ */ diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index 2909b4d89..fe8a86466 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -1164,10 +1164,6 @@ i40evf_del_vlan(struct rte_eth_dev *dev, uint16_t vlanid) } static const struct rte_pci_id pci_id_i40evf_map[] = { - { RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_VF) }, - { RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_VF_HV) }, - { RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_X722_A0_VF) }, - { RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_X722_VF) }, { .vendor_id = 0, /* sentinel */ }, }; diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index 4d3772202..3f656140e 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -127,6 +127,12 @@ static int iavf_set_mc_addr_list(struct rte_eth_dev *dev, static const struct rte_pci_id pci_id_iavf_map[] = { { RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) }, + { RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) }, + { RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF_HV) }, + { RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_X722_VF) }, +#ifdef X722_A0_SUPPORT + { RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, I40E_DEV_ID_X722_A0_VF) }, +#endif { .vendor_id = 0, /* sentinel */ }, }; -- 2.25.1