* [dts] [PATCH V1 0/2] replace i40evf with iavf @ 2021-01-08 5:37 Xie wei 2021-01-08 5:37 ` [dts] [PATCH V1 1/2] framework/project_dpdk:replace i40evf with iavf for NIC X722 Xie wei ` (2 more replies) 0 siblings, 3 replies; 7+ messages in thread From: Xie wei @ 2021-01-08 5:37 UTC (permalink / raw) To: dts; +Cc: Xie wei NIC x722 replace i40evf with iavf. Xie wei (2): framework/project_dpdk:replace i40evf with iavf for NIC X722 nics/net_device:add nics name attribute framework/project_dpdk.py | 8 +++++++- nics/net_device.py | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) -- 2.17.1 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [dts] [PATCH V1 1/2] framework/project_dpdk:replace i40evf with iavf for NIC X722 2021-01-08 5:37 [dts] [PATCH V1 0/2] replace i40evf with iavf Xie wei @ 2021-01-08 5:37 ` Xie wei 2021-01-13 6:43 ` Tu, Lijuan 2021-01-08 5:37 ` [dts] [PATCH V1 2/2] nics/net_device:add nics name attribute Xie wei 2021-01-08 5:40 ` [dts] [PATCH V1 0/2] replace i40evf with iavf Xie, WeiX 2 siblings, 1 reply; 7+ messages in thread From: Xie wei @ 2021-01-08 5:37 UTC (permalink / raw) To: dts; +Cc: Xie wei Replace i40evf with iavf in both host and vm dut for fortpark_BASE-T and fortpark_TLV. Signed-off-by: Xie wei <weix.xie@intel.com> --- 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 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [dts] [PATCH V1 1/2] framework/project_dpdk:replace i40evf with iavf for NIC X722 2021-01-08 5:37 ` [dts] [PATCH V1 1/2] framework/project_dpdk:replace i40evf with iavf for NIC X722 Xie wei @ 2021-01-13 6:43 ` Tu, Lijuan 2021-01-13 8:14 ` Tu, Lijuan 0 siblings, 1 reply; 7+ messages in thread From: Tu, Lijuan @ 2021-01-13 6:43 UTC (permalink / raw) To: Xie, WeiX, dts; +Cc: Xie, WeiX > > Replace i40evf with iavf in both host and vm dut for fortpark_BASE-T and > fortpark_TLV. > > Signed-off-by: Xie wei <weix.xie@intel.com> > --- > 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']: I don't think it's necessary to add a new variable, self.nic can handle it. > + 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 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [dts] [PATCH V1 1/2] framework/project_dpdk:replace i40evf with iavf for NIC X722 2021-01-13 6:43 ` Tu, Lijuan @ 2021-01-13 8:14 ` Tu, Lijuan 0 siblings, 0 replies; 7+ messages in thread From: Tu, Lijuan @ 2021-01-13 8:14 UTC (permalink / raw) To: Tu, Lijuan, Xie, WeiX, dts; +Cc: Xie, WeiX > > > > Replace i40evf with iavf in both host and vm dut for fortpark_BASE-T > > and fortpark_TLV. > > > > Signed-off-by: Xie wei <weix.xie@intel.com> > > --- > > 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']: > > I don't think it's necessary to add a new variable, self.nic can handle it. Both class "DPDKdut" and "TestCase" have attribute "nic", but it's an object in DPDKdut, and nic name in TestCase, so here self.nic is not nic name. Applied the series. > > > + 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 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [dts] [PATCH V1 2/2] nics/net_device:add nics name attribute 2021-01-08 5:37 [dts] [PATCH V1 0/2] replace i40evf with iavf Xie wei 2021-01-08 5:37 ` [dts] [PATCH V1 1/2] framework/project_dpdk:replace i40evf with iavf for NIC X722 Xie wei @ 2021-01-08 5:37 ` Xie wei 2021-01-08 5:40 ` [dts] [PATCH V1 0/2] replace i40evf with iavf Xie, WeiX 2 siblings, 0 replies; 7+ messages in thread From: Xie wei @ 2021-01-08 5:37 UTC (permalink / raw) To: dts; +Cc: Xie wei Add an atrribute for getting nic's name. Signed-off-by: Xie wei <weix.xie@intel.com> --- nics/net_device.py | 1 + 1 file changed, 1 insertion(+) diff --git a/nics/net_device.py b/nics/net_device.py index a08c0da6..bdc9d37d 100644 --- a/nics/net_device.py +++ b/nics/net_device.py @@ -62,6 +62,7 @@ class NetDevice(object): self.pci = domain_id + ':' + bus_id + ':' + devfun_id self.pci_id = get_pci_id(crb, domain_id, bus_id, devfun_id) self.default_driver = settings.get_nic_driver(self.pci_id) + self.name = settings.get_nic_name(self.pci_id) if self.nic_is_pf(): self.default_vf_driver = '' -- 2.17.1 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [dts] [PATCH V1 0/2] replace i40evf with iavf 2021-01-08 5:37 [dts] [PATCH V1 0/2] replace i40evf with iavf Xie wei 2021-01-08 5:37 ` [dts] [PATCH V1 1/2] framework/project_dpdk:replace i40evf with iavf for NIC X722 Xie wei 2021-01-08 5:37 ` [dts] [PATCH V1 2/2] nics/net_device:add nics name attribute Xie wei @ 2021-01-08 5:40 ` Xie, WeiX 2021-01-08 6:43 ` Zhao, HaiyangX 2 siblings, 1 reply; 7+ messages in thread From: Xie, WeiX @ 2021-01-08 5:40 UTC (permalink / raw) To: dts [-- Attachment #1: Type: text/plain, Size: 300 bytes --] Tested-by: Xie,WeiX < weix.xie@intel.com> Regards, Xie Wei > -----Original Message----- > From: Xie wei [mailto:weix.xie@intel.com] > Sent: Friday, January 8, 2021 1:38 PM > To: dts@dpdk.org > Cc: Xie, WeiX <weix.xie@intel.com> > Subject: [dts][PATCH V1 0/2] replace i40evf with iavf [-- Attachment #2: TestVfJumboFrame_x722.log --] [-- Type: application/octet-stream, Size: 602409 bytes --] [-- Attachment #3: TestVfJumboFrame_fvl_25g.log --] [-- Type: application/octet-stream, Size: 301249 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [dts] [PATCH V1 0/2] replace i40evf with iavf 2021-01-08 5:40 ` [dts] [PATCH V1 0/2] replace i40evf with iavf Xie, WeiX @ 2021-01-08 6:43 ` Zhao, HaiyangX 0 siblings, 0 replies; 7+ messages in thread From: Zhao, HaiyangX @ 2021-01-08 6:43 UTC (permalink / raw) To: Xie, WeiX, dts Acked-by: Haiyang Zhao <haiyangx.zhao@intel.com> Best Regards, Zhao Haiyang > -----Original Message----- > From: dts <dts-bounces@dpdk.org> On Behalf Of Xie, WeiX > Sent: Friday, January 8, 2021 13:41 > To: dts@dpdk.org > Subject: Re: [dts] [PATCH V1 0/2] replace i40evf with iavf > > Tested-by: Xie,WeiX < weix.xie@intel.com> > > Regards, > Xie Wei > > > -----Original Message----- > > From: Xie wei [mailto:weix.xie@intel.com] > > Sent: Friday, January 8, 2021 1:38 PM > > To: dts@dpdk.org > > Cc: Xie, WeiX <weix.xie@intel.com> > > Subject: [dts][PATCH V1 0/2] replace i40evf with iavf ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-01-13 8:14 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-01-08 5:37 [dts] [PATCH V1 0/2] replace i40evf with iavf Xie wei 2021-01-08 5:37 ` [dts] [PATCH V1 1/2] framework/project_dpdk:replace i40evf with iavf for NIC X722 Xie wei 2021-01-13 6:43 ` Tu, Lijuan 2021-01-13 8:14 ` Tu, Lijuan 2021-01-08 5:37 ` [dts] [PATCH V1 2/2] nics/net_device:add nics name attribute Xie wei 2021-01-08 5:40 ` [dts] [PATCH V1 0/2] replace i40evf with iavf Xie, WeiX 2021-01-08 6:43 ` Zhao, HaiyangX
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).