From: "Kweh, Hock Leong" <hock.leong.kweh@intel.com>
To: Ming Lei <ming.lei@canonical.com>,
Matt Fleming <matt@console-pimps.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Ong Boon Leong <boon.leong.ong@intel.com>,
"Kweh, Hock Leong" <hock.leong.kweh@intel.com>,
LKML <linux-kernel@vger.kernel.org>,
linux-efi@vger.kernel.org,
Sam Protsenko <semen.protsenko@linaro.org>,
Peter Jones <pjones@redhat.com>,
Andy Lutomirski <luto@amacapital.net>,
Roy Franz <roy.franz@linaro.org>, Borislav Petkov <bp@alien8.de>
Subject: [PATCH v4 1/2] firmware_loader: introduce new API - request_firmware_direct_full_path()
Date: Tue, 14 Apr 2015 17:44:55 +0800 [thread overview]
Message-ID: <1429004697-28320-2-git-send-email-hock.leong.kweh@intel.com> (raw)
In-Reply-To: <1429004697-28320-1-git-send-email-hock.leong.kweh@intel.com>
From: "Kweh, Hock Leong" <hock.leong.kweh@intel.com>
Introduce this new API for loading firmware from a specific location
instead of /lib/firmware/ by providing a full path to the firmware
file.
Cc: Ming Lei <ming.lei@canonical.com>
Cc: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: Kweh, Hock Leong <hock.leong.kweh@intel.com>
---
drivers/base/firmware_class.c | 46 ++++++++++++++++++++++++++++++++++++-----
include/linux/firmware.h | 9 ++++++++
2 files changed, 50 insertions(+), 5 deletions(-)
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 171841a..3ab7bb9 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -111,6 +111,7 @@ static inline long firmware_loading_timeout(void)
#define FW_OPT_FALLBACK 0
#endif
#define FW_OPT_NO_WARN (1U << 3)
+#define FW_OPT_FULL_PATH (1U << 4)
struct firmware_cache {
/* firmware_buf instance will be added into the below list */
@@ -318,20 +319,29 @@ fail:
}
static int fw_get_filesystem_firmware(struct device *device,
- struct firmware_buf *buf)
+ struct firmware_buf *buf,
+ unsigned int opt_flags)
{
int i;
int rc = -ENOENT;
char *path = __getname();
+ int path_array_size = 1;
+ static const char * const root_path[] = {"/"};
+ char **temp_path = (char **)root_path;
- for (i = 0; i < ARRAY_SIZE(fw_path); i++) {
+ if (!(opt_flags & FW_OPT_FULL_PATH)) {
+ temp_path = (char **)fw_path;
+ path_array_size = ARRAY_SIZE(fw_path);
+ }
+
+ for (i = 0; i < path_array_size; i++) {
struct file *file;
/* skip the unset customized path */
- if (!fw_path[i][0])
+ if (!temp_path[i][0])
continue;
- snprintf(path, PATH_MAX, "%s/%s", fw_path[i], buf->fw_id);
+ snprintf(path, PATH_MAX, "%s/%s", temp_path[i], buf->fw_id);
file = filp_open(path, O_RDONLY, 0);
if (IS_ERR(file))
@@ -1122,7 +1132,7 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
}
}
- ret = fw_get_filesystem_firmware(device, fw->priv);
+ ret = fw_get_filesystem_firmware(device, fw->priv, opt_flags);
if (ret) {
if (!(opt_flags & FW_OPT_NO_WARN))
dev_warn(device,
@@ -1210,6 +1220,32 @@ int request_firmware_direct(const struct firmware **firmware_p,
EXPORT_SYMBOL_GPL(request_firmware_direct);
/**
+ * request_firmware_direct_full_path: - load firmware directly from exact
+ * full path
+ * @firmware_p: pointer to firmware image
+ * @name: full path to the firmware file with file name
+ * @device: device for which firmware is being loaded
+ *
+ * This function works like request_firmware_direct(), but this doesn't
+ * search the /lib/firmware/ for the firmware file. It support exact full
+ * path to the firmware file for loading.
+ **/
+int request_firmware_direct_full_path(const struct firmware **firmware_p,
+ const char *name, struct device *device)
+{
+ int ret;
+
+ __module_get(THIS_MODULE);
+ ret = _request_firmware(firmware_p, name, device,
+ FW_OPT_UEVENT | FW_OPT_NO_WARN |
+ FW_OPT_FULL_PATH);
+ module_put(THIS_MODULE);
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(request_firmware_direct_full_path);
+
+/**
* release_firmware: - release the resource associated with a firmware image
* @fw: firmware resource to release
**/
diff --git a/include/linux/firmware.h b/include/linux/firmware.h
index 5c41c5e..b7c6435 100644
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h
@@ -47,6 +47,8 @@ int request_firmware_nowait(
void (*cont)(const struct firmware *fw, void *context));
int request_firmware_direct(const struct firmware **fw, const char *name,
struct device *device);
+int request_firmware_direct_full_path(const struct firmware **fw,
+ const char *name, struct device *device);
void release_firmware(const struct firmware *fw);
#else
@@ -75,5 +77,12 @@ static inline int request_firmware_direct(const struct firmware **fw,
return -EINVAL;
}
+static inline int request_firmware_direct_full_path(const struct firmware **fw,
+ const char *name,
+ struct device *device)
+{
+ return -EINVAL;
+}
+
#endif
#endif
--
1.7.9.5
next prev parent reply other threads:[~2015-04-14 1:45 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-14 9:44 [PATCH v4 0/2] Enable capsule loader interface for efi firmware updating Kweh, Hock Leong
2015-04-14 9:44 ` Kweh, Hock Leong [this message]
2015-04-14 14:08 ` [PATCH v4 1/2] firmware_loader: introduce new API - request_firmware_direct_full_path() Greg Kroah-Hartman
2015-04-14 15:56 ` Andy Lutomirski
2015-04-14 16:18 ` Borislav Petkov
2015-04-15 10:14 ` Matt Fleming
2015-04-15 10:18 ` Borislav Petkov
2015-04-15 11:09 ` Matt Fleming
2015-04-15 13:15 ` Greg Kroah-Hartman
2015-04-15 15:53 ` Andy Lutomirski
2015-04-15 12:48 ` Matt Fleming
2015-04-14 9:44 ` [PATCH v4 2/2] efi: an sysfs interface for user to update efi firmware Kweh, Hock Leong
2015-04-14 14:09 ` Greg Kroah-Hartman
2015-04-14 15:52 ` Andy Lutomirski
2015-04-15 13:20 ` Greg Kroah-Hartman
2015-04-15 15:45 ` Andy Lutomirski
2015-04-16 0:19 ` Roy Franz
2015-04-17 13:50 ` Greg KH
2015-04-15 11:32 ` Kweh, Hock Leong
2015-04-15 13:19 ` Greg Kroah-Hartman
2015-04-16 9:42 ` Kweh, Hock Leong
2015-04-17 13:49 ` Greg Kroah-Hartman
2015-04-17 14:36 ` Matt Fleming
2015-04-20 3:28 ` Kweh, Hock Leong
2015-04-20 14:43 ` Greg Kroah-Hartman
2015-04-21 3:23 ` Kweh, Hock Leong
2015-04-21 7:56 ` Greg Kroah-Hartman
2015-04-22 1:21 ` James Bottomley
2015-04-22 1:58 ` Andy Lutomirski
2015-04-22 2:20 ` James Bottomley
2015-04-22 3:24 ` Andy Lutomirski
2015-04-22 4:51 ` James Bottomley
2015-04-22 16:50 ` Andy Lutomirski
2015-04-22 17:34 ` James Bottomley
2015-04-22 17:45 ` Andy Lutomirski
2015-04-22 13:27 ` Peter Jones
2015-04-22 15:18 ` James Bottomley
2015-04-22 15:24 ` One Thousand Gnomes
2015-04-23 8:30 ` Kweh, Hock Leong
2015-04-23 14:09 ` James Bottomley
2015-04-24 2:14 ` Kweh, Hock Leong
2015-04-24 15:16 ` James Bottomley
2015-04-27 21:59 ` Andy Lutomirski
2015-04-27 22:35 ` James Bottomley
2015-04-27 22:40 ` Andy Lutomirski
2015-04-27 22:51 ` James Bottomley
2015-04-29 11:23 ` Kweh, Hock Leong
2015-04-29 18:40 ` Andy Lutomirski
2015-04-29 21:37 ` James Bottomley
2015-04-30 9:17 ` Kweh, Hock Leong
2015-04-30 17:55 ` Andy Lutomirski
2015-04-29 21:35 ` James Bottomley
2015-04-29 21:36 ` Andy Lutomirski
2015-04-29 21:39 ` James Bottomley
2015-04-29 21:42 ` Andy Lutomirski
2015-04-20 17:59 ` James Bottomley
2015-04-22 15:35 ` James Bottomley
2015-04-22 15:46 ` Greg Kroah-Hartman
2015-04-22 16:11 ` James Bottomley
2015-04-23 9:50 ` Greg Kroah-Hartman
2015-04-23 16:14 ` James Bottomley
2015-04-23 20:38 ` Greg Kroah-Hartman
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=1429004697-28320-2-git-send-email-hock.leong.kweh@intel.com \
--to=hock.leong.kweh@intel.com \
--cc=boon.leong.ong@intel.com \
--cc=bp@alien8.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=matt@console-pimps.org \
--cc=ming.lei@canonical.com \
--cc=pjones@redhat.com \
--cc=roy.franz@linaro.org \
--cc=semen.protsenko@linaro.org \
/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).