git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
usertools: fix a typo in bind script
[dpdk.git]
/
usertools
/
dpdk-devbind.py
diff --git
a/usertools/dpdk-devbind.py
b/usertools/dpdk-devbind.py
index
2d99e9d
..
f9f7aee
100755
(executable)
--- a/
usertools/dpdk-devbind.py
+++ b/
usertools/dpdk-devbind.py
@@
-49,8
+49,10
@@
cavium_sso = {'Class': '08', 'Vendor': '177d', 'Device': 'a04b,a04d',
'SVendor': None, 'SDevice': None}
cavium_fpa = {'Class': '08', 'Vendor': '177d', 'Device': 'a053',
'SVendor': None, 'SDevice': None}
'SVendor': None, 'SDevice': None}
cavium_fpa = {'Class': '08', 'Vendor': '177d', 'Device': 'a053',
'SVendor': None, 'SDevice': None}
+cavium_pkx = {'Class': '08', 'Vendor': '177d', 'Device': 'a0dd,a049',
+ 'SVendor': None, 'SDevice': None}
-network_devices = [network_class]
+network_devices = [network_class
, cavium_pkx
]
crypto_devices = [encryption_class, intel_processor_class]
eventdev_devices = [cavium_sso]
mempool_devices = [cavium_fpa]
crypto_devices = [encryption_class, intel_processor_class]
eventdev_devices = [cavium_sso]
mempool_devices = [cavium_fpa]
@@
-202,8
+204,7
@@
def check_modules():
# special case for vfio_pci (module is named vfio-pci,
# but its .ko is named vfio_pci)
# special case for vfio_pci (module is named vfio-pci,
# but its .ko is named vfio_pci)
- sysfs_mods = map(lambda a:
- a if a != 'vfio_pci' else 'vfio-pci', sysfs_mods)
+ sysfs_mods = [a if a != 'vfio_pci' else 'vfio-pci' for a in sysfs_mods]
for mod in mods:
if mod["Name"] in sysfs_mods:
for mod in mods:
if mod["Name"] in sysfs_mods:
@@
-354,8
+355,7
@@
def device_type_match(dev, devices_type):
# count must be the number of non None parameters to match
if match_count == param_count:
return True
# count must be the number of non None parameters to match
if match_count == param_count:
return True
- else:
- return False
+ return False
def dev_id_from_dev_name(dev_name):
'''Take a device "name" - a string passed in by user to identify a NIC
def dev_id_from_dev_name(dev_name):
'''Take a device "name" - a string passed in by user to identify a NIC
@@
-517,6
+517,14
@@
def bind_one(dev_id, driver, force):
def unbind_all(dev_list, force=False):
"""Unbind method, takes a list of device locations"""
def unbind_all(dev_list, force=False):
"""Unbind method, takes a list of device locations"""
+
+ if dev_list[0] == "dpdk":
+ for d in devices.keys():
+ if "Driver_str" in devices[d]:
+ if devices[d]["Driver_str"] in dpdk_drivers:
+ unbind_one(devices[d]["Slot"], force)
+ return
+
dev_list = map(dev_id_from_dev_name, dev_list)
for d in dev_list:
unbind_one(d, force)
dev_list = map(dev_id_from_dev_name, dev_list)
for d in dev_list:
unbind_one(d, force)
@@
-531,7
+539,7
@@
def bind_all(dev_list, driver, force=False):
for d in dev_list:
bind_one(d, driver, force)
for d in dev_list:
bind_one(d, driver, force)
- # For kenels < 3.15 when binding devices to a generic driver
+ # For ke
r
nels < 3.15 when binding devices to a generic driver
# (i.e. one that doesn't have a PCI ID table) using new_id, 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
# (i.e. one that doesn't have a PCI ID table) using new_id, 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