aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/firmware_loader/fallback_table.c
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@kernel.org>2018-03-10 09:14:51 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-03-20 04:28:47 -0400
commitceb18132248d95b2c68e30c3df78e69175c4452f (patch)
tree8b6712a080bfa43a383e0e2fde7d62cc2108ca03 /drivers/base/firmware_loader/fallback_table.c
parent5d6d1ddd27301dc85b13b794262c8bcececf88f1 (diff)
firmware: enable run time change of forcing fallback loader
Currently one requires to test four kernel configurations to test the firmware API completely: 0) CONFIG_FW_LOADER=y 1) o CONFIG_FW_LOADER=y o CONFIG_FW_LOADER_USER_HELPER=y 2) o CONFIG_FW_LOADER=y o CONFIG_FW_LOADER_USER_HELPER=y o CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y 3) When CONFIG_FW_LOADER=m the built-in stuff is disabled, we have no current tests for this. We can reduce the requirements to three kernel configurations by making fw_config.force_sysfs_fallback a proc knob we flip on off. For kernels that disable CONFIG_IKCONFIG_PROC this can also enable one to inspect if CONFIG_FW_LOADER_USER_HELPER_FALLBACK was enabled at build time by checking the proc value at boot time. Acked-by: Kees Cook <keescook@chromium.org> Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base/firmware_loader/fallback_table.c')
-rw-r--r--drivers/base/firmware_loader/fallback_table.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/base/firmware_loader/fallback_table.c b/drivers/base/firmware_loader/fallback_table.c
index 981419044c7e..92365e053e30 100644
--- a/drivers/base/firmware_loader/fallback_table.c
+++ b/drivers/base/firmware_loader/fallback_table.c
@@ -19,6 +19,9 @@
19/* Module or buit-in */ 19/* Module or buit-in */
20#ifdef CONFIG_FW_LOADER_USER_HELPER 20#ifdef CONFIG_FW_LOADER_USER_HELPER
21 21
22static unsigned int zero;
23static unsigned int one = 1;
24
22struct firmware_fallback_config fw_fallback_config = { 25struct firmware_fallback_config fw_fallback_config = {
23 .force_sysfs_fallback = IS_ENABLED(CONFIG_FW_LOADER_USER_HELPER_FALLBACK), 26 .force_sysfs_fallback = IS_ENABLED(CONFIG_FW_LOADER_USER_HELPER_FALLBACK),
24 .loading_timeout = 60, 27 .loading_timeout = 60,
@@ -26,4 +29,18 @@ struct firmware_fallback_config fw_fallback_config = {
26}; 29};
27EXPORT_SYMBOL_GPL(fw_fallback_config); 30EXPORT_SYMBOL_GPL(fw_fallback_config);
28 31
32struct ctl_table firmware_config_table[] = {
33 {
34 .procname = "force_sysfs_fallback",
35 .data = &fw_fallback_config.force_sysfs_fallback,
36 .maxlen = sizeof(unsigned int),
37 .mode = 0644,
38 .proc_handler = proc_douintvec_minmax,
39 .extra1 = &zero,
40 .extra2 = &one,
41 },
42 { }
43};
44EXPORT_SYMBOL_GPL(firmware_config_table);
45
29#endif 46#endif