From patchwork Mon Apr 23 20:12:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andres Rodriguez X-Patchwork-Id: 10358095 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 717CC60209 for ; Mon, 23 Apr 2018 20:15:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 61F5428C29 for ; Mon, 23 Apr 2018 20:15:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5423928C2E; Mon, 23 Apr 2018 20:15:00 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 F014528C29 for ; Mon, 23 Apr 2018 20:14:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932605AbeDWUOH (ORCPT ); Mon, 23 Apr 2018 16:14:07 -0400 Received: from mail-it0-f68.google.com ([209.85.214.68]:54864 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932507AbeDWUMW (ORCPT ); Mon, 23 Apr 2018 16:12:22 -0400 Received: by mail-it0-f68.google.com with SMTP id h143-v6so12618270ita.4; Mon, 23 Apr 2018 13:12:21 -0700 (PDT) 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; bh=5ywIEGQr5Ujm1y8FGAlgDpaPjr+d2bFnG/dzH32uhFI=; b=IyATvrDjDguw+spIQiHxE3lnfbAc886SWqeywwHZzIf167/unWSXOyURknxbbPBBno rSmfOSbZhojfeQnE2OEymsoHA4/F1HVlZMZ2Y6ZyCGqjZyAC/Q5bphqufSOYYXb0sSAK hIwO68Zi2keMDDfXerpLRy/FIYVnOtB0gJG93mrYNsglLHtzTFKYnBBK2Ve0FuD5aivh 6i8EUB9fr9xrcXDLCg6fnQkbhy8dGK1foywMtqJ/V/Exbam4SjSe8Gh9GYGYPCJuT36i j/PsIlr0q1argnqDGQsr8L+XH7wpba94eGWJUSxx+mOT1PFfM2o9frstrjlKpOY66A6z BVWg== 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; bh=5ywIEGQr5Ujm1y8FGAlgDpaPjr+d2bFnG/dzH32uhFI=; b=YrzU3HQsMG4X4y/MJpQdE4vzL08GvnO78jfuu/K08XRrRxHyvkkwFbAPVWPuXgSg9U AxPPxuCOXhrT1UhO83fS7ZIGRhU5ZuCAlfK9OgkKIRKNqpoyF7ONofHPl9X1RUQldOD7 XvsyY+I4wQZNbsG9Tp53cjyspmVimL0K4rqIgZfSVc5JQAYnHi4cuD4bkoTfg0iMlbWs Cjz3T4br7T7BzCeA5k2SE/8g5vwVxR0n6FTFaBvK8W+hYconwn0vG92CeKvGvAu0La4v Ewxg0HKOMQXpbRNTBmaqs+0uU05F5UX35rtxUGiGJXVmOLWwOMBnTHX9F1hlDGpZRfy1 46eQ== X-Gm-Message-State: ALQs6tCQyYb+R1tWk1lqs10IUzRquPT69h1RYNZ0/rKGNHPUu9RFoDLj 52JPkJ7DjhA90mBddgihFFrBk6KXVHU= X-Google-Smtp-Source: AB8JxZqgTnXHXVx+tSR//u4sFcpdEDJ7hxSffbaZRXoQHV4wlX/He0vEnWni/Lg9Vc6LNbZnKHr9cw== X-Received: by 2002:a24:7404:: with SMTP id o4-v6mr16494850itc.153.1524514340995; Mon, 23 Apr 2018 13:12:20 -0700 (PDT) Received: from localhost.localdomain (184-175-36-239.dsl.teksavvy.com. [184.175.36.239]) by smtp.gmail.com with ESMTPSA id k130-v6sm1632551itb.0.2018.04.23.13.12.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 13:12:20 -0700 (PDT) From: Andres Rodriguez To: linux-kernel@vger.kernel.org Cc: andresx7@gmail.com, gregkh@linuxfoundation.org, mcgrof@kernel.org, alexdeucher@gmail.com, christian.koenig@amd.com, kvalo@codeaurora.org, arend.vanspriel@broadcom.com, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org, hdegoede@redhat.com Subject: [PATCH 5/9] firmware: add function to load firmware without warnings v5 Date: Mon, 23 Apr 2018 16:12:01 -0400 Message-Id: <20180423201205.20533-6-andresx7@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180423201205.20533-1-andresx7@gmail.com> References: <20180423201205.20533-1-andresx7@gmail.com> 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 Currently the firmware loader only exposes one silent path for querying optional firmware, and that is firmware_request_direct(). This function also disables the fallback path, which might not always be the desired behaviour. [0] This patch introduces a variations of firmware_request() that enable the caller to disable the undesired warning messages. This is equivalent to adding FW_OPT_NO_WARN to the old behaviour. v2: add header prototype, use updated opt_flags v3: split debug message to separate patch added _nowait variant added documentation v4: fix kernel-doc style v5: drop _nowait for now, since we lack agreement on the API [0]: https://git.kernel.org/linus/c0cc00f250e1 Signed-off-by: Andres Rodriguez --- .../driver-api/firmware/request_firmware.rst | 5 +++++ drivers/base/firmware_loader/main.c | 24 ++++++++++++++++++++++ include/linux/firmware.h | 2 ++ 3 files changed, 31 insertions(+) diff --git a/Documentation/driver-api/firmware/request_firmware.rst b/Documentation/driver-api/firmware/request_firmware.rst index 7632f8807472..c8bddbdcfd10 100644 --- a/Documentation/driver-api/firmware/request_firmware.rst +++ b/Documentation/driver-api/firmware/request_firmware.rst @@ -20,6 +20,11 @@ firmware_request .. kernel-doc:: drivers/base/firmware_loader/main.c :functions: firmware_request +firmware_request_nowarn +----------------------- +.. kernel-doc:: drivers/base/firmware_loader/main.c + :functions: firmware_request_nowarn + firmware_request_direct ----------------------- .. kernel-doc:: drivers/base/firmware_loader/main.c diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c index d028cd3257f7..58aaadf81e12 100644 --- a/drivers/base/firmware_loader/main.c +++ b/drivers/base/firmware_loader/main.c @@ -631,6 +631,30 @@ firmware_request(const struct firmware **firmware_p, const char *name, } EXPORT_SYMBOL(firmware_request); +/** + * firmware_request_nowarn() - request for an optional fw module + * @firmware: pointer to firmware image + * @name: name of firmware file + * @device: device for which firmware is being loaded + * + * This function is similar in behaviour to firmware_request(), except + * it doesn't produce warning messages when the file is not found. + **/ +int +firmware_request_nowarn(const struct firmware **firmware, const char *name, + struct device *device) +{ + int ret; + + /* Need to pin this module until return */ + __module_get(THIS_MODULE); + ret = _firmware_request(firmware, name, device, NULL, 0, + FW_OPT_UEVENT | FW_OPT_NO_WARN); + module_put(THIS_MODULE); + return ret; +} +EXPORT_SYMBOL_GPL(firmware_request_nowarn); + /** * firmware_request_direct() - load firmware directly without usermode helper * @firmware_p: pointer to firmware image diff --git a/include/linux/firmware.h b/include/linux/firmware.h index db8351a42405..a34e16f77f20 100644 --- a/include/linux/firmware.h +++ b/include/linux/firmware.h @@ -42,6 +42,8 @@ struct builtin_fw { #if defined(CONFIG_FW_LOADER) || (defined(CONFIG_FW_LOADER_MODULE) && defined(MODULE)) int firmware_request(const struct firmware **fw, const char *name, struct device *device); +int firmware_request_nowarn(const struct firmware **fw, const char *name, + struct device *device); int firmware_request_nowait( struct module *module, bool uevent, const char *name, struct device *device, gfp_t gfp, void *context,