Merge tag 'ntb-4.13' of git://github.com/jonmason/ntb

Pull NTB updates from Jon Mason:
 "The major change in the series is a rework of the NTB infrastructure
  to all for IDT hardware to be supported (and resulting fallout from
  that). There are also a few clean-ups, etc.

  New IDT NTB driver and changes to the NTB infrastructure to allow for
  this different kind of NTB HW, some style fixes (per Greg KH
  recommendation), and some ntb_test tweaks"

* tag 'ntb-4.13' of git://github.com/jonmason/ntb:
  ntb_netdev: set the net_device's parent
  ntb: Add error path/handling to Debug FS entry creation
  ntb: Add more debugfs support for ntb_perf testing options
  ntb: Remove debug-fs variables from the context structure
  ntb: Add a module option to control affinity of DMA channels
  NTB: Add IDT 89HPESxNTx PCIe-switches support
  ntb_hw_intel: Style fixes: open code macros that just obfuscate code
  ntb_hw_amd: Style fixes: open code macros that just obfuscate code
  NTB: Add ntb.h comments
  NTB: Add PCIe Gen4 link speed
  NTB: Add new Memory Windows API documentation
  NTB: Add Messaging NTB API
  NTB: Alter Scratchpads API to support multi-ports devices
  NTB: Alter MW API to support multi-ports devices
  NTB: Alter link-state API to support multi-port devices
  NTB: Add indexed ports NTB API
  NTB: Make link-state API being declared first
  NTB: ntb_test: add parameter for doorbell bitmask
  NTB: ntb_test: modprobe on remote host

1 files changed, 9 insertions, 2 deletions

diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index 13f5198ba0ee..1c12b5855e4f 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -18,6 +18,7 @@ LIST_DEVS=FALSE
 
 DEBUGFS=${DEBUGFS-/sys/kernel/debug}
 
+DB_BITMASK=0x7FFF
 PERF_RUN_ORDER=32
 MAX_MW_SIZE=0
 RUN_DMA_TESTS=
@@ -38,6 +39,7 @@ function show_help()
         echo "be highly recommended."
         echo
         echo "Options:"
+        echo "  -b BITMASK      doorbell clear bitmask for ntb_tool"
         echo "  -C              don't cleanup ntb modules on exit"
         echo "  -d              run dma tests"
         echo "  -h              show this help message"
@@ -52,8 +54,9 @@ function show_help()
 function parse_args()
 {
         OPTIND=0
-        while getopts "Cdhlm:r:p:w:" opt; do
+        while getopts "b:Cdhlm:r:p:w:" opt; do
                 case "$opt" in
+                b)  DB_BITMASK=${OPTARG} ;;
                 C)  DONT_CLEANUP=1 ;;
                 d)  RUN_DMA_TESTS=1 ;;
                 h)  show_help; exit 0 ;;
@@ -85,6 +88,10 @@ set -e
 function _modprobe()
 {
         modprobe "$@"
+
+        if [[ "$REMOTE_HOST" != "" ]]; then
+                ssh "$REMOTE_HOST" modprobe "$@"
+        fi
 }
 
 function split_remote()
@@ -154,7 +161,7 @@ function doorbell_test()
 
         echo "Running db tests on: $(basename $LOC) / $(basename $REM)"
 
-        write_file "c 0xFFFFFFFF" "$REM/db"
+        write_file "c $DB_BITMASK" "$REM/db"
 
         for ((i=1; i <= 8; i++)); do
                 let DB=$(read_file "$REM/db") || true