mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 17:08:10 +00:00
6aad36d421
Patch series "sysctl: 3rd set of kernel/sysctl cleanups", v2. This is the third set of patches to help address cleaning the kitchen seink in kernel/sysctl.c and to move sysctls away to where they are actually implemented / used. This patch (of 8): kernel/sysctl.c is a kitchen sink where everyone leaves their dirty dishes, this makes it very difficult to maintain. To help with this maintenance let's start by moving sysctls to places where they actually belong. The proc sysctl maintainers do not want to know what sysctl knobs you wish to add for your own piece of code, we just care about the core logic. So move the firmware configuration sysctl table to the only place where it is used, and make it clear that if sysctls are disabled this is not used. [akpm@linux-foundation.org: export register_firmware_config_sysctl and unregister_firmware_config_sysctl to modules] [akpm@linux-foundation.org: use EXPORT_SYMBOL_NS_GPL instead] [sfr@canb.auug.org.au: fix that so it compiles] Link: https://lkml.kernel.org/r/20211201160626.401d828d@canb.auug.org.au [mcgrof@kernel.org: major commit log update to justify the move] Link: https://lkml.kernel.org/r/20211124231435.1445213-1-mcgrof@kernel.org Link: https://lkml.kernel.org/r/20211124231435.1445213-2-mcgrof@kernel.org Signed-off-by: Xiaoming Ni <nixiaoming@huawei.com> Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Kees Cook <keescook@chromium.org> Cc: Iurii Zaikin <yzaikin@google.com> Cc: Eric Biederman <ebiederm@xmission.com> Cc: Stephen Kitt <steve@sk2.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: "Rafael J. Wysocki" <rafael@kernel.org> Cc: "Theodore Ts'o" <tytso@mit.edu> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Petr Mladek <pmladek@suse.com> Cc: Sergey Senozhatsky <senozhatsky@chromium.org> Cc: Steven Rostedt (VMware) <rostedt@goodmis.org> Cc: John Ogness <john.ogness@linutronix.de> Cc: Douglas Gilbert <dgilbert@interlog.com> Cc: James E.J. Bottomley <jejb@linux.ibm.com> Cc: Martin K. Petersen <martin.petersen@oracle.com> Cc: Lukas Middendorf <kernel@tuxforce.de> Cc: Antti Palosaari <crope@iki.fi> Cc: Amir Goldstein <amir73il@gmail.com> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Benjamin LaHaise <bcrl@kvack.org> Cc: Clemens Ladisch <clemens@ladisch.de> Cc: David Airlie <airlied@linux.ie> Cc: Jani Nikula <jani.nikula@intel.com> Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Jan Kara <jack@suse.cz> Cc: Joel Becker <jlbec@evilplan.org> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Joseph Qi <joseph.qi@linux.alibaba.com> Cc: Julia Lawall <julia.lawall@inria.fr> Cc: Mark Fasheh <mark@fasheh.com> Cc: Paul Turner <pjt@google.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Phillip Potter <phil@philpotter.co.uk> Cc: Qing Wang <wangqing@vivo.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Sebastian Reichel <sre@kernel.org> Cc: Suren Baghdasaryan <surenb@google.com> Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
89 lines
2.5 KiB
C
89 lines
2.5 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __FIRMWARE_FALLBACK_H
|
|
#define __FIRMWARE_FALLBACK_H
|
|
|
|
#include <linux/firmware.h>
|
|
#include <linux/device.h>
|
|
|
|
#include "firmware.h"
|
|
|
|
/**
|
|
* struct firmware_fallback_config - firmware fallback configuration settings
|
|
*
|
|
* Helps describe and fine tune the fallback mechanism.
|
|
*
|
|
* @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.
|
|
* @ignore_sysfs_fallback: force to disable the sysfs fallback mechanism.
|
|
* This emulates the behaviour as if we had set the kernel
|
|
* config CONFIG_FW_LOADER_USER_HELPER=n.
|
|
* @old_timeout: for internal use
|
|
* @loading_timeout: the timeout to wait for the fallback mechanism before
|
|
* giving up, in seconds.
|
|
*/
|
|
struct firmware_fallback_config {
|
|
unsigned int force_sysfs_fallback;
|
|
unsigned int ignore_sysfs_fallback;
|
|
int old_timeout;
|
|
int loading_timeout;
|
|
};
|
|
|
|
#ifdef CONFIG_FW_LOADER_USER_HELPER
|
|
int firmware_fallback_sysfs(struct firmware *fw, const char *name,
|
|
struct device *device,
|
|
u32 opt_flags,
|
|
int ret);
|
|
void kill_pending_fw_fallback_reqs(bool only_kill_custom);
|
|
|
|
void fw_fallback_set_cache_timeout(void);
|
|
void fw_fallback_set_default_timeout(void);
|
|
|
|
int register_sysfs_loader(void);
|
|
void unregister_sysfs_loader(void);
|
|
#ifdef CONFIG_SYSCTL
|
|
extern int register_firmware_config_sysctl(void);
|
|
extern void unregister_firmware_config_sysctl(void);
|
|
#else
|
|
static inline int register_firmware_config_sysctl(void)
|
|
{
|
|
return 0;
|
|
}
|
|
static inline void unregister_firmware_config_sysctl(void) { }
|
|
#endif /* CONFIG_SYSCTL */
|
|
|
|
#else /* CONFIG_FW_LOADER_USER_HELPER */
|
|
static inline int firmware_fallback_sysfs(struct firmware *fw, const char *name,
|
|
struct device *device,
|
|
u32 opt_flags,
|
|
int ret)
|
|
{
|
|
/* Keep carrying over the same error */
|
|
return ret;
|
|
}
|
|
|
|
static inline void kill_pending_fw_fallback_reqs(bool only_kill_custom) { }
|
|
static inline void fw_fallback_set_cache_timeout(void) { }
|
|
static inline void fw_fallback_set_default_timeout(void) { }
|
|
|
|
static inline int register_sysfs_loader(void)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void unregister_sysfs_loader(void)
|
|
{
|
|
}
|
|
#endif /* CONFIG_FW_LOADER_USER_HELPER */
|
|
|
|
#ifdef CONFIG_EFI_EMBEDDED_FIRMWARE
|
|
int firmware_fallback_platform(struct fw_priv *fw_priv);
|
|
#else
|
|
static inline int firmware_fallback_platform(struct fw_priv *fw_priv)
|
|
{
|
|
return -ENOENT;
|
|
}
|
|
#endif
|
|
|
|
#endif /* __FIRMWARE_FALLBACK_H */
|