Merge tag 'char-misc-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver updates from Greg KH:
 "Here is the big char/misc driver patchset for 4.11-rc1.

  Lots of different driver subsystems updated here: rework for the
  hyperv subsystem to handle new platforms better, mei and w1 and extcon
  driver updates, as well as a number of other "minor" driver updates.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'char-misc-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (169 commits)
  goldfish: Sanitize the broken interrupt handler
  x86/platform/goldfish: Prevent unconditional loading
  vmbus: replace modulus operation with subtraction
  vmbus: constify parameters where possible
  vmbus: expose hv_begin/end_read
  vmbus: remove conditional locking of vmbus_write
  vmbus: add direct isr callback mode
  vmbus: change to per channel tasklet
  vmbus: put related per-cpu variable together
  vmbus: callback is in softirq not workqueue
  binder: Add support for file-descriptor arrays
  binder: Add support for scatter-gather
  binder: Add extra size to allocator
  binder: Refactor binder_transact()
  binder: Support multiple /dev instances
  binder: Deal with contexts in debugfs
  binder: Support multiple context managers
  binder: Split flat_binder_object
  auxdisplay: ht16k33: remove private workqueue
  auxdisplay: ht16k33: rework input device initialization
  ...

3 files changed, 225 insertions, 100 deletions

diff --git a/tools/testing/selftests/firmware/Makefile b/tools/testing/selftests/firmware/Makefile
index 9bf82234855b..1894d625af2d 100644
--- a/tools/testing/selftests/firmware/Makefile
+++ b/tools/testing/selftests/firmware/Makefile
@@ -3,7 +3,7 @@
 # No binaries, but make sure arg-less "make" doesn't trigger "run_tests"
 all:
 
-TEST_PROGS := fw_filesystem.sh fw_userhelper.sh
+TEST_PROGS := fw_filesystem.sh fw_fallback.sh
 
 include ../lib.mk
 
