Commit fcc35c86 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

scripts/setup: Attempt to load uio driver only when igb_uio is picked up 



Change-Id: I5c4860c69ccfdae4532498aaea8886ed3905d899
Signed-off-by: default avatarMichal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5302


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 46f5120c

scripts/setup.sh

+6 −4
Original line number Diff line number Diff line
@@ -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