From b3964f4af175ed7b9e91d66dad35deb8e0c1c7e3 Mon Sep 17 00:00:00 2001
From: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Date: Wed, 6 May 2015 16:13:04 +0200
Subject: [PATCH] netperf: test usb30 also for x86

On our test machine the xhci controller has a usb3.0 network adapter attached
and the xhci controller is the only usb controller which has MSI support,
so let us use and test it.

Issue #1216
---
 repos/ports/run/netperf.inc            | 6 +++++-
 repos/ports/run/netperf_lwip_usb30.run | 4 ++++
 repos/ports/run/netperf_lxip_usb30.run | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/repos/ports/run/netperf.inc b/repos/ports/run/netperf.inc
index 515ce67168..0c532f5d59 100644
--- a/repos/ports/run/netperf.inc
+++ b/repos/ports/run/netperf.inc
@@ -14,7 +14,9 @@ if {[have_spec hw_odroid_xu]} {
 	exit 0
 }
 
-set use_usb_driver      [expr [have_spec omap4] || [have_spec platform_arndale] || [have_spec platform_rpi]]
+if {![info exists use_usb_driver]} {
+	set use_usb_driver      [expr [have_spec omap4] || [have_spec platform_arndale] || [have_spec platform_rpi]]
+}
 set use_nic_driver      [expr !$use_usb_driver && ![have_spec platform_imx53] && !$use_wifi_driver]
 set use_platform_driver [expr [have_spec platform_arndale] || [have_spec platform_imx53] || [have_spec platform_rpi]]
 
@@ -236,6 +238,7 @@ append_if [have_spec acpi] config {
 			<policy label="acpi_drv"> <pci class="ALL"/> </policy>
 			<policy label="nic_drv"> <pci class="ETHERNET"/> </policy>
 			<policy label="wifi_drv"> <pci class="WIFI"/> </policy>
+			<policy label="usb_drv"> <pci class="USB"/> </policy>
 		</config>
 		<route>
 			<any-service> <parent/> </any-service>
@@ -249,6 +252,7 @@ append_if [expr ![have_spec acpi] && [have_spec pci]] config {
 		<config>
 			<policy label="nic_drv"> <pci class="ETHERNET"/> </policy>
 			<policy label="wifi_drv"> <pci class="WIFI"/> </policy>
+			<policy label="usb_drv"> <pci class="USB"/> </policy>
 		</config>
 	</start> }
 
diff --git a/repos/ports/run/netperf_lwip_usb30.run b/repos/ports/run/netperf_lwip_usb30.run
index 0abf77e629..1dd8d0d1c6 100644
--- a/repos/ports/run/netperf_lwip_usb30.run
+++ b/repos/ports/run/netperf_lwip_usb30.run
@@ -13,6 +13,10 @@ if {[have_spec omap4]} {
 # network configuration
 set use_nic_bridge      0
 set use_wifi_driver     0
+
+# force usage of usb for nova, known to work with usb30 network adapter
+if {[have_spec nova]} { set use_usb_driver  1 }
+
 set use_usb_11          "no"
 set use_usb_20          "no"
 set use_usb_30          "yes"
diff --git a/repos/ports/run/netperf_lxip_usb30.run b/repos/ports/run/netperf_lxip_usb30.run
index 1160396104..e7575a5d63 100644
--- a/repos/ports/run/netperf_lxip_usb30.run
+++ b/repos/ports/run/netperf_lxip_usb30.run
@@ -13,6 +13,10 @@ if {[have_spec omap4]} {
 # network configuration
 set use_nic_bridge      0
 set use_wifi_driver     0
+
+# force usage of usb for nova, known to work with usb30 network adapter
+if {[have_spec nova]} { set use_usb_driver  1 }
+
 set use_usb_11          "no"
 set use_usb_20          "no"
 set use_usb_30          "yes"