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 E4E14A04B5; Wed, 13 Jan 2021 09:14:50 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CCD06140E6D; Wed, 13 Jan 2021 09:14:50 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 64781140E59 for ; Wed, 13 Jan 2021 09:14:49 +0100 (CET) IronPort-SDR: q0q1VZZtEJ5TJIwb38eNrj0lBbG1Tm9EgIjMm/oRe2wMrZiAWUrSRCC+PoKFOCF0oLSvLiz5DL 4d54+pdJ8ybw== X-IronPort-AV: E=McAfee;i="6000,8403,9862"; a="178316397" X-IronPort-AV: E=Sophos;i="5.79,343,1602572400"; d="scan'208";a="178316397" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jan 2021 00:14:45 -0800 IronPort-SDR: EKY5gE9jcSHCvKn7mDPy/SnEWdO59f/LsPlfLtbfgsAmiSlm7pCrvnnV2byJ58fwk3AX6RXedn rwrlqjuocjIw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,343,1602572400"; d="scan'208";a="381755643" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by orsmga008.jf.intel.com with ESMTP; 13 Jan 2021 00:14:45 -0800 Received: from shsmsx603.ccr.corp.intel.com (10.109.6.143) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 13 Jan 2021 00:14:43 -0800 Received: from shsmsx601.ccr.corp.intel.com (10.109.6.141) by SHSMSX603.ccr.corp.intel.com (10.109.6.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 13 Jan 2021 16:14:41 +0800 Received: from shsmsx601.ccr.corp.intel.com ([10.109.6.141]) by SHSMSX601.ccr.corp.intel.com ([10.109.6.141]) with mapi id 15.01.1713.004; Wed, 13 Jan 2021 16:14:41 +0800 From: "Tu, Lijuan" To: "Tu, Lijuan" , "Xie, WeiX" , "dts@dpdk.org" CC: "Xie, WeiX" Thread-Topic: [dts] [PATCH V1 1/2] framework/project_dpdk:replace i40evf with iavf for NIC X722 Thread-Index: AQHW5YA36j5pLZjN2kOYM3N9JRfRwKolI12wgAAYoiA= Date: Wed, 13 Jan 2021 08:14:41 +0000 Message-ID: References: <20210108053754.13590-1-weix.xie@intel.com> <20210108053754.13590-2-weix.xie@intel.com> <06c5e246bbd045eab1d22b714d93a8dc@intel.com> In-Reply-To: <06c5e246bbd045eab1d22b714d93a8dc@intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.5.1.3 dlp-product: dlpe-windows x-originating-ip: [10.239.127.36] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [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 =3D=3D 'true' and 'Virt' not in str(self): > > self.set_build_options({'RTE_BUILD_SHARED_LIB': 'y'}) > > kernel_driver =3D '' > > + nic_name =3D '' > > if 'Virt' in str(self): > > if self.host_dut.nic: > > kernel_driver =3D self.host_dut.nic.default_driver > > + nic_name =3D self.host_dut.nic.name > > elif self.nic: > > kernel_driver =3D self.nic.default_driver > > + nic_name =3D self.nic.name > > > > - if kernel_driver =3D=3D 'i40e': > > + if nic_name in ['fortpark_TLV', 'fortpark_BASE-T']: >=20 > I don't think it's necessary to add a new variable, self.nic can handle i= t. Both class "DPDKdut" and "TestCase" have attribute "nic", but it's an objec= t in DPDKdut, and nic name in TestCase, so here self.nic is not nic name. Applied the series. >=20 > > + 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 =3D=3D '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/0x16= 4C/g' > > drivers/net/i40e/base/i40e_devids.h", "# ") > > > > -- > > 2.17.1