[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20160122201009.GX20964@wotan.suse.de>
Date: Fri, 22 Jan 2016 21:10:09 +0100
From: "Luis R. Rodriguez" <mcgrof@...e.com>
To: Kees Cook <keescook@...omium.org>,
Mimi Zohar <zohar@...ux.vnet.ibm.com>
Cc: "Luis R. Rodriguez" <mcgrof@...not-panic.com>,
Greg KH <gregkh@...uxfoundation.org>,
Ming Lei <ming.lei@...onical.com>,
Josh Boyer <jwboyer@...oraproject.org>,
Johannes Berg <johannes@...solutions.net>,
Andy Lutomirski <luto@...capital.net>,
Jonathan Corbet <corbet@....net>,
David Woodhouse <dwmw2@...radead.org>,
David Howells <dhowells@...hat.com>,
Seth Forshee <seth.forshee@...onical.com>,
Rusty Russell <rusty@...tcorp.com.au>,
Michal Marek <mmarek@...e.cz>,
Matthew Garrett <mjg59@...f.ucam.org>,
Kyle McMartin <kyle@...nel.org>,
Mimi Zohar <zohar@...ux.vnet.ibm.com>,
Dmitry Kasatkin <dmitry.kasatkin@...il.com>,
Vivek Goyal <vgoyal@...hat.com>,
Brian Norris <computersforpeace@...il.com>,
Shuah Khan <shuahkh@....samsung.com>,
Linus Torvalds <torvalds@...ux-foundation.org>,
linux-security-module <linux-security-module@...r.kernel.org>,
keyrings@...ux-nfs.org, LKML <linux-kernel@...r.kernel.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Casey Schaufler <casey@...aufler-ca.com>,
Takashi Iwai <tiwai@...e.de>,
Vojtěch Pavlík <vojtech@...e.cz>
Subject: Re: [PATCH v3 1/5] firmware: generalize "firmware" as "system data"
helpers
On Mon, Jan 04, 2016 at 12:41:07PM -0800, Kees Cook wrote:
> On Wed, Dec 23, 2015 at 1:34 PM, Luis R. Rodriguez
> <mcgrof@...not-panic.com> wrote:
> > From: "Luis R. Rodriguez" <mcgrof@...e.com>
> >
> > Historically firmware_class code was added to help
> > get device driver firmware binaries but these days
> > request_firmware*() helpers are being repurposed for
> > general system data needed by the kernel.
> >
> > Annotate this before we extend firmare_class more,
> > as this is expected. We want to generalize the code
> > as much as possible.
> >
> > Cc: Rusty Russell <rusty@...tcorp.com.au>
> > Cc: Andrew Morton <akpm@...ux-foundation.org>
> > Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
> > Cc: David Howells <dhowells@...hat.com>
> > Cc: Kees Cook <keescook@...omium.org>
> > Cc: Casey Schaufler <casey@...aufler-ca.com>
> > Cc: Ming Lei <ming.lei@...onical.com>
> > Cc: Takashi Iwai <tiwai@...e.de>
> > Cc: Vojtěch Pavlík <vojtech@...e.cz>
> > Cc: Kyle McMartin <kyle@...nel.org>
> > Cc: Matthew Garrett <mjg59@...f.ucam.org>
> > Cc: linux-kernel@...r.kernel.org
> > Signed-off-by: Luis R. Rodriguez <mcgrof@...e.com>
> > ---
> > drivers/base/firmware_class.c | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
> > index 8524450e75bd..6f5fcda71a60 100644
> > --- a/drivers/base/firmware_class.c
> > +++ b/drivers/base/firmware_class.c
> > @@ -353,15 +353,15 @@ static int fw_get_filesystem_firmware(struct device *device,
> > rc = fw_read_file_contents(file, buf);
> > fput(file);
> > if (rc)
> > - dev_warn(device, "firmware, attempted to load %s, but failed with error %d\n",
> > - path, rc);
> > + dev_warn(device, "system data, attempted to load %s, but failed with error %d\n",
> > + path, rc);
>
> Since dev_warn should already be prefixing the string, I would think
> "firmware, " should just be removed entirely instead of replaced?
Its a good point, the messages could also be simplified further. Here's
a more generic form and patch description that I'll wrap into a v4
iteration after Mimi's patches go in.
[PATCH] firmware: simplify generic "firmware" helpers
Historically firmware_class code was added to help
get device driver firmware binaries but these days
request_firmware*() helpers are being repurposed for
general system data needed by the kernel.
To make the generic set of routines that will be shared
with generic system data helpers simplify a few of
the shared debug and warn print outs, the prints already
have the device associated as dev_*() helpers are used.
This will help generalize shared code as much as possible.
Cc: Rusty Russell <rusty@...tcorp.com.au>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: David Howells <dhowells@...hat.com>
Cc: Kees Cook <keescook@...omium.org>
Cc: Casey Schaufler <casey@...aufler-ca.com>
Cc: Ming Lei <ming.lei@...onical.com>
Cc: Takashi Iwai <tiwai@...e.de>
Cc: Vojtěch Pavlík <vojtech@...e.cz>
Cc: Kyle McMartin <kyle@...nel.org>
Cc: Matthew Garrett <mjg59@...f.ucam.org>
Cc: linux-kernel@...r.kernel.org
Signed-off-by: Luis R. Rodriguez <mcgrof@...e.com>
---
drivers/base/firmware_class.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 8524450e75bd..3358f5df926f 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -353,15 +353,15 @@ static int fw_get_filesystem_firmware(struct device *device,
rc = fw_read_file_contents(file, buf);
fput(file);
if (rc)
- dev_warn(device, "firmware, attempted to load %s, but failed with error %d\n",
- path, rc);
+ dev_warn(device, "loading %s failed with error %d\n",
+ path, rc);
else
break;
}
__putname(path);
if (!rc) {
- dev_dbg(device, "firmware: direct-loading firmware %s\n",
+ dev_dbg(device, "direct-loading %s\n",
buf->fw_id);
mutex_lock(&fw_lock);
set_bit(FW_STATUS_DONE, &buf->status);
@@ -1051,7 +1051,7 @@ _request_firmware_prepare(struct firmware **firmware_p, const char *name,
}
if (fw_get_builtin_firmware(firmware, name)) {
- dev_dbg(device, "firmware: using built-in firmware %s\n", name);
+ dev_dbg(device, "using built-in %s\n", name);
return 0; /* assigned */
}
--
2.7.0
Powered by blists - more mailing lists