aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRicardo Salveti <ricardo.salveti@linaro.org>2016-07-25 13:22:22 -0300
committerRicardo Salveti <ricardo.salveti@linaro.org>2016-07-25 13:26:13 -0300
commit5b1ff351aa2d38446487eed6ccd7ace1b654bbe6 (patch)
tree383fc0fb3c0906113cdbdc0268a32479ed8fa038 /tools
parentfe9e0a156b8ec361b633b4d20d2231113f28fa63 (diff)
Imported Upstream version 16.07-rc4
Change-Id: Ic57f6a3726f2dbd1682223648d91310f45705327 Signed-off-by: Ricardo Salveti <ricardo.salveti@linaro.org>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/dpdk-devbind.py (renamed from tools/dpdk_nic_bind.py)0
-rwxr-xr-xtools/dpdk-pmdinfo.py (renamed from tools/pmdinfo.py)4
-rwxr-xr-xtools/dpdk-setup.sh (renamed from tools/setup.sh)24
3 files changed, 13 insertions, 15 deletions
diff --git a/tools/dpdk_nic_bind.py b/tools/dpdk-devbind.py
index b69ca2a0..b69ca2a0 100755
--- a/tools/dpdk_nic_bind.py
+++ b/tools/dpdk-devbind.py
diff --git a/tools/pmdinfo.py b/tools/dpdk-pmdinfo.py
index 662034af..dcc8db86 100755
--- a/tools/pmdinfo.py
+++ b/tools/dpdk-pmdinfo.py
@@ -1,6 +1,5 @@
#!/usr/bin/env python
# -------------------------------------------------------------------------
-# scripts/pmdinfo.py
#
# Utility to dump PMD_INFO_STRING support from an object file
#
@@ -569,8 +568,7 @@ def main(stream=None):
optparser = OptionParser(
usage='usage: %prog [-hrtp] [-d <pci id file] <elf-file>',
description="Dump pmd hardware support info",
- add_help_option=True,
- prog='pmdinfo.py')
+ add_help_option=True)
optparser.add_option('-r', '--raw',
action='store_true', dest='raw_output',
help='Dump raw json strings')
diff --git a/tools/setup.sh b/tools/dpdk-setup.sh
index 6097ab7b..ac81b2e4 100755
--- a/tools/setup.sh
+++ b/tools/dpdk-setup.sh
@@ -32,7 +32,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# Run with "source /path/to/setup.sh"
+# Run with "source /path/to/dpdk-setup.sh"
#
#
@@ -422,13 +422,13 @@ grep_meminfo()
}
#
-# Calls dpdk_nic_bind.py --status to show the NIC and what they
+# Calls dpdk-devbind.py --status to show the NIC and what they
# are all bound to, in terms of drivers.
#
show_nics()
{
if [ -d /sys/module/vfio_pci -o -d /sys/module/igb_uio ]; then
- ${RTE_SDK}/tools/dpdk_nic_bind.py --status
+ ${RTE_SDK}/tools/dpdk-devbind.py --status
else
echo "# Please load the 'igb_uio' or 'vfio-pci' kernel module before "
echo "# querying or adjusting NIC device bindings"
@@ -436,16 +436,16 @@ show_nics()
}
#
-# Uses dpdk_nic_bind.py to move devices to work with vfio-pci
+# Uses dpdk-devbind.py to move devices to work with vfio-pci
#
bind_nics_to_vfio()
{
if [ -d /sys/module/vfio_pci ]; then
- ${RTE_SDK}/tools/dpdk_nic_bind.py --status
+ ${RTE_SDK}/tools/dpdk-devbind.py --status
echo ""
echo -n "Enter PCI address of device to bind to VFIO driver: "
read PCI_PATH
- sudo ${RTE_SDK}/tools/dpdk_nic_bind.py -b vfio-pci $PCI_PATH &&
+ sudo ${RTE_SDK}/tools/dpdk-devbind.py -b vfio-pci $PCI_PATH &&
echo "OK"
else
echo "# Please load the 'vfio-pci' kernel module before querying or "
@@ -454,16 +454,16 @@ bind_nics_to_vfio()
}
#
-# Uses dpdk_nic_bind.py to move devices to work with igb_uio
+# Uses dpdk-devbind.py to move devices to work with igb_uio
#
bind_nics_to_igb_uio()
{
if [ -d /sys/module/igb_uio ]; then
- ${RTE_SDK}/tools/dpdk_nic_bind.py --status
+ ${RTE_SDK}/tools/dpdk-devbind.py --status
echo ""
echo -n "Enter PCI address of device to bind to IGB UIO driver: "
read PCI_PATH
- sudo ${RTE_SDK}/tools/dpdk_nic_bind.py -b igb_uio $PCI_PATH && echo "OK"
+ sudo ${RTE_SDK}/tools/dpdk-devbind.py -b igb_uio $PCI_PATH && echo "OK"
else
echo "# Please load the 'igb_uio' kernel module before querying or "
echo "# adjusting NIC device bindings"
@@ -471,18 +471,18 @@ bind_nics_to_igb_uio()
}
#
-# Uses dpdk_nic_bind.py to move devices to work with kernel drivers again
+# Uses dpdk-devbind.py to move devices to work with kernel drivers again
#
unbind_nics()
{
- ${RTE_SDK}/tools/dpdk_nic_bind.py --status
+ ${RTE_SDK}/tools/dpdk-devbind.py --status
echo ""
echo -n "Enter PCI address of device to unbind: "
read PCI_PATH
echo ""
echo -n "Enter name of kernel driver to bind the device to: "
read DRV
- sudo ${RTE_SDK}/tools/dpdk_nic_bind.py -b $DRV $PCI_PATH && echo "OK"
+ sudo ${RTE_SDK}/tools/dpdk-devbind.py -b $DRV $PCI_PATH && echo "OK"
}
#