On Wed, Jul 25, 2012 at 01:00:07AM +0800, Ming Lei wrote:
> This patches introduce two kernel APIs of cache_firmware and
> uncache_firmware, both of which take the firmware file name
> as the only parameter.
>
> So any drivers can call cache_firmware to cache the specified
> firmware file into kernel memory, and can use the cached firmware
> in situations which can't request firmware from user space.
>
> Signed-off-by: Ming Lei <ming....@canonical.com>
> ---
> drivers/base/firmware_class.c | 79
> +++++++++++++++++++++++++++++++++++++++++
> include/linux/firmware.h | 12 +++++++
> 2 files changed, 91 insertions(+)
>
> diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
> index 225898e..674cb11 100644
> --- a/drivers/base/firmware_class.c
> +++ b/drivers/base/firmware_class.c
> @@ -168,6 +168,22 @@ static int fw_lookup_and_alloate_buf(const char *fw_name,
> return tmp ? 0 : -1;
> }
>
> +static struct firmware_buf *fw_lookup_buf(const char *fw_name)
> +{
> + struct firmware_buf *tmp;
> + struct firmware_cache *fwc = &fw_cache;
> +
> + spin_lock(&fwc->lock);
> + list_for_each_entry(tmp, &fwc->head, list)
> + if (!strcmp(tmp->fw_id, fw_name)) {
> + spin_unlock(&fwc->lock);
> + return tmp;
> + }
> + spin_unlock(&fwc->lock);
> +
> + return NULL;
> +}
You have similar functionality in fw_lookup_and_alloate_buf() above.
Can't you reuse it instead of defining a new function?
> +
> static void __fw_free_buf(struct kref *ref)
> {
> struct firmware_buf *buf = to_fwbuf(ref);
> @@ -833,6 +849,67 @@ request_firmware_nowait(
> return 0;
> }
>
> +/**
> + * cache_firmware - cache one firmware image in kernel memory space
> + * @fw_name: the firmware image name
> + *
> + * Cache firmware in kernel memory so that drivers can use the firmware
s/the
firmware/it/
> + * when system isn't ready for drivers to request firmware image from
s/drivers/them/
> + * userspace. Once returns successfully, driver can use request_firmware*
it
> + * to get the cached firmware without any interacting with user space
s/user space/userspace/
> + *
> + * Return 0 if the firmware image has been cached successfully
> + * Return !0 if it is not successfully
Return !0 otherwise.
> + *
> + */
> +int cache_firmware(const char *fw_name)
> +{
> + int ret;
> + const struct firmware *fw;
> +
> + pr_debug("%s: %s\n", __func__, fw_name);
> +
> + ret = request_firmware(&fw, fw_name, NULL);
> +
stray newline
> + if (!ret)
> + kfree(fw);
> +
> + pr_debug("%s: %s ret=%d\n", __func__, fw_name, ret);
> +
> + return ret;
> +}
> +
> +/**
> + * uncache_firmware - remove one cached firmware image
> + *
stray newline
> + * @fw_name: the firmware image name
> + *
> + * Uncache one firmware image which has been cached successfully
> + * before.
> + *
> + * Return 0 if the firmware cache has been removed successfully
> + * Return !0 if it is not successfully
Return !0 otherwise
> + *
> + */
> +int uncache_firmware(const char *fw_name)
> +{
> + struct firmware_buf *buf;
> + struct firmware fw;
> +
> + pr_debug("%s: %s\n", __func__, fw_name);
> +
> + if (fw_get_builtin_firmware(&fw, fw_name))
> + return 0;
> +
> + buf = fw_lookup_buf(fw_name);
> + if (buf) {
> + fw_free_buf(buf);
> + return 0;
> + }
> +
> + return -EINVAL;
[ … ]
Thanks.
--
Regards/Gruss,
Boris.
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
GM: Alberto Bozzo
Reg: Dornach, Landkreis Muenchen
HRB Nr. 43632 WEEE Registernr: 129 19551
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
