kernel/drivers/base/firmware_class.c, branch linux-4.16.y

firmware: fix checking for return values for fw_add_devm_name()

2018-05-30T06:17:31Z

[ Upstream commit d15d7311550983be97dca44ad68cbc2ca001297b ] Currently fw_add_devm_name() returns 1 if the firmware cache was already set. This makes it complicated for us to check for correctness. It is actually non-fatal if the firmware cache is already setup, so just return 0, and simplify the checkers. fw_add_devm_name() adds device's name onto the devres for the device so that prior to suspend we cache the firmware onto memory, so that on resume the firmware is reliably available. We never were checking for success for this call though, meaning in some really rare cases we my have never setup the firmware cache for a device, which could in turn make resume fail. This is all theoretical, no known issues have been reported. This small issue has been present way since the addition of the devres firmware cache names on v3.7. Fixes: f531f05ae9437 ("firmware loader: store firmware name into devres list") Signed-off-by: Luis R. Rodriguez Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman

driver core: add SPDX identifiers to all driver core files

2017-12-07T17:36:43Z

It's good to have SPDX identifiers in all files to make it easier to audit the kernel tree for correct licenses. Update the driver core files files with the correct SPDX license identifier based on the license text in the file itself. The SPDX identifier is a legally binding shorthand, which can be used instead of the full boiler plate text. This work is based on a script and data from Thomas Gleixner, Philippe Ombredanne, and Kate Stewart. Cc: Johannes Berg Cc: "Luis R. Rodriguez" Cc: William Breathitt Gray Cc: Thomas Gleixner Cc: Kate Stewart Cc: Philippe Ombredanne Signed-off-by: Greg Kroah-Hartman

firmware: replace #ifdef over FW_OPT_FALLBACK with function checks

2017-11-29T10:18:43Z

Its not easy to follow the logic behind making FW_OPT_FALLBACK map to an existing flag only if a kernel configuration option was set. Its much easier to retpresent what was intended with function helpers which make it clear that if CONFIG_FW_LOADER_USER_HELPER_FALLBACK is set we force running the fallback mechanism unless a caller specifically never wants to run it, such as request_firmware_direct(). Prior and after this change we upkeep the tradition: CONFIG_FW_LOADER_USER_HELPER_FALLBACK request_firmware() force fallback request_firmware_into_buf() force fallback request_firmware_nowait() force fallback request_firmware_direct() always ignore fallback !CONFIG_FW_LOADER_USER_HELPER_FALLBACK request_firmware() ignore fallback request_firmware_into_buf() ignore fallback request_firmware_nowait() depends on uevent flag request_firmware_direct() always ignore fallback Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman

firmware: provide helper for FW_OPT_USERHELPER

2017-11-29T10:18:43Z

The macro FW_OPT_USERHELPER is only currently defined when CONFIG_FW_LOADER_USER_HELPER is set. This is handled via an ifdef around CONFIG_FW_LOADER_USER_HELPER. This makes reading and understanding use FW_OPT_USERHELPER a bit convoluted. Instead wrap the functionality implemented behind CONFIG_FW_LOADER_USER_HELPER as we typically do in the kernel. Now when CONFIG_FW_LOADER_USER_HELPER is *not set*, then simply the helper fw_sysfs_fallback() will not do anything. Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman

firmware: add helper to copy built-in data to pre-alloc buffer

2017-11-29T10:18:43Z

This makes it clearer that the parameters passed are only used for the preallocated buffer option, ie, when a caller uses: request_firmware_into_buf() Otherwise this code won't run. We flip the logic just so the actual prellocated buf code is not indented. Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman

firmware: use static inline for to_fw_priv()

2017-11-29T10:18:43Z

This lets us type check the callers. Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman

firmware: rename sysfs state checks with sysfs prefix

2017-11-29T10:18:43Z

Doing this makes it clearer the states are only to be used in the context of the sysfs fallback loading interface. Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman

firmware: use static inlines for state machine checking

2017-11-29T10:18:43Z

This will allow us to do proper typechecking on users both of values passed and return types expected. While at it, change the parameter passed to be the struct fw_priv, so we can move around the state machine variable as we see fit with these helpers. Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman

firmware: remove unused __fw_state_is_done()

2017-11-29T10:10:50Z

After commit e44565f62a ("firmware: fix batched requests - wake all waiters") where we moved away from swait to old wait with a completion we also stopped using __fw_state_is_done(). Since this is longer used kill it. Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman

firmware: remove duplicate fw_state_aborted()

2017-11-29T10:10:50Z

The macro is defined twice without need. Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman