From patchwork Tue Feb 21 09:47:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 9584179 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 19878600C1 for ; Tue, 21 Feb 2017 09:48:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 01C95285D1 for ; Tue, 21 Feb 2017 09:48:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA222288E4; Tue, 21 Feb 2017 09:48:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E6BE4288E0 for ; Tue, 21 Feb 2017 09:48:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751665AbdBUJsH (ORCPT ); Tue, 21 Feb 2017 04:48:07 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:33524 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751069AbdBUJsE (ORCPT ); Tue, 21 Feb 2017 04:48:04 -0500 Received: by mail-lf0-f65.google.com with SMTP id 86so4405400lfv.0; Tue, 21 Feb 2017 01:48:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ljmed4Qncz1zVh/YQqDaviNpTZNLPg0zqpM8Up+4Zvw=; b=TwMatYVD4wNuai0WoKsqTa+QBkVoNaxhqegpEJUyt1upRbDo9DDDqqfT2acNbgikFq t5ZVziYoSO5OGWn/TLtvGNQRCHg/qEkH29OIZK2KnzUmNFSd7SPQ7futuPtBZ5exoki6 3QhWOXQrfdMG7hGKJ2dG3kRCuqhP4JK1V9M/YDH8FOifBhaoaCV6tq84i3wxtWETwX+r Th2H3GLEudatVJlyN/A+VeaYjnDfppjg7tXusEfANd9SRDySMvV6np6dN53VmU2I5I9e /JX9lVcyTIH1w7Lnv+DTn/WiycawuECCTNxLJrIjwtnLe/xco00Tc/UYOsfOQulmQVJz H3+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ljmed4Qncz1zVh/YQqDaviNpTZNLPg0zqpM8Up+4Zvw=; b=kKVI62+XyofAXxO+JkrPCIFnG7O+qnicvt7jcp4QjrB1AElKGy8k18luKQrvRNkOML L1Wwhn39A/3rvwJHcBVjWuTeZ/v+Rayqp2iSLnq/VRmEifA5E47Bsw5cf7+xJ+q9Ek12 Tp+QnoVfRMw5qG2XMFzdYP7xX1ePSdfxHwZf2b2Hr2E6H2QUVKVFq9fl5D4/XoFjPQip 5CvXtSDmYYjyhs1rQnMTlOeAqri3lhjys98xYXmSWSSTPEp24n5899FQ0/xZKtcbKRKc k5pBqWMjtQvY1H2RuG0R6KYixNDwGffmy3cMJiFXoljlexoVzUboMX3axlOaKtsHTo/6 3N1Q== X-Gm-Message-State: AMke39krBr0sTUwvDurys59c4hRr4iG1gEqi7bX7P6lguD7WqyF+7Ex11wSbjA3ymJ02Ew== X-Received: by 10.25.17.224 with SMTP id 93mr2771008lfr.39.1487670482551; Tue, 21 Feb 2017 01:48:02 -0800 (PST) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id x28sm5923017ljd.60.2017.02.21.01.48.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Feb 2017 01:48:01 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Ming Lei , "Luis R . Rodriguez" , Greg KH , Linux Kernel Mailing List Cc: Kalle Valo , Arend van Spriel , linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH V3 1/2] firmware: add more flexible request_firmware_async function Date: Tue, 21 Feb 2017 10:47:53 +0100 Message-Id: <20170221094754.15406-1-zajec5@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170216072636.7128-1-zajec5@gmail.com> References: <20170216072636.7128-1-zajec5@gmail.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Rafał Miłecki So far we got only one function for loading firmware asynchronously: request_firmware_nowait. It didn't allow much customization of firmware loading process - there is only one bool uevent argument. Moreover this bool also controls user helper in an unclear way. Resolve this problem by adding a one flexible function and making old request_firmware_nowait a simple inline using new solution. This implementation: 1) Modifies only single bits on existing code 2) Doesn't require adjusting / rewriting current drivers 3) Adds new function for drivers that need more control over loading a firmware. Thanks to using flags more features can be added later. Signed-off-by: Rafał Miłecki --- This patch is based on top of [PATCH V2 RESEND] firmware: simplify defining and handling FW_OPT_FALLBACK applied on top of Linux 4.10-rc8. Ming/Luis/Greg: assuming this gets a positive review, could someone of you pick this patchset? Second patch modifies brcmfmac, I'll try to get a proper Ack for that one. Unless you want this to go through wireless tree, then let me know please. --- drivers/base/firmware_class.c | 25 ++++++------------------- include/linux/firmware.h | 34 +++++++++++++++++++++++++++++----- 2 files changed, 35 insertions(+), 24 deletions(-) diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index d05be1732c8b..7b3f0a018dc3 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -182,18 +182,6 @@ static int __fw_state_check(struct fw_state *fw_st, enum fw_status status) #endif /* CONFIG_FW_LOADER_USER_HELPER */ -/* firmware behavior options */ -#define FW_OPT_UEVENT (1U << 0) -#define FW_OPT_NOWAIT (1U << 1) -#ifdef CONFIG_FW_LOADER_USER_HELPER -#define FW_OPT_USERHELPER (1U << 2) -#else -#define FW_OPT_USERHELPER 0 -#endif -#define FW_OPT_NO_WARN (1U << 3) -#define FW_OPT_NOCACHE (1U << 4) -#define FW_OPT_FALLBACK (1U << 5) - struct firmware_cache { /* firmware_buf instance will be added into the below list */ spinlock_t lock; @@ -1356,7 +1344,7 @@ static void request_firmware_work_func(struct work_struct *work) _request_firmware(&fw, fw_work->name, fw_work->device, NULL, 0, fw_work->opt_flags); fw_work->cont(fw, fw_work->context); - put_device(fw_work->device); /* taken in request_firmware_nowait() */ + put_device(fw_work->device); /* taken in request_firmware_async() */ module_put(fw_work->module); kfree_const(fw_work->name); @@ -1364,7 +1352,7 @@ static void request_firmware_work_func(struct work_struct *work) } /** - * request_firmware_nowait - asynchronous version of request_firmware + * request_firmware_async - asynchronous version of request_firmware * @module: module requesting the firmware * @uevent: sends uevent to copy the firmware image if this flag * is non-zero else the firmware copy must be done manually. @@ -1387,8 +1375,8 @@ static void request_firmware_work_func(struct work_struct *work) * - can't sleep at all if @gfp is GFP_ATOMIC. **/ int -request_firmware_nowait( - struct module *module, bool uevent, +request_firmware_async( + struct module *module, unsigned int opt_flags, const char *name, struct device *device, gfp_t gfp, void *context, void (*cont)(const struct firmware *fw, void *context)) { @@ -1407,8 +1395,7 @@ request_firmware_nowait( fw_work->device = device; fw_work->context = context; fw_work->cont = cont; - fw_work->opt_flags = FW_OPT_NOWAIT | FW_OPT_FALLBACK | - (uevent ? FW_OPT_UEVENT : FW_OPT_USERHELPER); + fw_work->opt_flags = FW_OPT_NOWAIT | opt_flags; if (!try_module_get(module)) { kfree_const(fw_work->name); @@ -1421,7 +1408,7 @@ request_firmware_nowait( schedule_work(&fw_work->work); return 0; } -EXPORT_SYMBOL(request_firmware_nowait); +EXPORT_SYMBOL(request_firmware_async); #ifdef CONFIG_PM_SLEEP static ASYNC_DOMAIN_EXCLUSIVE(fw_cache_domain); diff --git a/include/linux/firmware.h b/include/linux/firmware.h index b1f9f0ccb8ac..1f2bf14aa441 100644 --- a/include/linux/firmware.h +++ b/include/linux/firmware.h @@ -8,6 +8,18 @@ #define FW_ACTION_NOHOTPLUG 0 #define FW_ACTION_HOTPLUG 1 +/* firmware behavior options */ +#define FW_OPT_UEVENT (1U << 0) +#define FW_OPT_NOWAIT (1U << 1) +#ifdef CONFIG_FW_LOADER_USER_HELPER +#define FW_OPT_USERHELPER (1U << 2) +#else +#define FW_OPT_USERHELPER 0 +#endif +#define FW_OPT_NO_WARN (1U << 3) +#define FW_OPT_NOCACHE (1U << 4) +#define FW_OPT_FALLBACK (1U << 5) + struct firmware { size_t size; const u8 *data; @@ -41,8 +53,8 @@ struct builtin_fw { #if defined(CONFIG_FW_LOADER) || (defined(CONFIG_FW_LOADER_MODULE) && defined(MODULE)) int request_firmware(const struct firmware **fw, const char *name, struct device *device); -int request_firmware_nowait( - struct module *module, bool uevent, +int request_firmware_async( + struct module *module, unsigned int opt_flags, const char *name, struct device *device, gfp_t gfp, void *context, void (*cont)(const struct firmware *fw, void *context)); int request_firmware_direct(const struct firmware **fw, const char *name, @@ -58,8 +70,8 @@ static inline int request_firmware(const struct firmware **fw, { return -EINVAL; } -static inline int request_firmware_nowait( - struct module *module, bool uevent, +static inline int request_firmware_async( + struct module *module, unsigned int opt_flags, const char *name, struct device *device, gfp_t gfp, void *context, void (*cont)(const struct firmware *fw, void *context)) { @@ -82,6 +94,18 @@ static inline int request_firmware_into_buf(const struct firmware **firmware_p, { return -EINVAL; } - #endif + +static inline int request_firmware_nowait( + struct module *module, bool uevent, + const char *name, struct device *device, gfp_t gfp, void *context, + void (*cont)(const struct firmware *fw, void *context)) +{ + unsigned int opt_flags = FW_OPT_FALLBACK | + (uevent ? FW_OPT_UEVENT : FW_OPT_USERHELPER); + + return request_firmware_async(module, opt_flags, name, device, gfp, + context, cont); +} + #endif