From: Anatoly Burakov <anatoly.burakov@intel.com>
Date: Wed, 18 Jun 2014 16:57:58 +0000 (+0100)
Subject: tools: unbind ports that were erroneously bound
X-Git-Tag: spdx-start~10571
X-Git-Url: http://git.droids-corp.org/?p=dpdk.git;a=commitdiff_plain;h=49c5044a36313314720a5e5a8a7e0348d7637c4e

tools: unbind ports that were erroneously bound

When binding devices to a generic driver (i.e. one that doesn't have a
PCI ID table, some devices that are not bound to any other driver could
be bound even if no one has asked them to. hence, we check the list of
drivers again, and see if some of the previously-unbound devices were
erroneously bound. if such devices are found, they are unbound back.

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---

diff --git a/tools/dpdk_nic_bind.py b/tools/dpdk_nic_bind.py
index 42e845f1ea..95d1e514e3 100755
--- a/tools/dpdk_nic_bind.py
+++ b/tools/dpdk_nic_bind.py
@@ -383,10 +383,31 @@ def unbind_all(dev_list, force=False):
 
 def bind_all(dev_list, driver, force=False):
     """Unbind method, takes a list of device locations"""
+    global devices
+
     dev_list = map(dev_id_from_dev_name, dev_list)
+
     for d in dev_list:
         bind_one(d, driver, force)
 
+    # when binding devices to a generic driver (i.e. one that doesn't have a
+    # PCI ID table), some devices that are not bound to any other driver could
+    # be bound even if no one has asked them to. hence, we check the list of
+    # drivers again, and see if some of the previously-unbound devices were
+    # erroneously bound.
+    for d in devices.keys():
+        # skip devices that were already bound or that we know should be bound
+        if "Driver_str" in devices[d] or d in dev_list:
+            continue
+
+        # update information about this device
+        devices[d] = dict(devices[d].items() +
+                          get_pci_device_details(d).items())
+
+        # check if updated information indicates that the device was bound
+        if "Driver_str" in devices[d]:
+            unbind_one(d, force)
+
 def display_devices(title, dev_list, extra_params = None):
     '''Displays to the user the details of a list of devices given in "dev_list"
     The "extra_params" parameter, if given, should contain a string with