Merge tag 'driver-core-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core update from Greg KH:
"Here is the "big" driver core update for 4.14-rc1.
It's really not all that big, the largest thing here being some
firmware tests to help ensure that that crazy api is working properly.
There's also a new uevent for when a driver is bound or unbound from a
device, fixing a hole in the driver model that's been there since the
very beginning. Many thanks to Dmitry for being persistent and
pointing out how wrong I was about this all along :)
Patches for the new uevents are already in the systemd tree, if people
want to play around with them.
Otherwise just a number of other small api changes and updates here,
nothing major. All of these patches have been in linux-next for a
while with no reported issues"
* tag 'driver-core-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (28 commits)
driver core: bus: Fix a potential double free
Do not disable driver and bus shutdown hook when class shutdown hook is set.
base: topology: constify attribute_group structures.
base: Convert to using %pOF instead of full_name
kernfs: Clarify lockdep name for kn->count
fbdev: uvesafb: remove DRIVER_ATTR() usage
xen: xen-pciback: remove DRIVER_ATTR() usage
driver core: Document struct device:dma_ops
mod_devicetable: Remove excess description from structured comment
test_firmware: add batched firmware tests
firmware: enable a debug print for batched requests
firmware: define pr_fmt
firmware: send -EINTR on signal abort on fallback mechanism
test_firmware: add test case for SIGCHLD on sync fallback
initcall_debug: add deferred probe times
Input: axp20x-pek - switch to using devm_device_add_group()
Input: synaptics_rmi4 - use devm_device_add_group() for attributes in F01
Input: gpio_keys - use devm_device_add_group() for attributes
driver core: add devm_device_add_group() and friends
driver core: add device_{add|remove}_group() helpers
...
This commit is contained in:
Linus Torvalds
@@ -134,6 +134,27 @@ load_fw_custom_cancel()
|
||||
wait
|
||||
}
|
||||
|
||||
load_fw_fallback_with_child()
|
||||
{
|
||||
local name="$1"
|
||||
local file="$2"
|
||||
|
||||
# This is the value already set but we want to be explicit
|
||||
echo 4 >/sys/class/firmware/timeout
|
||||
|
||||
sleep 1 &
|
||||
SECONDS_BEFORE=$(date +%s)
|
||||
echo -n "$name" >"$DIR"/trigger_request 2>/dev/null
|
||||
SECONDS_AFTER=$(date +%s)
|
||||
SECONDS_DELTA=$(($SECONDS_AFTER - $SECONDS_BEFORE))
|
||||
if [ "$SECONDS_DELTA" -lt 4 ]; then
|
||||
RET=1
|
||||
else
|
||||
RET=0
|
||||
fi
|
||||
wait
|
||||
return $RET
|
||||
}
|
||||
|
||||
trap "test_finish" EXIT
|
||||
|
||||
@@ -221,4 +242,14 @@ else
|
||||
echo "$0: cancelling custom fallback mechanism works"
|
||||
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
|
||||
|
||||
exit 0
|
||||
|
||||
@@ -25,8 +25,9 @@ if [ ! -d $DIR ]; then
|
||||
fi
|
||||
|
||||
# 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.
|
||||
# These days most distros enable CONFIG_FW_LOADER_USER_HELPER but disable
|
||||
# CONFIG_FW_LOADER_USER_HELPER_FALLBACK. We use /sys/class/firmware/ 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
|
||||
@@ -116,4 +117,240 @@ else
|
||||
echo "$0: async filesystem loading works"
|
||||
fi
|
||||
|
||||
### Batched requests tests
|
||||
test_config_present()
|
||||
{
|
||||
if [ ! -f $DIR/reset ]; then
|
||||
echo "Configuration triggers not present, ignoring test"
|
||||
exit 0
|
||||
fi
|
||||
}
|
||||
|
||||
# Defaults :
|
||||
#
|
||||
# send_uevent: 1
|
||||
# sync_direct: 0
|
||||
# name: test-firmware.bin
|
||||
# num_requests: 4
|
||||
config_reset()
|
||||
{
|
||||
echo 1 > $DIR/reset
|
||||
}
|
||||
|
||||
release_all_firmware()
|
||||
{
|
||||
echo 1 > $DIR/release_all_firmware
|
||||
}
|
||||
|
||||
config_set_name()
|
||||
{
|
||||
echo -n $1 > $DIR/config_name
|
||||
}
|
||||
|
||||
config_set_sync_direct()
|
||||
{
|
||||
echo 1 > $DIR/config_sync_direct
|
||||
}
|
||||
|
||||
config_unset_sync_direct()
|
||||
{
|
||||
echo 0 > $DIR/config_sync_direct
|
||||
}
|
||||
|
||||
config_set_uevent()
|
||||
{
|
||||
echo 1 > $DIR/config_send_uevent
|
||||
}
|
||||
|
||||
config_unset_uevent()
|
||||
{
|
||||
echo 0 > $DIR/config_send_uevent
|
||||
}
|
||||
|
||||
config_trigger_sync()
|
||||
{
|
||||
echo -n 1 > $DIR/trigger_batched_requests 2>/dev/null
|
||||
}
|
||||
|
||||
config_trigger_async()
|
||||
{
|
||||
echo -n 1 > $DIR/trigger_batched_requests_async 2> /dev/null
|
||||
}
|
||||
|
||||
config_set_read_fw_idx()
|
||||
{
|
||||
echo -n $1 > $DIR/config_read_fw_idx 2> /dev/null
|
||||
}
|
||||
|
||||
read_firmwares()
|
||||
{
|
||||
for i in $(seq 0 3); do
|
||||
config_set_read_fw_idx $i
|
||||
# Verify the contents are what we expect.
|
||||
# -Z required for now -- check for yourself, md5sum
|
||||
# on $FW and DIR/read_firmware will yield the same. Even
|
||||
# cmp agrees, so something is off.
|
||||
if ! diff -q -Z "$FW" $DIR/read_firmware 2>/dev/null ; then
|
||||
echo "request #$i: firmware was not loaded" >&2
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
read_firmwares_expect_nofile()
|
||||
{
|
||||
for i in $(seq 0 3); do
|
||||
config_set_read_fw_idx $i
|
||||
# Ensures contents differ
|
||||
if diff -q -Z "$FW" $DIR/read_firmware 2>/dev/null ; then
|
||||
echo "request $i: file was not expected to match" >&2
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
test_batched_request_firmware_nofile()
|
||||
{
|
||||
echo -n "Batched request_firmware() nofile try #$1: "
|
||||
config_reset
|
||||
config_set_name nope-test-firmware.bin
|
||||
config_trigger_sync
|
||||
read_firmwares_expect_nofile
|
||||
release_all_firmware
|
||||
echo "OK"
|
||||
}
|
||||
|
||||
test_batched_request_firmware_direct_nofile()
|
||||
{
|
||||
echo -n "Batched request_firmware_direct() nofile try #$1: "
|
||||
config_reset
|
||||
config_set_name nope-test-firmware.bin
|
||||
config_set_sync_direct
|
||||
config_trigger_sync
|
||||
release_all_firmware
|
||||
echo "OK"
|
||||
}
|
||||
|
||||
test_request_firmware_nowait_uevent_nofile()
|
||||
{
|
||||
echo -n "Batched request_firmware_nowait(uevent=true) nofile try #$1: "
|
||||
config_reset
|
||||
config_set_name nope-test-firmware.bin
|
||||
config_trigger_async
|
||||
release_all_firmware
|
||||
echo "OK"
|
||||
}
|
||||
|
||||
test_wait_and_cancel_custom_load()
|
||||
{
|
||||
if [ "$HAS_FW_LOADER_USER_HELPER" != "yes" ]; then
|
||||
return
|
||||
fi
|
||||
local timeout=10
|
||||
name=$1
|
||||
while [ ! -e "$DIR"/"$name"/loading ]; do
|
||||
sleep 0.1
|
||||
timeout=$(( $timeout - 1 ))
|
||||
if [ "$timeout" -eq 0 ]; then
|
||||
echo "firmware interface never appeared:" >&2
|
||||
echo "$DIR/$name/loading" >&2
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
echo -1 >"$DIR"/"$name"/loading
|
||||
}
|
||||
|
||||
test_request_firmware_nowait_custom_nofile()
|
||||
{
|
||||
echo -n "Batched request_firmware_nowait(uevent=false) nofile try #$1: "
|
||||
config_unset_uevent
|
||||
config_set_name nope-test-firmware.bin
|
||||
config_trigger_async &
|
||||
test_wait_and_cancel_custom_load nope-test-firmware.bin
|
||||
wait
|
||||
release_all_firmware
|
||||
echo "OK"
|
||||
}
|
||||
|
||||
test_batched_request_firmware()
|
||||
{
|
||||
echo -n "Batched request_firmware() try #$1: "
|
||||
config_reset
|
||||
config_trigger_sync
|
||||
read_firmwares
|
||||
release_all_firmware
|
||||
echo "OK"
|
||||
}
|
||||
|
||||
test_batched_request_firmware_direct()
|
||||
{
|
||||
echo -n "Batched request_firmware_direct() try #$1: "
|
||||
config_reset
|
||||
config_set_sync_direct
|
||||
config_trigger_sync
|
||||
release_all_firmware
|
||||
echo "OK"
|
||||
}
|
||||
|
||||
test_request_firmware_nowait_uevent()
|
||||
{
|
||||
echo -n "Batched request_firmware_nowait(uevent=true) try #$1: "
|
||||
config_reset
|
||||
config_trigger_async
|
||||
release_all_firmware
|
||||
echo "OK"
|
||||
}
|
||||
|
||||
test_request_firmware_nowait_custom()
|
||||
{
|
||||
echo -n "Batched request_firmware_nowait(uevent=false) try #$1: "
|
||||
config_unset_uevent
|
||||
config_trigger_async
|
||||
release_all_firmware
|
||||
echo "OK"
|
||||
}
|
||||
|
||||
# Only continue if batched request triggers are present on the
|
||||
# test-firmware driver
|
||||
test_config_present
|
||||
|
||||
# test with the file present
|
||||
echo
|
||||
echo "Testing with the file present..."
|
||||
for i in $(seq 1 5); do
|
||||
test_batched_request_firmware $i
|
||||
done
|
||||
|
||||
for i in $(seq 1 5); do
|
||||
test_batched_request_firmware_direct $i
|
||||
done
|
||||
|
||||
for i in $(seq 1 5); do
|
||||
test_request_firmware_nowait_uevent $i
|
||||
done
|
||||
|
||||
for i in $(seq 1 5); do
|
||||
test_request_firmware_nowait_custom $i
|
||||
done
|
||||
|
||||
# Test for file not found, errors are expected, the failure would be
|
||||
# a hung task, which would require a hard reset.
|
||||
echo
|
||||
echo "Testing with the file missing..."
|
||||
for i in $(seq 1 5); do
|
||||
test_batched_request_firmware_nofile $i
|
||||
done
|
||||
|
||||
for i in $(seq 1 5); do
|
||||
test_batched_request_firmware_direct_nofile $i
|
||||
done
|
||||
|
||||
for i in $(seq 1 5); do
|
||||
test_request_firmware_nowait_uevent_nofile $i
|
||||
done
|
||||
|
||||
for i in $(seq 1 5); do
|
||||
test_request_firmware_nowait_custom_nofile $i
|
||||
done
|
||||
|
||||
exit 0
|
||||
|
||||
Reference in New Issue
Block a user