Commit ffe53f6f authored by Ming Lei's avatar Ming Lei Committed by Greg Kroah-Hartman

firmware loader: use small timeout for cache device firmware

Because device_cache_fw_images only cache the firmware which has been
loaded sucessfully at leat once, using a small loading timeout should
be reasonable.
Signed-off-by: default avatarMing Lei <ming.lei@canonical.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 37276a51
...@@ -1146,10 +1146,22 @@ static void device_cache_fw_images(void) ...@@ -1146,10 +1146,22 @@ static void device_cache_fw_images(void)
{ {
struct firmware_cache *fwc = &fw_cache; struct firmware_cache *fwc = &fw_cache;
struct device *dev; struct device *dev;
int old_timeout;
DEFINE_WAIT(wait); DEFINE_WAIT(wait);
pr_debug("%s\n", __func__); pr_debug("%s\n", __func__);
/*
* 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;
device_pm_lock(); device_pm_lock();
list_for_each_entry(dev, &dpm_list, power.entry) list_for_each_entry(dev, &dpm_list, power.entry)
dev_cache_fw_image(dev); dev_cache_fw_image(dev);
...@@ -1171,6 +1183,8 @@ static void device_cache_fw_images(void) ...@@ -1171,6 +1183,8 @@ static void device_cache_fw_images(void)
} }
spin_unlock(&fwc->name_lock); spin_unlock(&fwc->name_lock);
finish_wait(&fwc->wait_queue, &wait); finish_wait(&fwc->wait_queue, &wait);
loading_timeout = old_timeout;
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment