From 203fd7ffc7c321bdce252465651fe83501b56a8f Mon Sep 17 00:00:00 2001
From: Michal Berger <michalx.berger@intel.com>
Date: Wed, 14 Oct 2020 12:02:35 +0200
Subject: [PATCH] scripts/setup: Move fallback driver check to collect_driver()

Change-Id: I98de31e32190350c38b52edef8514dc4ab8bda92
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4659
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>
---
 scripts/setup.sh | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/scripts/setup.sh b/scripts/setup.sh
index b692175d6..6a04f0044 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -245,7 +245,6 @@ function collect_devices() {
 
 function collect_driver() {
 	local bdf=$1
-	local override_driver=$2
 	local drivers driver
 
 	[[ -e /sys/bus/pci/devices/$bdf/modalias ]] || return 1
@@ -254,7 +253,11 @@ function collect_driver() {
 		driver=$(readlink -f "/sys/module/${drivers[0]}/drivers/pci:"*)
 		driver=${driver##*/}
 	else
-		driver=$override_driver
+		[[ -n ${nvme_d["$bdf"]} ]] && driver=nvme
+		[[ -n ${ioat_d["$bdf"]} ]] && driver=ioatdma
+		[[ -n ${idxd_d["$bdf"]} ]] && driver=idxd
+		[[ -n ${virtio_d["$bdf"]} ]] && driver=virtio-pci
+		[[ -n ${vmd_d["$bdf"]} ]] && driver=vmd
 	fi 2> /dev/null
 	echo "$driver"
 }
@@ -460,13 +463,7 @@ function reset_linux_pci() {
 	for bdf in "${!all_devices_d[@]}"; do
 		((all_devices_d["$bdf"] == 0)) || continue
 
-		[[ -n ${nvme_d["$bdf"]} ]] && fallback_driver=nvme
-		[[ -n ${ioat_d["$bdf"]} ]] && fallback_driver=ioatdma
-		[[ -n ${idxd_d["$bdf"]} ]] && fallback_driver=idxd
-		[[ -n ${virtio_d["$bdf"]} ]] && fallback_driver=virtio-pci
-		[[ -n ${vmd_d["$bdf"]} ]] && fallback_driver=vmd
-		driver=$(collect_driver "$bdf" "$fallback_driver")
-
+		driver=$(collect_driver "$bdf")
 		if ! check_for_driver "$driver"; then
 			linux_bind_driver "$bdf" "$driver"
 		else