From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 530F22A66 for ; Mon, 30 Nov 2015 06:16:03 +0100 (CET) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP; 29 Nov 2015 21:16:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,363,1444719600"; d="scan'208";a="862959280" Received: from unknown (HELO dpdk-fedora20.icx.intel.com) ([10.238.55.12]) by fmsmga002.fm.intel.com with ESMTP; 29 Nov 2015 21:16:01 -0800 From: haifeng To: dts@dpdk.org Date: Mon, 30 Nov 2015 13:11:32 +0800 Message-Id: <1448860292-40296-1-git-send-email-haifengx.tang@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dts] [DTS][PATCH V2] fix pmd driver tx and rx crc issue X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Nov 2015 05:16:03 -0000 Signed-off-by: haifeng --- tests/TestSuite_shutdown_api.py | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/tests/TestSuite_shutdown_api.py b/tests/TestSuite_shutdown_api.py index 411e4bf..241e072 100644 --- a/tests/TestSuite_shutdown_api.py +++ b/tests/TestSuite_shutdown_api.py @@ -82,19 +82,19 @@ class TestShutdownApi(TestCase): stats = output.get_pmd_stats(portid) return stats - def check_forwarding(self, ports=None, pktSize=68, received=True, vlan=False, promisc=False, crcStrip=True): + def check_forwarding(self, ports=None, pktSize=68, received=True, vlan=False, promisc=False): if ports is None: ports = self.ports if len(ports) == 1: - self.send_packet(ports[0], ports[0], pktSize, received, vlan, promisc, crcStrip) + self.send_packet(ports[0], ports[0], pktSize, received, vlan, promisc) return for i in range(len(ports)): if i % 2 == 0: - self.send_packet(ports[i], ports[i + 1], pktSize, received, vlan, promisc, crcStrip) - self.send_packet(ports[i + 1], ports[i], pktSize, received, vlan, promisc, crcStrip) + self.send_packet(ports[i], ports[i + 1], pktSize, received, vlan, promisc) + self.send_packet(ports[i + 1], ports[i], pktSize, received, vlan, promisc) - def send_packet(self, txPort, rxPort, pktSize=68, received=True, vlan=False, promisc=False, crcStrip=False): + def send_packet(self, txPort, rxPort, pktSize=68, received=True, vlan=False, promisc=False): """ Send packages according to parameters. """ @@ -147,13 +147,13 @@ class TestShutdownApi(TestCase): rx_bytes_exp -= 4 tx_bytes_exp -= 4 else: - if self.nic not in ['kawela_4']: - tx_bytes_exp -= 4 - if crcStrip is True: - rx_bytes_exp -= 4 - if vlan is True: - tx_bytes_exp -= 4 - + # some NIC will always include tx crc + rx_bytes_exp -= 4 + tx_bytes_exp -= 4 + if vlan is True: + # vlan strip default is on + tx_bytes_exp -= 4 + if received: self.verify(p0tx_pkts == p1rx_pkts, "Wrong TX pkts p0_tx=%d, p1_rx=%d" % (p0tx_pkts, p1rx_pkts)) self.verify(p1rx_bytes == rx_bytes_exp, "Wrong Rx bytes p1_rx=%d, expect=%d" % (p1rx_bytes, rx_bytes_exp)) @@ -281,7 +281,7 @@ class TestShutdownApi(TestCase): self.verify( "CRC stripping enabled" in out, "CRC stripping not enabled properly") self.dut.send_expect("start", "testpmd> ") - self.check_forwarding(crcStrip=True) + self.check_forwarding() def test_change_linkspeed(self): @@ -365,15 +365,9 @@ class TestShutdownApi(TestCase): self.dut.send_expect("port config all hw-vlan off", "testpmd> ") self.dut.send_expect("port start all", "testpmd> ", 100) self.dut.send_expect("start", "testpmd> ") - if self.nic in ["bartonhills", "powerville", "springville", "hartwell"]: - jumbo_size = jumbo_size + 4 - self.check_forwarding(pktSize=jumbo_size - 1) - self.check_forwarding(pktSize=jumbo_size) - self.check_forwarding(pktSize=jumbo_size + 1, received=False) - else: - self.check_forwarding(pktSize=jumbo_size - 1) - self.check_forwarding(pktSize=jumbo_size) - self.check_forwarding(pktSize=jumbo_size + 1, received=False) + self.check_forwarding(pktSize=jumbo_size - 1) + self.check_forwarding(pktSize=jumbo_size) + self.check_forwarding(pktSize=jumbo_size + 1, received=False) def test_enable_disablerss(self): """ -- 1.9.3