X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fdpdk%2Fdpdk_scripts%2Finit_dpdk.sh;h=7d3df0a67c26d9a5f47cc9c995451359d3f423e8;hb=5dc176ab31af5dff73be6dd5266169a7be19dd13;hp=d8432d8e52d87b3720ed8346b65adbc3c280bcd0;hpb=117d3c4991b412a0756daadeee0a68edb0c4cf26;p=csit.git

diff --git a/tests/dpdk/dpdk_scripts/init_dpdk.sh b/tests/dpdk/dpdk_scripts/init_dpdk.sh
index d8432d8e52..7d3df0a67c 100755
--- a/tests/dpdk/dpdk_scripts/init_dpdk.sh
+++ b/tests/dpdk/dpdk_scripts/init_dpdk.sh
@@ -3,33 +3,25 @@
 set -x
 
 # Setting variables
-DPDK_VERSION=dpdk-17.08
+DPDK_DIR=dpdk
 ROOTDIR=/tmp/openvpp-testing
 PWDDIR=$(pwd)
-cd ${ROOTDIR}/${DPDK_VERSION}/
 
-modprobe uio
-echo "RC = $?"
+# set arch, default to x86_64 if none given
+ARCH=${3:-"x86_64"}
 
-lsmod | grep igb_uio
-if [ $? -ne 1 ];
-then
-    rmmod igb_uio || \
-        { echo "Failed to remove igb_uio module"; exit 1; }
+# dpdk prefers "arm64" to "aarch64" and does not allow arm64 native target
+if [ $ARCH == "aarch64" ]; then
+    ARCH="arm64"
+    MACHINE="armv8a"
+else
+    MACHINE="native"
 fi
 
-lsmod | grep uio_pci_generic
-if [ $? -ne 1 ];
-then
-    rmmod uio_pci_generic || \
-        { echo "Failed to remove uio_pci_generic module"; exit 1; }
-fi
-
-insmod ./x86_64-native-linuxapp-gcc/kmod/igb_uio.ko || \
-    { echo "Failed to insert igb_uio module"; exit 1; }
+cd ${ROOTDIR}/${DPDK_DIR}/
 
 # Binding
-./usertools/dpdk-devbind.py -b igb_uio $1 $2 || \
-    { echo "Failed to bind interface $1 and $2 to igb_uio"; exit 1; }
+./usertools/dpdk-devbind.py -b vfio-pci $1 $2 || \
+    { echo "Failed to bind interface $1 and $2 to vfio-pci"; exit 1; }
 
 cd ${PWDDIR}