Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757691AbaGAJWM (ORCPT ); Tue, 1 Jul 2014 05:22:12 -0400 Received: from cantor2.suse.de ([195.135.220.15]:58754 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753637AbaGAJWK (ORCPT ); Tue, 1 Jul 2014 05:22:10 -0400 Date: Tue, 01 Jul 2014 11:22:07 +0200 Message-ID: From: Takashi Iwai To: Ming Lei Cc: "Luis R. Rodriguez" , Greg Kroah-Hartman , Linux Kernel Mailing List , "Luis R. Rodriguez" , Tom Gundersen , Abhay Salunke , Stefan Roese , Arnd Bergmann , Kay Sievers Subject: Re: [PATCH] firmware loader: inform direct failure when udev loader is disabled In-Reply-To: References: <1404171017-28064-1-git-send-email-mcgrof@do-not-panic.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.3 (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 Tue, 1 Jul 2014 11:54:24 +0800, Ming Lei wrote: > > On Tue, Jul 1, 2014 at 7:30 AM, Luis R. Rodriguez > wrote: > > From: "Luis R. Rodriguez" > > > > Now that the udev firmware loader is optional request_firmware() > > will not provide any information on the kernel ring buffer if > > direct firmware loading failed and udev firmware loading is disabled. > > If no information is needed request_firmware_direct() should be used > > for optional firmware, at which point drivers can take on the onus > > over informing of any failures, if udev firmware loading is disabled > > though we should at the very least provide some sort of information > > as when the udev loader was enabled by default back in the days. > > > > With this change with a simple firmware load test module [0]: > > > > Example output without FW_LOADER_USER_HELPER_FALLBACK > > > > platform fake-dev.0: Direct firmware load for fake.bin failed with error -2 > > > > Example without FW_LOADER_USER_HELPER_FALLBACK > > > > platform fake-dev.0: Direct firmware load for fake.bin failed with error -2 > > platform fake-dev.0: Falling back to user helper > > > > Without this change without FW_LOADER_USER_HELPER_FALLBACK we get no output > > logged upon failure. > > > > [0] https://github.com/mcgrof/fake-firmware-test.git > > > > Cc: Tom Gundersen > > Cc: Ming Lei > > Cc: Greg Kroah-Hartman > > Cc: Abhay Salunke > > Cc: Stefan Roese > > Cc: Arnd Bergmann > > Cc: Kay Sievers > > Cc: Takashi Iwai > > Signed-off-by: Luis R. Rodriguez > > --- > > > > drivers/base/firmware_class.c | 12 ++++++++---- > > 1 file changed, 8 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c > > index 46ea5f4..23274d8 100644 > > --- a/drivers/base/firmware_class.c > > +++ b/drivers/base/firmware_class.c > > @@ -101,8 +101,10 @@ static inline long firmware_loading_timeout(void) > > #define FW_OPT_NOWAIT (1U << 1) > > #ifdef CONFIG_FW_LOADER_USER_HELPER > > #define FW_OPT_USERHELPER (1U << 2) > > +#define FW_OPT_FAIL_WARN 0 > > #else > > #define FW_OPT_USERHELPER 0 > > +#define FW_OPT_FAIL_WARN (1U << 3) > > #endif > > #ifdef CONFIG_FW_LOADER_USER_HELPER_FALLBACK > > #define FW_OPT_FALLBACK FW_OPT_USERHELPER > > @@ -1116,10 +1118,11 @@ _request_firmware(const struct firmware **firmware_p, const char *name, > > > > ret = fw_get_filesystem_firmware(device, fw->priv); > > if (ret) { > > - if (opt_flags & FW_OPT_USERHELPER) { > > + if (opt_flags & (FW_OPT_FAIL_WARN | FW_OPT_USERHELPER)) > > dev_warn(device, > > - "Direct firmware load failed with error %d\n", > > - ret); > > + "Direct firmware load for %s failed with error %d\n", > > + name, ret); > > Maybe the warning can be always printed out since > (FW_OPT_FAIL_WARN | FW_OPT_USERHELPER) should be > always true. Yes, it'd be simpler. Let's reduce lines! :) Takashi -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/