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

driver core: firmware loader: kill FW_ACTION_NOHOTPLUG requests before suspend

This patch kills the firmware loading requests of FW_ACTION_NOHOTPLUG
before suspend to avoid blocking suspend because there is no timeout
for these requests.
Signed-off-by: default avatarMing Lei <ming.lei@canonical.com>
Reviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e771d1aa
...@@ -128,6 +128,7 @@ struct firmware_buf { ...@@ -128,6 +128,7 @@ struct firmware_buf {
size_t size; size_t size;
#ifdef CONFIG_FW_LOADER_USER_HELPER #ifdef CONFIG_FW_LOADER_USER_HELPER
bool is_paged_buf; bool is_paged_buf;
bool need_uevent;
struct page **pages; struct page **pages;
int nr_pages; int nr_pages;
int page_array_size; int page_array_size;
...@@ -873,6 +874,7 @@ static int _request_firmware_load(struct firmware_priv *fw_priv, bool uevent, ...@@ -873,6 +874,7 @@ static int _request_firmware_load(struct firmware_priv *fw_priv, bool uevent,
} }
if (uevent) { if (uevent) {
buf->need_uevent = true;
dev_set_uevent_suppress(f_dev, false); dev_set_uevent_suppress(f_dev, false);
dev_dbg(f_dev, "firmware: requesting %s\n", buf->fw_id); dev_dbg(f_dev, "firmware: requesting %s\n", buf->fw_id);
if (timeout != MAX_SCHEDULE_TIMEOUT) if (timeout != MAX_SCHEDULE_TIMEOUT)
...@@ -1412,6 +1414,20 @@ static void __device_uncache_fw_images(void) ...@@ -1412,6 +1414,20 @@ static void __device_uncache_fw_images(void)
spin_unlock(&fwc->name_lock); spin_unlock(&fwc->name_lock);
} }
/* kill pending requests without uevent to avoid blocking suspend */
static void kill_requests_without_uevent(void)
{
struct firmware_buf *buf;
struct firmware_buf *next;
mutex_lock(&fw_lock);
list_for_each_entry_safe(buf, next, &pending_fw_head, pending_list) {
if (!buf->need_uevent)
fw_load_abort(buf);
}
mutex_unlock(&fw_lock);
}
/** /**
* device_cache_fw_images - cache devices' firmware * device_cache_fw_images - cache devices' firmware
* *
...@@ -1491,6 +1507,7 @@ static int fw_pm_notify(struct notifier_block *notify_block, ...@@ -1491,6 +1507,7 @@ static int fw_pm_notify(struct notifier_block *notify_block,
switch (mode) { switch (mode) {
case PM_HIBERNATION_PREPARE: case PM_HIBERNATION_PREPARE:
case PM_SUSPEND_PREPARE: case PM_SUSPEND_PREPARE:
kill_requests_without_uevent();
device_cache_fw_images(); device_cache_fw_images();
break; break;
......
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