272d01bd79
Commitefd9e03fac("arm64: Use static keys for CPU features") introduced support for static keys in asm/cpufeature.h, including linux/jump_label.h. When CC_HAVE_ASM_GOTO is not defined, this causes a circular dependency via linux/atomic.h, asm/lse.h and asm/cpufeature.h. This patch moves the capability macros out out of asm/cpufeature.h into a separate asm/cpucaps.h and modifies some of the #includes accordingly. Fixes:efd9e03fac("arm64: Use static keys for CPU features") Reported-by: Artem Savkov <asavkov@redhat.com> Tested-by: Artem Savkov <asavkov@redhat.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
53 lines
1.2 KiB
C
53 lines
1.2 KiB
C
#ifndef __ASM_LSE_H
|
|
#define __ASM_LSE_H
|
|
|
|
#if defined(CONFIG_AS_LSE) && defined(CONFIG_ARM64_LSE_ATOMICS)
|
|
|
|
#include <linux/stringify.h>
|
|
#include <asm/alternative.h>
|
|
|
|
#ifdef __ASSEMBLER__
|
|
|
|
.arch_extension lse
|
|
|
|
.macro alt_lse, llsc, lse
|
|
alternative_insn "\llsc", "\lse", ARM64_HAS_LSE_ATOMICS
|
|
.endm
|
|
|
|
#else /* __ASSEMBLER__ */
|
|
|
|
__asm__(".arch_extension lse");
|
|
|
|
/* Move the ll/sc atomics out-of-line */
|
|
#define __LL_SC_INLINE
|
|
#define __LL_SC_PREFIX(x) __ll_sc_##x
|
|
#define __LL_SC_EXPORT(x) EXPORT_SYMBOL(__LL_SC_PREFIX(x))
|
|
|
|
/* Macro for constructing calls to out-of-line ll/sc atomics */
|
|
#define __LL_SC_CALL(op) "bl\t" __stringify(__LL_SC_PREFIX(op)) "\n"
|
|
#define __LL_SC_CLOBBERS "x16", "x17", "x30"
|
|
|
|
/* In-line patching at runtime */
|
|
#define ARM64_LSE_ATOMIC_INSN(llsc, lse) \
|
|
ALTERNATIVE(llsc, lse, ARM64_HAS_LSE_ATOMICS)
|
|
|
|
#endif /* __ASSEMBLER__ */
|
|
#else /* CONFIG_AS_LSE && CONFIG_ARM64_LSE_ATOMICS */
|
|
|
|
#ifdef __ASSEMBLER__
|
|
|
|
.macro alt_lse, llsc, lse
|
|
\llsc
|
|
.endm
|
|
|
|
#else /* __ASSEMBLER__ */
|
|
|
|
#define __LL_SC_INLINE static inline
|
|
#define __LL_SC_PREFIX(x) x
|
|
#define __LL_SC_EXPORT(x)
|
|
|
|
#define ARM64_LSE_ATOMIC_INSN(llsc, lse) llsc
|
|
|
|
#endif /* __ASSEMBLER__ */
|
|
#endif /* CONFIG_AS_LSE && CONFIG_ARM64_LSE_ATOMICS */
|
|
#endif /* __ASM_LSE_H */
|