Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

firmware_loader: make firmware_fallback_sysfs() print more useful

If we resort to using the sysfs fallback mechanism we don't print
the filename. This can be deceiving given we could have a series of
callers intertwined and it'd be unclear exactly for what firmware
this was meant for.

Additionally, although we don't currently use FW_OPT_NO_WARN when
dealing with the fallback mechanism, we will soon, so just respect
its use consistently.

And even if you *don't* want to print always on failure, you may
want to print when debugging so enable dynamic debug print when
FW_OPT_NO_WARN is used.

Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Luis R. Rodriguez and committed by
Greg Kroah-Hartman
27d5d7dc 06bfd3c8

+6 -1
+6 -1
drivers/base/firmware_loader/fallback.c
··· 690 690 if (!fw_run_sysfs_fallback(opt_flags)) 691 691 return ret; 692 692 693 - dev_warn(device, "Falling back to user helper\n"); 693 + if (!(opt_flags & FW_OPT_NO_WARN)) 694 + dev_warn(device, "Falling back to syfs fallback for: %s\n", 695 + name); 696 + else 697 + dev_dbg(device, "Falling back to sysfs fallback for: %s\n", 698 + name); 694 699 return fw_load_from_user_helper(fw, name, device, opt_flags); 695 700 }