At Mon, 27 May 2013 18:30:03 +0800,
Ming Lei wrote:
>
> Generally there are only two drivers which don't need uevent to
> handle firmware loading, so don't cache these firmwares during
> suspend for these drivers since doing that may block firmware
> loading forever.
>
> Both the two drivers are involved in private firmware images, so
> they don't hit in direct loading too.
>
> Cc: Takashi Iwai <ti...@suse.de>
Reviewed-by: Takashi Iwai <ti...@suse.de>
> Signed-off-by: Ming Lei <ming....@canonical.com>
> ---
> drivers/base/firmware_class.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
> index e650c25..64e7870 100644
> --- a/drivers/base/firmware_class.c
> +++ b/drivers/base/firmware_class.c
> @@ -993,7 +993,8 @@ _request_firmware_prepare(struct firmware **firmware_p,
> const char *name,
> return 1; /* need to load */
> }
>
> -static int assign_firmware_buf(struct firmware *fw, struct device *device)
> +static int assign_firmware_buf(struct firmware *fw, struct device *device,
> + bool skip_cache)
> {
> struct firmware_buf *buf = fw->priv;
>
> @@ -1010,7 +1011,7 @@ static int assign_firmware_buf(struct firmware *fw,
> struct device *device)
> * device may has been deleted already, but the problem
> * should be fixed in devres or driver core.
> */
> - if (device)
> + if (device && !skip_cache)
> fw_add_devm_name(device, buf->fw_id);
>
> /*
> @@ -1066,8 +1067,10 @@ _request_firmware(const struct firmware **firmware_p,
> const char *name,
> if (!fw_get_filesystem_firmware(device, fw->priv))
> ret = fw_load_from_user_helper(fw, name, device,
> uevent, nowait, timeout);
> +
> + /* don't cache firmware handled without uevent */
> if (!ret)
> - ret = assign_firmware_buf(fw, device);
> + ret = assign_firmware_buf(fw, device, !uevent);
>
> usermodehelper_read_unlock();
>
> --
> 1.7.9.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
