From patchwork Mon Nov 20 18:24:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 10066905 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 56F406038F for ; Mon, 20 Nov 2017 18:26:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E13628389 for ; Mon, 20 Nov 2017 18:26:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 42AE728F5F; Mon, 20 Nov 2017 18:26:21 +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.9 required=2.0 tests=BAYES_00,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 BC0A128389 for ; Mon, 20 Nov 2017 18:26:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752548AbdKTS0J (ORCPT ); Mon, 20 Nov 2017 13:26:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:57728 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752233AbdKTSYd (ORCPT ); Mon, 20 Nov 2017 13:24:33 -0500 Received: from garbanzo.do-not-panic.com (c-73-15-241-2.hsd1.ca.comcast.net [73.15.241.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6B2072199C; Mon, 20 Nov 2017 18:24:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6B2072199C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=mcgrof@kernel.org From: "Luis R. Rodriguez" To: gregkh@linuxfoundation.org Cc: akpm@linux-foundation.org, keescook@chromium.org, mfuzzey@parkeon.com, zohar@linux.vnet.ibm.com, dhowells@redhat.com, pali.rohar@gmail.com, tiwai@suse.de, arend.vanspriel@broadcom.com, zajec5@gmail.com, nbroeking@me.com, markivx@codeaurora.org, stephen.boyd@linaro.org, broonie@kernel.org, dmitry.torokhov@gmail.com, dwmw2@infradead.org, torvalds@linux-foundation.org, Abhay_Salunke@dell.com, bjorn.andersson@linaro.org, jewalt@lgsinnovations.com, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, "Luis R. Rodriguez" Subject: [PATCH v2 19/23] firmware: add debug facility to emulate forcing sysfs fallback Date: Mon, 20 Nov 2017 10:24:05 -0800 Message-Id: <20171120182409.27348-20-mcgrof@kernel.org> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20171120182409.27348-1-mcgrof@kernel.org> References: <20171120182409.27348-1-mcgrof@kernel.org> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The CONFIG_FW_LOADER_USER_HELPER_FALLBACK kernel config is not enabled my major distros, however its known to be enabled on some Android kernels. Testing the firmware API properly then means to test at least two different kernel configurations. Since CONFIG_FW_LOADER_USER_HELPER_FALLBACK only does a simple enablement under certain situations we can just emulate this behaviour through a debugfs knob. This enables testing two of the tree possible kernel configs with the firmware loader with one kernel build. Signed-off-by: Luis R. Rodriguez --- drivers/base/Kconfig | 6 ++++++ drivers/base/Makefile | 1 + drivers/base/firmware_debug.c | 34 ++++++++++++++++++++++++++++++++ drivers/base/firmware_debug.h | 44 ++++++++++++++++++++++++++++++++++++++++++ drivers/base/firmware_loader.c | 13 ++++++++++++- 5 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 drivers/base/firmware_debug.c create mode 100644 drivers/base/firmware_debug.h diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig index 2f6614c9a229..ab6889ac6787 100644 --- a/drivers/base/Kconfig +++ b/drivers/base/Kconfig @@ -149,6 +149,12 @@ config EXTRA_FIRMWARE_DIR config FW_LOADER_USER_HELPER bool +config FW_LOADER_DEBUG + bool "Firmware loader debugging interface" + help + If you are hacking on the firmware API of the kernel, firmware_class, + you can enable this to help debug the kernel. + config FW_LOADER_USER_HELPER_FALLBACK bool "Fallback user-helper invocation for firmware loading" depends on FW_LOADER diff --git a/drivers/base/Makefile b/drivers/base/Makefile index f261143fafbf..64eaa4f9cb02 100644 --- a/drivers/base/Makefile +++ b/drivers/base/Makefile @@ -14,6 +14,7 @@ obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o obj-$(CONFIG_ISA_BUS_API) += isa.o obj-$(CONFIG_FW_LOADER) += firmware_class.o firmware_class-objs := firmware_loader.o +firmware_class-$(CONFIG_FW_LOADER_DEBUG) += firmware_debug.o obj-$(CONFIG_NUMA) += node.o obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o ifeq ($(CONFIG_SYSFS),y) diff --git a/drivers/base/firmware_debug.c b/drivers/base/firmware_debug.c new file mode 100644 index 000000000000..f2817eb6f480 --- /dev/null +++ b/drivers/base/firmware_debug.c @@ -0,0 +1,34 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Firmware dubugging interface */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +#include +#include "firmware_debug.h" + +struct firmware_debug fw_debug; + +static struct dentry *debugfs_firmware; + +int __init register_fw_debugfs(void) +{ + debugfs_firmware = debugfs_create_dir("firmware", NULL); + if (!debugfs_firmware) + return -ENOMEM; + + if (!debugfs_create_bool("force_sysfs_fallback", S_IRUSR | S_IWUSR, + debugfs_firmware, + &fw_debug.force_sysfs_fallback)) + goto err_out; + + return 0; +err_out: + debugfs_remove_recursive(debugfs_firmware); + debugfs_firmware = NULL; + return -ENOMEM; +} + +void unregister_fw_debugfs(void) +{ + debugfs_remove_recursive(debugfs_firmware); + debugfs_firmware = NULL; +} diff --git a/drivers/base/firmware_debug.h b/drivers/base/firmware_debug.h new file mode 100644 index 000000000000..bc41bbca9a54 --- /dev/null +++ b/drivers/base/firmware_debug.h @@ -0,0 +1,44 @@ +// SPDX-License-Identifier: GPL-2.0 +#ifndef __FIRMWARE_DEBUG_H +#define __FIRMWARE_DEBUG_H + +#ifdef CONFIG_FW_LOADER_DEBUG +/** + * struct firmware_debug - firmware debugging configuration + * + * Provided to help debug the firmware API. + * + * @force_sysfs_fallback: force the sysfs fallback mechanism to be used + * as if one had enabled CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y. + * Useful to help debug a CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y + * functionality on a kernel where that config entry has been disabled. + */ +struct firmware_debug { + bool force_sysfs_fallback; +}; + +extern struct firmware_debug fw_debug; + +int register_fw_debugfs(void); +void unregister_fw_debugfs(void); + +static inline bool fw_debug_force_sysfs_fallback(void) +{ + return fw_debug.force_sysfs_fallback; +} +#else +static inline int register_fw_debugfs(void) +{ + return 0; +} +static inline void unregister_fw_debugfs(void) +{ +} + +static inline bool fw_debug_force_sysfs_fallback(void) +{ + return false; +} +#endif /* CONFIG_FW_LOADER_DEBUG */ + +#endif /* __FIRMWARE_DEBUG_H */ diff --git a/drivers/base/firmware_loader.c b/drivers/base/firmware_loader.c index 43b97a8137f7..b2b52ba9f245 100644 --- a/drivers/base/firmware_loader.c +++ b/drivers/base/firmware_loader.c @@ -36,6 +36,7 @@ #include #include "base.h" +#include "firmware_debug.h" MODULE_AUTHOR("Manuel Estrada Sainz"); MODULE_DESCRIPTION("Multi purpose firmware loading support"); @@ -1158,6 +1159,9 @@ static bool fw_force_sysfs_fallback(unsigned int opt_flags) #else static bool fw_force_sysfs_fallback(unsigned int opt_flags) { + if (fw_debug_force_sysfs_fallback()) + return true; + if (!(opt_flags & FW_OPT_USERHELPER)) return false; return true; @@ -1913,10 +1917,14 @@ static int __init firmware_class_init(void) /* No need to unfold these on exit */ fw_cache_init(); - ret = register_fw_pm_ops(); + ret = register_fw_debugfs(); if (ret) return ret; + ret = register_fw_pm_ops(); + if (ret) + goto out_debugfs; + ret = register_reboot_notifier(&fw_shutdown_nb); if (ret) goto out; @@ -1925,6 +1933,8 @@ static int __init firmware_class_init(void) out: unregister_fw_pm_ops(); +out_debugfs: + unregister_fw_debugfs(); return ret; } @@ -1933,6 +1943,7 @@ static void __exit firmware_class_exit(void) unregister_fw_pm_ops(); unregister_reboot_notifier(&fw_shutdown_nb); unregister_sysfs_loader(); + unregister_fw_debugfs(); } fs_initcall(firmware_class_init);