From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932338Ab3E0MYn (ORCPT ); Mon, 27 May 2013 08:24:43 -0400 Received: from cantor2.suse.de ([195.135.220.15]:56627 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932316Ab3E0MYm (ORCPT ); Mon, 27 May 2013 08:24:42 -0400 Date: Mon, 27 May 2013 14:24:59 +0200 Message-ID: From: Takashi Iwai To: Ming Lei Cc: Greg Kroah-Hartman , linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/2] driver core: firmware loader: kill FW_ACTION_NOHOTPLUG requests before suspend In-Reply-To: <1369650604-27941-3-git-send-email-ming.lei@canonical.com> References: <1369650604-27941-1-git-send-email-ming.lei@canonical.com> <1369650604-27941-3-git-send-email-ming.lei@canonical.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.2 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(&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 >