From fcc35c86cd30ee1cb9c7fa2ca52635301a7ba681 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Thu, 26 Nov 2020 18:20:04 +0100 Subject: [PATCH] scripts/setup: Attempt to load uio driver only when igb_uio is picked up Change-Id: I5c4860c69ccfdae4532498aaea8886ed3905d899 Signed-off-by: Michal Berger Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5302 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki --- scripts/setup.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index 1c5024af6..8f47583a2 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -287,11 +287,12 @@ function configure_linux_pci() { driver_name="" igb_uio_fallback="" - # igb_uio is a common driver to override with and it depends on uio. - modprobe uio if [[ -r "$rootdir/dpdk/build-tmp/kernel/linux/igb_uio/igb_uio.ko" ]]; then - igb_uio_fallback=$rootdir/dpdk/build-tmp/kernel/linux/igb_uio/igb_uio.ko - insmod "$igb_uio_fallback" || true + # igb_uio is a common driver to override with and it depends on uio. + modprobe uio || true + if ! check_for_driver igb_uio || insmod "$rootdir/dpdk/build-tmp/kernel/linux/igb_uio/igb_uio.ko"; then + igb_uio_fallback="$rootdir/dpdk/build-tmp/kernel/linux/igb_uio/igb_uio.ko" + fi fi if [[ -n "${DRIVER_OVERRIDE}" ]]; then @@ -317,6 +318,7 @@ function configure_linux_pci() { elif modinfo uio_pci_generic > /dev/null 2>&1; then driver_name=uio_pci_generic elif [[ -e $igb_uio_fallback ]]; then + driver_path="$igb_uio_fallback" driver_name="igb_uio" echo "WARNING: uio_pci_generic not detected - using $driver_name" else