From: Daniel Wagner <wagi@monom.org>
To: mcgrof@kernel.org, ming.lei@canonical.com,
akpm@linux-foundation.org, gregkh@linuxfoundation.org
Cc: daniel.wagner@bmw-carit.de, mmarek@suse.com,
linux-kernel@vger.kernel.org, markivx@codeaurora.org,
stephen.boyd@linaro.org, zohar@linux.vnet.ibm.com,
broonie@kernel.org, tiwai@suse.de, johannes@sipsolutions.net,
chunkeey@googlemail.com, hauke@hauke-m.de,
jwboyer@fedoraproject.org, dmitry.torokhov@gmail.com,
dwmw2@infradead.org, jslaby@suse.com,
torvalds@linux-foundation.org, luto@amacapital.net,
fengguang.wu@intel.com, rpurdie@rpsys.net,
j.anaszewski@samsung.com, Abhay_Salunke@dell.com,
Julia.Lawall@lip6.fr, Gilles.Muller@lip6.fr,
nicolas.palix@imag.fr, teg@jklm.no, dhowells@redhat.com,
bjorn.andersson@linaro.org, arend.vanspriel@broadcom.com,
kvalo@codeaurora.org
Subject: Re: [PATCH v3 5/5] firmware: fix fw cache to avoid usermode helper on suspend
Date: Wed, 31 Aug 2016 09:03:53 +0200 [thread overview]
Message-ID: <3927fffd-27ab-ad50-7bcf-631ecad6f163@monom.org> (raw)
In-Reply-To: <1471999507-913-6-git-send-email-mcgrof@kernel.org>
Hi Luis,
On 08/24/2016 02:45 AM, mcgrof@kernel.org 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
next prev parent reply other threads:[~2016-08-31 7:04 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-16 22:54 [PATCH v2 0/5] firmware: add SmPL grammar to avoid issues Luis R. Rodriguez
2016-06-16 22:54 ` [PATCH v2 1/5] MAINTAINERS: extend firmware_class maintainer list Luis R. Rodriguez
2016-06-16 22:54 ` [PATCH v2 2/5] firmware: annotate thou shalt not request fw on init or probe Luis R. Rodriguez
2016-08-24 6:55 ` Daniel Vetter
2016-08-24 20:39 ` Luis R. Rodriguez
2016-08-25 11:05 ` Daniel Vetter
2016-08-25 19:41 ` Luis R. Rodriguez
2016-08-25 20:10 ` Daniel Vetter
2016-08-25 20:25 ` Luis R. Rodriguez
2016-08-25 20:30 ` Dmitry Torokhov
2016-09-02 23:59 ` Luis R. Rodriguez
2016-09-03 0:20 ` [RFC] fs: add userspace critical mounts event support Luis R. Rodriguez
2016-09-03 4:11 ` Linus Torvalds
2016-09-03 4:20 ` Dmitry Torokhov
[not found] ` <CA+55aFz4q5peXAeY9h8o3he7R=wXrBSYkOjMM9TehOw=pPoS+Q@mail.gmail.com>
2016-09-03 17:49 ` Dmitry Torokhov
2016-09-03 18:01 ` Linus Torvalds
2016-09-03 18:10 ` Dmitry Torokhov
2016-09-06 21:52 ` Luis R. Rodriguez
2016-09-06 22:28 ` Bjorn Andersson
2016-09-06 23:14 ` Luis R. Rodriguez
2016-09-24 1:37 ` Herbert, Marc
2016-09-24 17:41 ` Dmitry Torokhov
2016-10-05 0:00 ` Luis R. Rodriguez
2016-10-05 0:12 ` Linus Torvalds
2016-10-05 0:24 ` Luis R. Rodriguez
2016-10-05 0:32 ` Linus Torvalds
2016-10-05 17:38 ` Luis R. Rodriguez
2016-10-05 1:48 ` Josh Triplett
2016-10-05 1:58 ` Linus Torvalds
2016-09-06 17:46 ` Bjorn Andersson
2016-09-06 18:32 ` Linus Torvalds
2016-09-06 21:11 ` Bjorn Andersson
2016-09-06 21:50 ` Linus Torvalds
2016-09-06 23:04 ` Luis R. Rodriguez
2016-09-24 2:51 ` Herbert, Marc
2016-10-04 23:28 ` Luis R. Rodriguez
2016-09-06 22:32 ` Luis R. Rodriguez
2016-09-14 2:38 ` Rob Landley
2016-10-05 18:00 ` Luis R. Rodriguez
2016-10-05 18:08 ` Linus Torvalds
2016-10-05 19:46 ` Luis R. Rodriguez
2016-11-08 22:47 ` Luis R. Rodriguez
2016-11-09 9:13 ` Daniel Wagner
2016-11-09 23:40 ` Luis R. Rodriguez
2016-11-15 9:28 ` Johannes Berg
2016-06-16 22:54 ` [PATCH v2 3/5] firmware: update usermode helper docs and add SmPL report Luis R. Rodriguez
2016-06-16 22:54 ` [PATCH v2 4/5] firmware: add usermode helper DECLARE_FW_LOADER_USER() annotation Luis R. Rodriguez
2016-06-16 22:54 ` [PATCH v2 5/5] firmware: fix fw cache to avoid usermode helper on suspend Luis R. Rodriguez
2016-07-07 0:56 ` [PATCH v2 0/5] firmware: add SmPL grammar to avoid issues Luis R. Rodriguez
2016-07-13 21:47 ` Luis R. Rodriguez
2016-07-28 0:41 ` Luis R. Rodriguez
2016-08-03 14:50 ` Luis R. Rodriguez
2016-08-03 15:04 ` Greg KH
2016-08-03 17:06 ` Luis R. Rodriguez
2016-08-03 19:32 ` Greg KH
2016-08-03 19:46 ` Luis R. Rodriguez
2016-07-13 23:52 ` Fengguang Wu
2016-07-14 2:15 ` Luis R. Rodriguez
2016-07-14 2:23 ` Fengguang Wu
2016-07-14 3:08 ` Luis R. Rodriguez
2016-07-14 3:35 ` Fengguang Wu
2016-08-24 0:45 ` [PATCH v3 " mcgrof
2016-08-24 0:45 ` [PATCH v3 1/5] MAINTAINERS: extend firmware_class maintainer list mcgrof
2016-08-24 0:45 ` [PATCH v3 2/5] firmware: annotate thou shalt not request fw on init or probe mcgrof
2016-08-24 8:17 ` Gabriel Paubert
2016-09-02 18:26 ` Luis R. Rodriguez
2016-08-24 0:45 ` [PATCH v3 3/5] firmware: update usermode helper docs and add SmPL report mcgrof
2016-08-24 0:45 ` [PATCH v3 4/5] firmware: add usermode helper DECLARE_FW_LOADER_USER() annotation mcgrof
2016-08-24 0:45 ` [PATCH v3 5/5] firmware: fix fw cache to avoid usermode helper on suspend mcgrof
2016-08-31 7:03 ` Daniel Wagner [this message]
2016-09-02 18:13 ` Luis R. Rodriguez
2016-09-07 0:42 ` [PATCH v4 0/5] firmware: add SmPL grammar to avoid issues Luis R. Rodriguez
2016-09-07 0:42 ` [PATCH v4 1/5] MAINTAINERS: extend firmware_class maintainer list Luis R. Rodriguez
2016-09-07 6:43 ` Greg KH
2016-09-08 14:58 ` Luis R. Rodriguez
2016-09-08 15:25 ` Ming Lei
2016-09-07 0:42 ` [PATCH v4 2/5] firmware: annotate thou shalt not request fw on init or probe Luis R. Rodriguez
2016-09-07 0:42 ` [PATCH v4 3/5] firmware: update usermode helper docs and add SmPL report Luis R. Rodriguez
2016-09-07 0:42 ` [PATCH v4 4/5] firmware: add usermode helper DECLARE_FW_LOADER_USER() annotation Luis R. Rodriguez
2016-09-07 0:42 ` [PATCH v4 5/5] firmware: fix fw cache to avoid usermode helper on suspend Luis R. Rodriguez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3927fffd-27ab-ad50-7bcf-631ecad6f163@monom.org \
--to=wagi@monom.org \
--cc=Abhay_Salunke@dell.com \
--cc=Gilles.Muller@lip6.fr \
--cc=Julia.Lawall@lip6.fr \
--cc=akpm@linux-foundation.org \
--cc=arend.vanspriel@broadcom.com \
--cc=bjorn.andersson@linaro.org \
--cc=broonie@kernel.org \
--cc=chunkeey@googlemail.com \
--cc=daniel.wagner@bmw-carit.de \
--cc=dhowells@redhat.com \
--cc=dmitry.torokhov@gmail.com \
--cc=dwmw2@infradead.org \
--cc=fengguang.wu@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=hauke@hauke-m.de \
--cc=j.anaszewski@samsung.com \
--cc=johannes@sipsolutions.net \
--cc=jslaby@suse.com \
--cc=jwboyer@fedoraproject.org \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=markivx@codeaurora.org \
--cc=mcgrof@kernel.org \
--cc=ming.lei@canonical.com \
--cc=mmarek@suse.com \
--cc=nicolas.palix@imag.fr \
--cc=rpurdie@rpsys.net \
--cc=stephen.boyd@linaro.org \
--cc=teg@jklm.no \
--cc=tiwai@suse.de \
--cc=torvalds@linux-foundation.org \
--cc=zohar@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).