From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (xvm-189-124.dc0.ghst.net [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2F00FA0524; Fri, 8 Jan 2021 06:36:01 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D41E7140E1F; Fri, 8 Jan 2021 06:35:56 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id CF815140DFA for ; Fri, 8 Jan 2021 06:35:53 +0100 (CET) IronPort-SDR: HNXSn64/fF9xkBhSrfwXf7B5PAQW1C0bEBW4uTY0EFDLmSnya/z5bx5jggj+2QWpIPLne1/DZ9 eF+LT8KKCX1g== X-IronPort-AV: E=McAfee;i="6000,8403,9857"; a="174965723" X-IronPort-AV: E=Sophos;i="5.79,330,1602572400"; d="scan'208";a="174965723" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jan 2021 21:35:53 -0800 IronPort-SDR: FPzTGQOcA6ru6FrMRF17l9/9bQjUBJTncHtbm7CIn8tSe8Ue2MidPoYt5MJ9UOVq/z10hzOoJS dUTaj9h8IvpA== X-IronPort-AV: E=Sophos;i="5.79,330,1602572400"; d="scan'208";a="379998869" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jan 2021 21:35:52 -0800 From: Xie wei To: dts@dpdk.org Cc: Xie wei Date: Fri, 8 Jan 2021 13:37:53 +0800 Message-Id: <20210108053754.13590-2-weix.xie@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210108053754.13590-1-weix.xie@intel.com> References: <20210108053754.13590-1-weix.xie@intel.com> Subject: [dts] [PATCH V1 1/2] framework/project_dpdk:replace i40evf with iavf for NIC X722 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" Replace i40evf with iavf in both host and vm dut for fortpark_BASE-T and fortpark_TLV. Signed-off-by: Xie wei --- framework/project_dpdk.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py index a8c4e379..36e21c42 100644 --- a/framework/project_dpdk.py +++ b/framework/project_dpdk.py @@ -279,13 +279,19 @@ class DPDKdut(Dut): if use_shared_lib == 'true' and 'Virt' not in str(self): self.set_build_options({'RTE_BUILD_SHARED_LIB': 'y'}) kernel_driver = '' + nic_name = '' if 'Virt' in str(self): if self.host_dut.nic: kernel_driver = self.host_dut.nic.default_driver + nic_name = self.host_dut.nic.name elif self.nic: kernel_driver = self.nic.default_driver + nic_name = self.nic.name - if kernel_driver == 'i40e': + if nic_name in ['fortpark_TLV', 'fortpark_BASE-T']: + self.send_expect("sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },/i { RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_X722_VF) },' drivers/net/iavf/iavf_ethdev.c", "# ") + self.send_expect("sed -i '/I40E_DEV_ID_X722_VF/d' drivers/net/i40e/i40e_ethdev_vf.c", "# ") + elif kernel_driver == 'i40e': self.send_expect("sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },/a { RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },' drivers/net/iavf/iavf_ethdev.c", "# ") self.send_expect("sed -i -e '/I40E_DEV_ID_VF/s/0x154C/0x164C/g' drivers/net/i40e/base/i40e_devids.h", "# ") -- 2.17.1