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

scripts/setup: Use uio_pci_generic if it's loaded/compiled in 



Also, for consistency, use check_for_driver() while checking if
igb_uio is loaded too.

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


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 avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent fcc35c86

scripts/setup.sh

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ function linux_bind_driver() { 
	echo "$ven_dev_id" > "/sys/bus/pci/drivers/$driver_name/new_id" 2> /dev/null || true

	echo "$bdf" > "/sys/bus/pci/drivers/$driver_name/bind" 2> /dev/null || true



	if [[ $driver_name == uio_pci_generic && -e /sys/module/igb_uio ]]; then

	if [[ $driver_name == uio_pci_generic ]] && ! check_for_driver igb_uio; then

		# Check if the uio_pci_generic driver is broken as it might be in

		# some 4.18.x kernels (see centos8 for instance) - if our device

		# didn't get a proper uio entry, fallback to igb_uio
@@ -315,7 +315,7 @@ function configure_linux_pci() { 
		if modinfo vfio_iommu_type1 > /dev/null; then

			modprobe vfio_iommu_type1

		fi

	elif modinfo uio_pci_generic > /dev/null 2>&1; then

	elif ! check_for_driver uio_pci_generic || 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"