Re: [PATCH v3 5/5] firmware: fix fw cache to avoid usermode helper on suspend

[Daniel Wagner]

Hi Luis,

On 08/24/2016 02:45 AM, mcgrof@xxxxxxxxxx wrote:
> diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
> index 22d1760a4278..dca4f9cbf4db 100644
> --- a/drivers/base/firmware_class.c
> +++ b/drivers/base/firmware_class.c
> @@ -1412,7 +1412,7 @@ static int cache_firmware(const char *fw_name)
>
>  	pr_debug("%s: %s\n", __func__, fw_name);
>
> -	ret = request_firmware(&fw, fw_name, NULL);
> +	ret = request_firmware_direct(&fw, fw_name, NULL);
>  	if (!ret)
>  		kfree(fw);

While you are at it you should kill this here as well:

@@ -1622,7 +1637,6 @@ static void __device_uncache_fw_images(void)
 static void device_cache_fw_images(void)
 {
 	struct firmware_cache *fwc = &fw_cache;
-	int old_timeout;
 	DEFINE_WAIT(wait);

 	pr_debug("%s\n", __func__);
@@ -1630,17 +1644,6 @@ static void device_cache_fw_images(void)
 	/* cancel uncache work */
 	cancel_delayed_work_sync(&fwc->work);

-	/*
-	 * use small loading timeout for caching devices' firmware
-	 * because all these firmware images have been loaded
-	 * successfully at lease once, also system is ready for
-	 * completing firmware loading now. The maximum size of
-	 * firmware in current distributions is about 2M bytes,
-	 * so 10 secs should be enough.
-	 */
-	old_timeout = loading_timeout;
-	loading_timeout = 10;
-
 	mutex_lock(&fw_lock);
 	fwc->state = FW_LOADER_START_CACHE;
 	dpm_for_each_dev(NULL, dev_cache_fw_image);
@@ -1648,8 +1651,6 @@ static void device_cache_fw_images(void)

 	/* wait for completion of caching firmware for all devices */
 	async_synchronize_full_domain(&fw_cache_domain);
-
-	loading_timeout = old_timeout;
 }

cheers,
daniel