From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 5AE955B17 for ; Tue, 27 Jan 2015 04:38:00 +0100 (CET) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP; 26 Jan 2015 19:37:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,472,1418112000"; d="scan'208";a="676402297" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by orsmga002.jf.intel.com with ESMTP; 26 Jan 2015 19:37:58 -0800 Received: from shecgisg003.sh.intel.com (shecgisg003.sh.intel.com [10.239.29.90]) by shvmail01.sh.intel.com with ESMTP id t0R3btK3019718; Tue, 27 Jan 2015 11:37:55 +0800 Received: from shecgisg003.sh.intel.com (localhost [127.0.0.1]) by shecgisg003.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id t0R3brqW013309; Tue, 27 Jan 2015 11:37:55 +0800 Received: (from huilongx@localhost) by shecgisg003.sh.intel.com (8.13.6/8.13.6/Submit) id t0R3bre4013305; Tue, 27 Jan 2015 11:37:53 +0800 From: "huilongx.xu" To: dts@dpdk.org Date: Tue, 27 Jan 2015 11:37:51 +0800 Message-Id: <1422329871-13274-1-git-send-email-huilongx.xu@intel.com> X-Mailer: git-send-email 1.7.4.1 Subject: [dts] [PATCH] update framework for support fortville NIC test. 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: Tue, 27 Jan 2015 03:38:00 -0000 execution_fortville.cfg is the test case list for fortville NIC crb.py, add fortville NIC kernel driver(i40e) in dts settings.py, add fortville NIC info in dts testt_case.py, insmode and used i40e for fortvill NIC Signed-off-by: huilongx.xu --- execution_fortville.cfg | 21 +++++++++++++++++++++ framework/crb.py | 7 +++++++ framework/settings.py | 6 ++++++ framework/test_case.py | 4 ++++ 4 files changed, 38 insertions(+), 0 deletions(-) create mode 100644 execution_fortville.cfg diff --git a/execution_fortville.cfg b/execution_fortville.cfg new file mode 100644 index 0000000..15f2ccf --- /dev/null +++ b/execution_fortville.cfg @@ -0,0 +1,21 @@ +[Execution1] +crbs= +drivername= +test_suites= + cmdline, + hello_world, + multiprocess, + blacklist +targets= + x86_64-native-linuxapp-gcc +parameters=nic_type=fortville_eagle:func=true + +[Execution2] +crbs= +drivername= +test_suites= + l2fwd, + l3fwd +targets= + x86_64-native-linuxapp-gcc +parameters=nic_type=fortville_eagle:perf=true diff --git a/framework/crb.py b/framework/crb.py index d41f51b..e2e8d92 100644 --- a/framework/crb.py +++ b/framework/crb.py @@ -151,6 +151,10 @@ class Crb(object): self.send_expect("modprobe e1000", "# ", 20) self.send_expect("modprobe virtio_net", "# ", 20) + self.send_expect("insmod /usr/lib/modules/%s/kernel/drivers/net/ethernet/intel/i40e/i40e.ko"%'`uname -r`', "# ", 60) + out = self.send_expect("lsmod |grep i40e", "# ", 30) + if "i40e" not in out: + self.logger.error("please check the os install i40e driver already."); try: for (pci_bus, pci_id) in self.pci_devices_info: """ @@ -173,6 +177,9 @@ class Crb(object): self.send_expect("echo -n 0000:%s > /sys/bus/pci/drivers/e1000/bind" % pci_bus, "# ") elif pci_id in ('1af4:1000'): self.send_expect("echo 0000%s > /sys/bus/pci/drivers/virtio-pci/bind" % pci_bus, "# ") + elif pci_id in ('8086:1583','8086:1584','8086:1572'): + if not os.path.exists("/sys/bus/pci/drivers/i40e/"+"0000:"+pci_bus): + self.send_expect("echo 0000:%s > /sys/bus/pci/drivers/i40e/bind" % pci_bus, "# ") else: continue diff --git a/framework/settings.py b/framework/settings.py index 2ef8db8..40b81fb 100644 --- a/framework/settings.py +++ b/framework/settings.py @@ -55,6 +55,9 @@ NICS = { 'I217LM': '8086:153a', 'I218V': '8086:1559', 'I218LM': '8086:155a', + 'fortville_eagle': '8086:1572', + 'fortville_spirit': '8086:1583', + 'fortville_spirit_single': '8086:1584', } DRIVERS = { @@ -80,6 +83,9 @@ DRIVERS = { 'I217LM': 'igb', 'I218V': 'igb', 'I218LM': 'igb', + 'fortville_eagle': 'i40e', + 'fortville_spirit': 'i40e', + 'fortville_spirit_single':'i40e' } """ diff --git a/framework/test_case.py b/framework/test_case.py index 706003f..07fdc36 100644 --- a/framework/test_case.py +++ b/framework/test_case.py @@ -76,5 +76,9 @@ class TestCase(object): bitrate *= 10 # 10 Gb NICs elif self.nic == "avoton2c5": bitrate *= 2.5 # 2.5 Gb NICs + elif self.nic in ["fortville_spirit", "fortville_spirit_single"]: + bitrate *= 40 + elif self.nic == 'fortville_eagle': + bitrate *= 10 return bitrate * num_ports / 8 / (frame_size + 20) -- 1.7.4.4