diff --git a/tools/testing/selftests/firmware/fw_fallback.sh b/tools/testing/selftests/firmware/fw_fallback.sh
new file mode 100755
index 000000000000..2e4c22d5abf7
--- /dev/null
+++ b/tools/testing/selftests/firmware/fw_fallback.sh
@@ -0,0 +1,224 @@
+#!/bin/sh
+# This validates that the kernel will fall back to using the fallback mechanism
+# to load firmware it can't find on disk itself. We must request a firmware
+# that the kernel won't find, and any installed helper (e.g. udev) also
+# won't find so that we can do the load ourself manually.
+set -e
+
+modprobe test_firmware
+
+DIR=/sys/devices/virtual/misc/test_firmware
+
+# CONFIG_FW_LOADER_USER_HELPER has a sysfs class under /sys/class/firmware/
+# These days no one enables CONFIG_FW_LOADER_USER_HELPER so check for that
+# as an indicator for CONFIG_FW_LOADER_USER_HELPER.
+HAS_FW_LOADER_USER_HELPER=$(if [ -d /sys/class/firmware/ ]; then echo yes; else echo no; fi)
+
+if [ "$HAS_FW_LOADER_USER_HELPER" = "yes" ]; then
+       OLD_TIMEOUT=$(cat /sys/class/firmware/timeout)
+else
+        echo "usermode helper disabled so ignoring test"
+        exit 0
+fi
+
+FWPATH=$(mktemp -d)
+FW="$FWPATH/test-firmware.bin"
+
+test_finish()
+{
+        echo "$OLD_TIMEOUT" >/sys/class/firmware/timeout
+        rm -f "$FW"
+        rmdir "$FWPATH"
+}
+
+load_fw()
+{
+        local name="$1"
+        local file="$2"
+
+        # This will block until our load (below) has finished.
+        echo -n "$name" >"$DIR"/trigger_request &
+
+        # Give kernel a chance to react.
+        local timeout=10
+        while [ ! -e "$DIR"/"$name"/loading ]; do
+                sleep 0.1
+                timeout=$(( $timeout - 1 ))
+                if [ "$timeout" -eq 0 ]; then
+                        echo "$0: firmware interface never appeared" >&2
+                        exit 1
+                fi
+        done
+
+        echo 1 >"$DIR"/"$name"/loading
+        cat "$file" >"$DIR"/"$name"/data
+        echo 0 >"$DIR"/"$name"/loading
+
+        # Wait for request to finish.
+        wait
+}
+
+load_fw_cancel()
+{
+        local name="$1"
+        local file="$2"
+
+        # This will block until our load (below) has finished.
+        echo -n "$name" >"$DIR"/trigger_request 2>/dev/null &
+
+        # Give kernel a chance to react.
+        local timeout=10
+        while [ ! -e "$DIR"/"$name"/loading ]; do
+                sleep 0.1
+                timeout=$(( $timeout - 1 ))
+                if [ "$timeout" -eq 0 ]; then
+                        echo "$0: firmware interface never appeared" >&2
+                        exit 1
+                fi
+        done
+
+        echo -1 >"$DIR"/"$name"/loading
+
+        # Wait for request to finish.
+        wait
+}
+
+load_fw_custom()
+{
+        local name="$1"
+        local file="$2"
+
+        echo -n "$name" >"$DIR"/trigger_custom_fallback 2>/dev/null &
+
+        # Give kernel a chance to react.
+        local timeout=10
+        while [ ! -e "$DIR"/"$name"/loading ]; do
+                sleep 0.1
+                timeout=$(( $timeout - 1 ))
+                if [ "$timeout" -eq 0 ]; then
+                        echo "$0: firmware interface never appeared" >&2
+                        exit 1
+                fi
+        done
+
+        echo 1 >"$DIR"/"$name"/loading
+        cat "$file" >"$DIR"/"$name"/data
+        echo 0 >"$DIR"/"$name"/loading
+
+        # Wait for request to finish.
+        wait
+}
+
+
+load_fw_custom_cancel()
+{
+        local name="$1"
+        local file="$2"
+
+        echo -n "$name" >"$DIR"/trigger_custom_fallback 2>/dev/null &
+
+        # Give kernel a chance to react.
+        local timeout=10
+        while [ ! -e "$DIR"/"$name"/loading ]; do
+                sleep 0.1
+                timeout=$(( $timeout - 1 ))
+                if [ "$timeout" -eq 0 ]; then
+                        echo "$0: firmware interface never appeared" >&2
+                        exit 1
+                fi
+        done
+
+        echo -1 >"$DIR"/"$name"/loading
+
+        # Wait for request to finish.
+        wait
+}
+
+
+trap "test_finish" EXIT
+
+# This is an unlikely real-world firmware content. :)
+echo "ABCD0123" >"$FW"
+NAME=$(basename "$FW")
+
+DEVPATH="$DIR"/"nope-$NAME"/loading
+
+# Test failure when doing nothing (timeout works).
+echo -n 2 >/sys/class/firmware/timeout
+echo -n "nope-$NAME" >"$DIR"/trigger_request 2>/dev/null &
+
+# Give the kernel some time to load the loading file, must be less
+# than the timeout above.
+sleep 1
+if [ ! -f $DEVPATH ]; then
+        echo "$0: fallback mechanism immediately cancelled"
+        echo ""
+        echo "The file never appeared: $DEVPATH"
+        echo ""
+        echo "This might be a distribution udev rule setup by your distribution"
+        echo "to immediately cancel all fallback requests, this must be"
+        echo "removed before running these tests. To confirm look for"
+        echo "a firmware rule like /lib/udev/rules.d/50-firmware.rules"
+        echo "and see if you have something like this:"
+        echo ""
+        echo "SUBSYSTEM==\"firmware\", ACTION==\"add\", ATTR{loading}=\"-1\""
+        echo ""
+        echo "If you do remove this file or comment out this line before"
+        echo "proceeding with these tests."
+        exit 1
+fi
+
+if diff -q "$FW" /dev/test_firmware >/dev/null ; then
+        echo "$0: firmware was not expected to match" >&2
+        exit 1
+else
+        echo "$0: timeout works"
+fi
+
+# Put timeout high enough for us to do work but not so long that failures
+# slow down this test too much.
+echo 4 >/sys/class/firmware/timeout
+
+# Load this script instead of the desired firmware.
+load_fw "$NAME" "$0"
+if diff -q "$FW" /dev/test_firmware >/dev/null ; then
+        echo "$0: firmware was not expected to match" >&2
+        exit 1
+else
+        echo "$0: firmware comparison works"
+fi
+
+# Do a proper load, which should work correctly.
+load_fw "$NAME" "$FW"
+if ! diff -q "$FW" /dev/test_firmware >/dev/null ; then
+        echo "$0: firmware was not loaded" >&2
+        exit 1
+else
+        echo "$0: fallback mechanism works"
+fi
+
+load_fw_cancel "nope-$NAME" "$FW"
+if diff -q "$FW" /dev/test_firmware >/dev/null ; then
+        echo "$0: firmware was expected to be cancelled" >&2
+        exit 1
+else
+        echo "$0: cancelling fallback mechanism works"
+fi
+
+load_fw_custom "$NAME" "$FW"
+if ! diff -q "$FW" /dev/test_firmware >/dev/null ; then
+        echo "$0: firmware was not loaded" >&2
+        exit 1
+else
+        echo "$0: custom fallback loading mechanism works"
+fi
+
+load_fw_custom_cancel "nope-$NAME" "$FW"
+if diff -q "$FW" /dev/test_firmware >/dev/null ; then
+        echo "$0: firmware was expected to be cancelled" >&2
+        exit 1
+else
+        echo "$0: cancelling custom fallback mechanism works"
+fi
+
+exit 0
diff --git a/tools/testing/selftests/firmware/fw_userhelper.sh b/tools/testing/selftests/firmware/fw_userhelper.sh
deleted file mode 100755
index b9983f8e09f6..000000000000
--- a/tools/testing/selftests/firmware/fw_userhelper.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-# This validates that the kernel will fall back to using the user helper
-# to load firmware it can't find on disk itself. We must request a firmware
-# that the kernel won't find, and any installed helper (e.g. udev) also
-# won't find so that we can do the load ourself manually.
-set -e
-
-modprobe test_firmware
-
-DIR=/sys/devices/virtual/misc/test_firmware
-
-# CONFIG_FW_LOADER_USER_HELPER has a sysfs class under /sys/class/firmware/
-# These days no one enables CONFIG_FW_LOADER_USER_HELPER so check for that
-# as an indicator for CONFIG_FW_LOADER_USER_HELPER.
-HAS_FW_LOADER_USER_HELPER=$(if [ -d /sys/class/firmware/ ]; then echo yes; else echo no; fi)
-
-if [ "$HAS_FW_LOADER_USER_HELPER" = "yes" ]; then
-       OLD_TIMEOUT=$(cat /sys/class/firmware/timeout)
-else
-        echo "usermode helper disabled so ignoring test"
-        exit 0
-fi
-
-FWPATH=$(mktemp -d)
-FW="$FWPATH/test-firmware.bin"
-
-test_finish()
-{
-        echo "$OLD_TIMEOUT" >/sys/class/firmware/timeout
-        rm -f "$FW"
-        rmdir "$FWPATH"
-}
-
-load_fw()
-{
-        local name="$1"
-        local file="$2"
-
-        # This will block until our load (below) has finished.
-        echo -n "$name" >"$DIR"/trigger_request &
-
-        # Give kernel a chance to react.
-        local timeout=10
-        while [ ! -e "$DIR"/"$name"/loading ]; do
-                sleep 0.1
-                timeout=$(( $timeout - 1 ))
-                if [ "$timeout" -eq 0 ]; then
-                        echo "$0: firmware interface never appeared" >&2
-                        exit 1
-                fi
-        done
-
-        echo 1 >"$DIR"/"$name"/loading
-        cat "$file" >"$DIR"/"$name"/data
-        echo 0 >"$DIR"/"$name"/loading
-
-        # Wait for request to finish.
-        wait
-}
-
-trap "test_finish" EXIT
-
-# This is an unlikely real-world firmware content. :)
-echo "ABCD0123" >"$FW"
-NAME=$(basename "$FW")
-
-# Test failure when doing nothing (timeout works).
-echo 1 >/sys/class/firmware/timeout
-echo -n "$NAME" >"$DIR"/trigger_request
-if diff -q "$FW" /dev/test_firmware >/dev/null ; then
-        echo "$0: firmware was not expected to match" >&2
-        exit 1
-else
-        echo "$0: timeout works"
-fi
-
-# Put timeout high enough for us to do work but not so long that failures
-# slow down this test too much.
-echo 4 >/sys/class/firmware/timeout
-
-# Load this script instead of the desired firmware.
-load_fw "$NAME" "$0"
-if diff -q "$FW" /dev/test_firmware >/dev/null ; then
-        echo "$0: firmware was not expected to match" >&2
-        exit 1
-else
-        echo "$0: firmware comparison works"
-fi
-
-# Do a proper load, which should work correctly.
-load_fw "$NAME" "$FW"
-if ! diff -q "$FW" /dev/test_firmware >/dev/null ; then
-        echo "$0: firmware was not loaded" >&2
-        exit 1
-else
-        echo "$0: user helper firmware loading works"
-fi
-
-exit 0