Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef557787 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by Greg Kroah-Hartman
Browse files

test_firmware: enable custom fallback testing on limited kernel configs 



When a kernel is not built with:

CONFIG_HAS_FW_LOADER_USER_HELPER_FALLBACK=y

We don't currently enable testing fw_fallback.sh. For kernels that
still enable the fallback mechanism, its possible to use the async
request firmware API call request_firmware_nowait() using the custom
interface to use the fallback mechanism, so we should be able to test
this but we currently cannot.

We can enable testing without CONFIG_HAS_FW_LOADER_USER_HELPER_FALLBACK=y
by relying on /proc/config.gz (CONFIG_IKCONFIG_PROC), if present. If you
don't have this we'll have no option but to rely on old heuristics for now.

We stuff the new kconfig_has() helper into our shared library as we'll
later expando on its use elsewhere.

Acked-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarLuis R. Rodriguez <mcgrof@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 29a1c00c

tools/testing/selftests/firmware/config

+4 −0
Original line number Diff line number Diff line 
CONFIG_TEST_FIRMWARE=y

CONFIG_FW_LOADER=y

CONFIG_FW_LOADER_USER_HELPER=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

tools/testing/selftests/firmware/fw_fallback.sh

+5 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ check_mods 
# 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)

HAS_FW_LOADER_USER_HELPER_FALLBACK=$(kconfig_has CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y)



if [ "$HAS_FW_LOADER_USER_HELPER" = "yes" ]; then

       OLD_TIMEOUT=$(cat /sys/class/firmware/timeout)
@@ -287,7 +288,10 @@ run_sysfs_custom_load_tests() 
	fi

}



if [ "$HAS_FW_LOADER_USER_HELPER_FALLBACK" = "yes" ]; then

	run_sysfs_main_tests

fi



run_sysfs_custom_load_tests



exit 0

tools/testing/selftests/firmware/fw_lib.sh

+24 −0
Original line number Diff line number Diff line
@@ -42,3 +42,27 @@ check_mods() 
		fi

	fi

}



kconfig_has()

{

	if [ -f $PROC_CONFIG ]; then

		if zgrep -q $1 $PROC_CONFIG 2>/dev/null; then

			echo "yes"

		else

			echo "no"

		fi

	else

		# We currently don't have easy heuristics to infer this

		# so best we can do is just try to use the kernel assuming

		# you had enabled it. This matches the old behaviour.

		if [ "$1" = "CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y" ]; then

			echo "yes"

		elif [ "$1" = "CONFIG_FW_LOADER_USER_HELPER=y" ]; then

			if [ -d /sys/class/firmware/ ]; then

				echo yes

			else

				echo no

			fi

		fi

	fi

}