0276ebf166
commit e9666d10a5677a494260d60d1fa0b73cc7646eb3 upstream. Currently, CONFIG_JUMP_LABEL just means "I _want_ to use jump label". The jump label is controlled by HAVE_JUMP_LABEL, which is defined like this: #if defined(CC_HAVE_ASM_GOTO) && defined(CONFIG_JUMP_LABEL) # define HAVE_JUMP_LABEL #endif We can improve this by testing 'asm goto' support in Kconfig, then make JUMP_LABEL depend on CC_HAS_ASM_GOTO. Ugly #ifdef HAVE_JUMP_LABEL will go away, and CONFIG_JUMP_LABEL will match to the real kernel capability. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc) Tested-by: Sedat Dilek <sedat.dilek@gmail.com> [nc: Fix trivial conflicts in 4.19 arch/xtensa/kernel/jump_label.c doesn't exist yet Ensured CC_HAVE_ASM_GOTO and HAVE_JUMP_LABEL were sufficiently eliminated] Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
58 lines
1.6 KiB
C
58 lines
1.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _ASM_X86_RMWcc
|
|
#define _ASM_X86_RMWcc
|
|
|
|
#define __CLOBBERS_MEM(clb...) "memory", ## clb
|
|
|
|
#if !defined(__GCC_ASM_FLAG_OUTPUTS__) && defined(CONFIG_CC_HAS_ASM_GOTO)
|
|
|
|
/* Use asm goto */
|
|
|
|
#define __GEN_RMWcc(fullop, var, cc, clobbers, ...) \
|
|
do { \
|
|
asm_volatile_goto (fullop "; j" #cc " %l[cc_label]" \
|
|
: : [counter] "m" (var), ## __VA_ARGS__ \
|
|
: clobbers : cc_label); \
|
|
return 0; \
|
|
cc_label: \
|
|
return 1; \
|
|
} while (0)
|
|
|
|
#define __BINARY_RMWcc_ARG " %1, "
|
|
|
|
|
|
#else /* defined(__GCC_ASM_FLAG_OUTPUTS__) || !defined(CONFIG_CC_HAS_ASM_GOTO) */
|
|
|
|
/* Use flags output or a set instruction */
|
|
|
|
#define __GEN_RMWcc(fullop, var, cc, clobbers, ...) \
|
|
do { \
|
|
bool c; \
|
|
asm volatile (fullop CC_SET(cc) \
|
|
: [counter] "+m" (var), CC_OUT(cc) (c) \
|
|
: __VA_ARGS__ : clobbers); \
|
|
return c; \
|
|
} while (0)
|
|
|
|
#define __BINARY_RMWcc_ARG " %2, "
|
|
|
|
#endif /* defined(__GCC_ASM_FLAG_OUTPUTS__) || !defined(CONFIG_CC_HAS_ASM_GOTO) */
|
|
|
|
#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
|
|
__GEN_RMWcc(op " " arg0, var, cc, __CLOBBERS_MEM())
|
|
|
|
#define GEN_UNARY_SUFFIXED_RMWcc(op, suffix, var, arg0, cc, clobbers...)\
|
|
__GEN_RMWcc(op " " arg0 "\n\t" suffix, var, cc, \
|
|
__CLOBBERS_MEM(clobbers))
|
|
|
|
#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
|
|
__GEN_RMWcc(op __BINARY_RMWcc_ARG arg0, var, cc, \
|
|
__CLOBBERS_MEM(), vcon (val))
|
|
|
|
#define GEN_BINARY_SUFFIXED_RMWcc(op, suffix, var, vcon, val, arg0, cc, \
|
|
clobbers...) \
|
|
__GEN_RMWcc(op __BINARY_RMWcc_ARG arg0 "\n\t" suffix, var, cc, \
|
|
__CLOBBERS_MEM(clobbers), vcon (val))
|
|
|
|
#endif /* _ASM_X86_RMWcc */
|