Merge tag 'driver-core-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core updates from Greg KH:
 "Here is the set of "big" driver core patches for 4.16-rc1.

  The majority of the work here is in the firmware subsystem, with
  reworks to try to attempt to make the code easier to handle in the
  long run, but no functional change. There's also some tree-wide sysfs
  attribute fixups with lots of acks from the various subsystem
  maintainers, as well as a handful of other normal fixes and changes.

  And finally, some license cleanups for the driver core and sysfs code.

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

* tag 'driver-core-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (48 commits)
  device property: Define type of PROPERTY_ENRTY_*() macros
  device property: Reuse property_entry_free_data()
  device property: Move property_entry_free_data() upper
  firmware: Fix up docs referring to FIRMWARE_IN_KERNEL
  firmware: Drop FIRMWARE_IN_KERNEL Kconfig option
  USB: serial: keyspan: Drop firmware Kconfig options
  sysfs: remove DEBUG defines
  sysfs: use SPDX identifiers
  drivers: base: add coredump driver ops
  sysfs: add attribute specification for /sysfs/devices/.../coredump
  test_firmware: fix missing unlock on error in config_num_requests_store()
  test_firmware: make local symbol test_fw_config static
  sysfs: turn WARN() into pr_warn()
  firmware: Fix a typo in fallback-mechanisms.rst
  treewide: Use DEVICE_ATTR_WO
  treewide: Use DEVICE_ATTR_RO
  treewide: Use DEVICE_ATTR_RW
  sysfs.h: Use octal permissions
  component: add debugfs support
  bus: simple-pm-bus: convert bool SIMPLE_PM_BUS to tristate
  ...

2 files changed, 101 insertions, 76 deletions

diff --git a/tools/testing/selftests/firmware/fw_fallback.sh b/tools/testing/selftests/firmware/fw_fallback.sh
index 34a42c68ebfb..722cad91df74 100755
--- a/tools/testing/selftests/firmware/fw_fallback.sh
+++ b/tools/testing/selftests/firmware/fw_fallback.sh
@@ -175,96 +175,118 @@ trap "test_finish" EXIT
 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
+test_syfs_timeout()
+{
+        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
 
-# 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
+        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
+}
 
-# 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
+run_sysfs_main_tests()
+{
+        test_syfs_timeout
+        # 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_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 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
 
-if load_fw_custom "$NAME" "$FW" ; then
+        # 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: custom fallback loading mechanism works"
+                echo "$0: fallback mechanism works"
         fi
-fi
 
-if load_fw_custom_cancel "nope-$NAME" "$FW" ; then
+        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 custom fallback mechanism works"
+                echo "$0: cancelling fallback mechanism works"
         fi
-fi
 
-set +e
-load_fw_fallback_with_child "nope-signal-$NAME" "$FW"
-if [ "$?" -eq 0 ]; then
-        echo "$0: SIGCHLD on sync ignored as expected" >&2
-else
-        echo "$0: error - sync firmware request cancelled due to SIGCHLD" >&2
-        exit 1
-fi
-set -e
+        set +e
+        load_fw_fallback_with_child "nope-signal-$NAME" "$FW"
+        if [ "$?" -eq 0 ]; then
+                echo "$0: SIGCHLD on sync ignored as expected" >&2
+        else
+                echo "$0: error - sync firmware request cancelled due to SIGCHLD" >&2
+                exit 1
+        fi
+        set -e
+}
+
+run_sysfs_custom_load_tests()
+{
+        if load_fw_custom "$NAME" "$FW" ; then
+                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
+        fi
+
+        if load_fw_custom "$NAME" "$FW" ; then
+                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
+        fi
+
+        if load_fw_custom_cancel "nope-$NAME" "$FW" ; then
+                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
+        fi
+}
+
+run_sysfs_main_tests
+run_sysfs_custom_load_tests
 
 exit 0
diff --git a/tools/testing/selftests/firmware/fw_filesystem.sh b/tools/testing/selftests/firmware/fw_filesystem.sh
index b1f20fef36c7..f9508e1a4058 100755
--- a/tools/testing/selftests/firmware/fw_filesystem.sh
+++ b/tools/testing/selftests/firmware/fw_filesystem.sh
@@ -45,7 +45,10 @@ test_finish()
         if [ "$HAS_FW_LOADER_USER_HELPER" = "yes" ]; then
                 echo "$OLD_TIMEOUT" >/sys/class/firmware/timeout
         fi
-        echo -n "$OLD_PATH" >/sys/module/firmware_class/parameters/path
+        if [ "$OLD_FWPATH" = "" ]; then
+                OLD_FWPATH=" "
+        fi
+        echo -n "$OLD_FWPATH" >/sys/module/firmware_class/parameters/path
         rm -f "$FW"
         rmdir "$FWPATH"
 }