ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I5c4860c69ccfdae4532498aaea8886ed3905d899
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5302
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Michal Berger 2020-11-26 18:20:04 +01:00 committed by Tomasz Zawadzki
parent 46f5120c56
commit fcc35c86cd
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/setup.sh
View File

@ -287,11 +287,12 @@ function configure_linux_pci() {
driver_name="" driver_name=""
igb_uio_fallback="" 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 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 # igb_uio is a common driver to override with and it depends on uio.
insmod "$igb_uio_fallback" || true 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 fi
if [[ -n "${DRIVER_OVERRIDE}" ]]; then if [[ -n "${DRIVER_OVERRIDE}" ]]; then
@ -317,6 +318,7 @@ function configure_linux_pci() {
elif modinfo uio_pci_generic > /dev/null 2>&1; then elif modinfo uio_pci_generic > /dev/null 2>&1; then
driver_name=uio_pci_generic driver_name=uio_pci_generic
elif [[ -e $igb_uio_fallback ]]; then elif [[ -e $igb_uio_fallback ]]; then
driver_path="$igb_uio_fallback"
driver_name="igb_uio" driver_name="igb_uio"
echo "WARNING: uio_pci_generic not detected - using $driver_name" echo "WARNING: uio_pci_generic not detected - using $driver_name"
else else