mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
Here is the set of driver core changes for 5.19-rc1. Note, I'm not really happy with this pull request as-is, see below for details, but overall this is all good for everything but a small set of systems, which we have a fix for already. Lots of tiny driver core changes and cleanups happened this cycle, but the two major things were: - firmware_loader reorganization and additions including the ability to have XZ compressed firmware images and the ability for userspace to initiate the firmware load when it needs to, instead of being always initiated by the kernel. FPGA devices specifically want this ability to have their firmware changed over the lifetime of the system boot, and this allows them to work without having to come up with yet-another-custom-uapi interface for loading firmware for them. - physical location support added to sysfs so that devices that know this information, can tell userspace where they are located in a common way. Some ACPI devices already support this today, and more bus types should support this in the future. Smaller changes included: - driver_override api cleanups and fixes - error path cleanups and fixes - get_abi script fixes - deferred probe timeout changes. It's that last change that I'm the most worried about. It has been reported to cause boot problems for a number of systems, and I have a tested patch series that resolves this issue. But I didn't get it merged into my tree before 5.18-final came out, so it has not gotten any linux-next testing. I'll send the fixup patches (there are 2) as a follow-on series to this pull request if you want to take them directly, _OR_ I can just revert the probe timeout changes and they can wait for the next -rc1 merge cycle. Given that the fixes are tested, and pretty simple, I'm leaning toward that choice. Sorry this all came at the end of the merge window, I should have resolved this all 2 weeks ago, that's my fault as it was in the middle of some travel for me. All have been tested in linux-next for weeks, with no reported issues other than the above-mentioned boot time outs. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- iG0EABECAC0WIQT0tgzFv3jCIUoxPcsxR9QN2y37KQUCYpnv/A8cZ3JlZ0Brcm9h aC5jb20ACgkQMUfUDdst+yk/fACgvmenbo5HipqyHnOmTQlT50xQ9EYAn2eTq6ai GkjLXBGNWOPBa5cU52qf =yEi/ -----END PGP SIGNATURE----- Merge tag 'driver-core-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core Pull driver core updates from Greg KH: "Here is the set of driver core changes for 5.19-rc1. Lots of tiny driver core changes and cleanups happened this cycle, but the two major things are: - firmware_loader reorganization and additions including the ability to have XZ compressed firmware images and the ability for userspace to initiate the firmware load when it needs to, instead of being always initiated by the kernel. FPGA devices specifically want this ability to have their firmware changed over the lifetime of the system boot, and this allows them to work without having to come up with yet-another-custom-uapi interface for loading firmware for them. - physical location support added to sysfs so that devices that know this information, can tell userspace where they are located in a common way. Some ACPI devices already support this today, and more bus types should support this in the future. Smaller changes include: - driver_override api cleanups and fixes - error path cleanups and fixes - get_abi script fixes - deferred probe timeout changes. It's that last change that I'm the most worried about. It has been reported to cause boot problems for a number of systems, and I have a tested patch series that resolves this issue. But I didn't get it merged into my tree before 5.18-final came out, so it has not gotten any linux-next testing. I'll send the fixup patches (there are 2) as a follow-on series to this pull request. All have been tested in linux-next for weeks, with no reported issues other than the above-mentioned boot time-outs" * tag 'driver-core-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (55 commits) driver core: fix deadlock in __device_attach kernfs: Separate kernfs_pr_cont_buf and rename_lock. topology: Remove unused cpu_cluster_mask() driver core: Extend deferred probe timeout on driver registration MAINTAINERS: add Russ Weight as a firmware loader maintainer driver: base: fix UAF when driver_attach failed test_firmware: fix end of loop test in upload_read_show() driver core: location: Add "back" as a possible output for panel driver core: location: Free struct acpi_pld_info *pld driver core: Add "*" wildcard support to driver_async_probe cmdline param driver core: location: Check for allocations failure arch_topology: Trace the update thermal pressure kernfs: Rename kernfs_put_open_node to kernfs_unlink_open_file. export: fix string handling of namespace in EXPORT_SYMBOL_NS rpmsg: use local 'dev' variable rpmsg: Fix calling device_lock() on non-initialized device firmware_loader: describe 'module' parameter of firmware_upload_register() firmware_loader: Move definitions from sysfs_upload.h to sysfs.h firmware_loader: Fix configs for sysfs split selftests: firmware: Add firmware upload selftests ...
157 lines
4.8 KiB
C
157 lines
4.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
#ifndef _LINUX_EXPORT_H
|
|
#define _LINUX_EXPORT_H
|
|
|
|
#include <linux/stringify.h>
|
|
|
|
/*
|
|
* Export symbols from the kernel to modules. Forked from module.h
|
|
* to reduce the amount of pointless cruft we feed to gcc when only
|
|
* exporting a simple symbol or two.
|
|
*
|
|
* Try not to add #includes here. It slows compilation and makes kernel
|
|
* hackers place grumpy comments in header files.
|
|
*/
|
|
|
|
/*
|
|
* This comment block is used by fixdep. Please do not remove.
|
|
*
|
|
* When CONFIG_MODVERSIONS is changed from n to y, all source files having
|
|
* EXPORT_SYMBOL variants must be re-compiled because genksyms is run as a
|
|
* side effect of the *.o build rule.
|
|
*/
|
|
|
|
#ifndef __ASSEMBLY__
|
|
#ifdef MODULE
|
|
extern struct module __this_module;
|
|
#define THIS_MODULE (&__this_module)
|
|
#else
|
|
#define THIS_MODULE ((struct module *)0)
|
|
#endif
|
|
|
|
#ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS
|
|
#include <linux/compiler.h>
|
|
/*
|
|
* Emit the ksymtab entry as a pair of relative references: this reduces
|
|
* the size by half on 64-bit architectures, and eliminates the need for
|
|
* absolute relocations that require runtime processing on relocatable
|
|
* kernels.
|
|
*/
|
|
#define __KSYMTAB_ENTRY(sym, sec) \
|
|
__ADDRESSABLE(sym) \
|
|
asm(" .section \"___ksymtab" sec "+" #sym "\", \"a\" \n" \
|
|
" .balign 4 \n" \
|
|
"__ksymtab_" #sym ": \n" \
|
|
" .long " #sym "- . \n" \
|
|
" .long __kstrtab_" #sym "- . \n" \
|
|
" .long __kstrtabns_" #sym "- . \n" \
|
|
" .previous \n")
|
|
|
|
struct kernel_symbol {
|
|
int value_offset;
|
|
int name_offset;
|
|
int namespace_offset;
|
|
};
|
|
#else
|
|
#define __KSYMTAB_ENTRY(sym, sec) \
|
|
static const struct kernel_symbol __ksymtab_##sym \
|
|
__attribute__((section("___ksymtab" sec "+" #sym), used)) \
|
|
__aligned(sizeof(void *)) \
|
|
= { (unsigned long)&sym, __kstrtab_##sym, __kstrtabns_##sym }
|
|
|
|
struct kernel_symbol {
|
|
unsigned long value;
|
|
const char *name;
|
|
const char *namespace;
|
|
};
|
|
#endif
|
|
|
|
#ifdef __GENKSYMS__
|
|
|
|
#define ___EXPORT_SYMBOL(sym, sec, ns) __GENKSYMS_EXPORT_SYMBOL(sym)
|
|
|
|
#else
|
|
|
|
/*
|
|
* For every exported symbol, do the following:
|
|
*
|
|
* - Put the name of the symbol and namespace (empty string "" for none) in
|
|
* __ksymtab_strings.
|
|
* - Place a struct kernel_symbol entry in the __ksymtab section.
|
|
*
|
|
* note on .section use: we specify progbits since usage of the "M" (SHF_MERGE)
|
|
* section flag requires it. Use '%progbits' instead of '@progbits' since the
|
|
* former apparently works on all arches according to the binutils source.
|
|
*/
|
|
#define ___EXPORT_SYMBOL(sym, sec, ns) \
|
|
extern typeof(sym) sym; \
|
|
extern const char __kstrtab_##sym[]; \
|
|
extern const char __kstrtabns_##sym[]; \
|
|
asm(" .section \"__ksymtab_strings\",\"aMS\",%progbits,1 \n" \
|
|
"__kstrtab_" #sym ": \n" \
|
|
" .asciz \"" #sym "\" \n" \
|
|
"__kstrtabns_" #sym ": \n" \
|
|
" .asciz \"" ns "\" \n" \
|
|
" .previous \n"); \
|
|
__KSYMTAB_ENTRY(sym, sec)
|
|
|
|
#endif
|
|
|
|
#if !defined(CONFIG_MODULES) || defined(__DISABLE_EXPORTS)
|
|
|
|
/*
|
|
* Allow symbol exports to be disabled completely so that C code may
|
|
* be reused in other execution contexts such as the UEFI stub or the
|
|
* decompressor.
|
|
*/
|
|
#define __EXPORT_SYMBOL(sym, sec, ns)
|
|
|
|
#elif defined(CONFIG_TRIM_UNUSED_KSYMS)
|
|
|
|
#include <generated/autoksyms.h>
|
|
|
|
/*
|
|
* For fine grained build dependencies, we want to tell the build system
|
|
* about each possible exported symbol even if they're not actually exported.
|
|
* We use a symbol pattern __ksym_marker_<symbol> that the build system filters
|
|
* from the $(NM) output (see scripts/gen_ksymdeps.sh). These symbols are
|
|
* discarded in the final link stage.
|
|
*/
|
|
#define __ksym_marker(sym) \
|
|
static int __ksym_marker_##sym[0] __section(".discard.ksym") __used
|
|
|
|
#define __EXPORT_SYMBOL(sym, sec, ns) \
|
|
__ksym_marker(sym); \
|
|
__cond_export_sym(sym, sec, ns, __is_defined(__KSYM_##sym))
|
|
#define __cond_export_sym(sym, sec, ns, conf) \
|
|
___cond_export_sym(sym, sec, ns, conf)
|
|
#define ___cond_export_sym(sym, sec, ns, enabled) \
|
|
__cond_export_sym_##enabled(sym, sec, ns)
|
|
#define __cond_export_sym_1(sym, sec, ns) ___EXPORT_SYMBOL(sym, sec, ns)
|
|
|
|
#ifdef __GENKSYMS__
|
|
#define __cond_export_sym_0(sym, sec, ns) __GENKSYMS_EXPORT_SYMBOL(sym)
|
|
#else
|
|
#define __cond_export_sym_0(sym, sec, ns) /* nothing */
|
|
#endif
|
|
|
|
#else
|
|
|
|
#define __EXPORT_SYMBOL(sym, sec, ns) ___EXPORT_SYMBOL(sym, sec, ns)
|
|
|
|
#endif /* CONFIG_MODULES */
|
|
|
|
#ifdef DEFAULT_SYMBOL_NAMESPACE
|
|
#define _EXPORT_SYMBOL(sym, sec) __EXPORT_SYMBOL(sym, sec, __stringify(DEFAULT_SYMBOL_NAMESPACE))
|
|
#else
|
|
#define _EXPORT_SYMBOL(sym, sec) __EXPORT_SYMBOL(sym, sec, "")
|
|
#endif
|
|
|
|
#define EXPORT_SYMBOL(sym) _EXPORT_SYMBOL(sym, "")
|
|
#define EXPORT_SYMBOL_GPL(sym) _EXPORT_SYMBOL(sym, "_gpl")
|
|
#define EXPORT_SYMBOL_NS(sym, ns) __EXPORT_SYMBOL(sym, "", __stringify(ns))
|
|
#define EXPORT_SYMBOL_NS_GPL(sym, ns) __EXPORT_SYMBOL(sym, "_gpl", __stringify(ns))
|
|
|
|
#endif /* !__ASSEMBLY__ */
|
|
|
|
#endif /* _LINUX_EXPORT_H */
|