Re: [PATCH 2/2] driver core: firmware loader: kill FW_ACTION_NOHOTPLUG requests before suspend
At Mon, 27 May 2013 18:30:04 +0800,
Ming Lei wrote:
>
> 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.
>
> Cc: Takashi Iwai
> Signed-off-by: Ming Lei
> ---
>
> This patch depends on Takashi Iwai's patch of "firmware: Avoid deadlock of
> usermodehelper lock at shutdown"
Reviewed-by: Takashi Iwai
thanks,
Takashi
>
> drivers/base/firmware_class.c | 17 +
> 1 file changed, 17 insertions(+)
>
> diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
> index 64e7870..5690e72 100644
> --- a/drivers/base/firmware_class.c
> +++ b/drivers/base/firmware_class.c
> @@ -128,6 +128,7 @@ struct firmware_buf {
> size_t size;
> #ifdef CONFIG_FW_LOADER_USER_HELPER
> bool is_paged_buf;
> + bool need_uevent;
> struct page **pages;
> int nr_pages;
> int page_array_size;
> @@ -873,6 +874,7 @@ static int _request_firmware_load(struct firmware_priv
> *fw_priv, bool uevent,
> }
>
> if (uevent) {
> + buf->need_uevent = true;
> dev_set_uevent_suppress(f_dev, false);
> dev_dbg(f_dev, "firmware: requesting %s\n", buf->fw_id);
> if (timeout != MAX_SCHEDULE_TIMEOUT)
> @@ -1407,6 +1409,20 @@ static void __device_uncache_fw_images(void)
> spin_unlock(>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(_lock);
> + list_for_each_entry_safe(buf, next, _fw_head, pending_list) {
> + if (!buf->need_uevent)
> + fw_load_abort(buf);
> + }
> + mutex_unlock(_lock);
> +}
> +
> /**
> * device_cache_fw_images - cache devices' firmware
> *
> @@ -1486,6 +1502,7 @@ static int fw_pm_notify(struct notifier_block
> *notify_block,
> switch (mode) {
> case PM_HIBERNATION_PREPARE:
> case PM_SUSPEND_PREPARE:
> + kill_requests_without_uevent();
> device_cache_fw_images();
> break;
>
> --
> 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/
Re: [PATCH 2/2] driver core: firmware loader: kill FW_ACTION_NOHOTPLUG requests before suspend
At Mon, 27 May 2013 18:30:04 +0800,
Ming Lei wrote:
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.
Cc: Takashi Iwai ti...@suse.de
Signed-off-by: Ming Lei ming@canonical.com
---
This patch depends on Takashi Iwai's patch of firmware: Avoid deadlock of
usermodehelper lock at shutdown
Reviewed-by: Takashi Iwai ti...@suse.de
thanks,
Takashi
drivers/base/firmware_class.c | 17 +
1 file changed, 17 insertions(+)
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 64e7870..5690e72 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -128,6 +128,7 @@ struct firmware_buf {
size_t size;
#ifdef CONFIG_FW_LOADER_USER_HELPER
bool is_paged_buf;
+ bool need_uevent;
struct page **pages;
int nr_pages;
int page_array_size;
@@ -873,6 +874,7 @@ static int _request_firmware_load(struct firmware_priv
*fw_priv, bool uevent,
}
if (uevent) {
+ buf-need_uevent = true;
dev_set_uevent_suppress(f_dev, false);
dev_dbg(f_dev, firmware: requesting %s\n, buf-fw_id);
if (timeout != MAX_SCHEDULE_TIMEOUT)
@@ -1407,6 +1409,20 @@ static void __device_uncache_fw_images(void)
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
*
@@ -1486,6 +1502,7 @@ static int fw_pm_notify(struct notifier_block
*notify_block,
switch (mode) {
case PM_HIBERNATION_PREPARE:
case PM_SUSPEND_PREPARE:
+ kill_requests_without_uevent();
device_cache_fw_images();
break;
--
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/
