From c7eb2002bcd007520309feb3e11a26ff847a4e05 Mon Sep 17 00:00:00 2001 From: Gabriel Ganne Date: Mon, 27 Nov 2017 15:38:53 +0100 Subject: add new topology parameter: arch if unset, arch variable will default to "x86_64" * Note on "arm64" vs "aarch64" debian-based uses arm64 rhel-based uses aarch64 qemu binaries of both distribs uses aarch64 dpdk uses arm64 vpp uses aarch64 python machine modules uses aarch64 => prefer aarch64 to use the same nomenclature as vpp * add ARCH argument to: init_dpdk.sh, install_dpdk.sh, run_l2fwd.sh, install_tldk.sh, run_tldk.sh. default to x86_64 converts "aarch64" if needed for dpdk naming convention * fixed terminal end detection to allow "~]# " add dut node arch as param to all robot set bin calls * add --target-list flag to qemu_build.sh defaults to x86_64-softmmu * add arch flag to all the topology files * topologies/available/ (and example file) * resources/tools/virl/topologies/ * set _qemu_bin path using node['arch'] in qemu_set_node() Change-Id: If46d88d064d213d3e4c6fc584bb8e0d4b6428cb8 Signed-off-by: Gabriel Ganne --- tests/dpdk/dpdk_scripts/init_dpdk.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'tests/dpdk/dpdk_scripts/init_dpdk.sh') diff --git a/tests/dpdk/dpdk_scripts/init_dpdk.sh b/tests/dpdk/dpdk_scripts/init_dpdk.sh index 09a96283d1..db9dee5d2d 100755 --- a/tests/dpdk/dpdk_scripts/init_dpdk.sh +++ b/tests/dpdk/dpdk_scripts/init_dpdk.sh @@ -6,6 +6,18 @@ set -x DPDK_VERSION=dpdk-17.11 ROOTDIR=/tmp/openvpp-testing PWDDIR=$(pwd) + +# set arch, default to x86_64 if none given +ARCH=${3:-"x86_64"} + +# dpdk prefers "arm64" to "aarch64" and does not allow arm64 native target +if [ $ARCH == "aarch64" ]; then + ARCH="arm64" + MACHINE="armv8a" +else + MACHINE="native" +fi + cd ${ROOTDIR}/${DPDK_VERSION}/ modprobe uio @@ -25,7 +37,7 @@ then { echo "Failed to remove uio_pci_generic module"; exit 1; } fi -insmod ./x86_64-native-linuxapp-gcc/kmod/igb_uio.ko || \ +insmod ./${ARCH}-${MACHINE}-linuxapp-gcc/kmod/igb_uio.ko || \ { echo "Failed to insert igb_uio module"; exit 1; } # Binding -- cgit 1.2.3-korg