Commit 5519d7de authored by Mark Rutland's avatar Mark Rutland Committed by Will Deacon
Browse files

arm64: asm-extable: move data fields 



In subsequent patches we'll need to fill in extable data fields in
regular assembly files. In preparation for this, move the definitions of
the extable data fields earlier in asm-extable.h so that they are
defined for both assembly and C files.

There should be no functional change as a result of this patch.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarTong Tiangen <tongtiangen@huawei.com>
Link: https://lore.kernel.org/r/20220621072638.1273594-3-tongtiangen@huawei.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 4953fc3d

arch/arm64/include/asm/asm-extable.h

+12 −10
Original line number Diff line number Diff line
@@ -9,6 +9,18 @@ 
#define EX_TYPE_KACCESS_ERR_ZERO	4

#define EX_TYPE_LOAD_UNALIGNED_ZEROPAD	5



/* Data fields for EX_TYPE_UACCESS_ERR_ZERO */

#define EX_DATA_REG_ERR_SHIFT	0

#define EX_DATA_REG_ERR		GENMASK(4, 0)

#define EX_DATA_REG_ZERO_SHIFT	5

#define EX_DATA_REG_ZERO	GENMASK(9, 5)



/* Data fields for EX_TYPE_LOAD_UNALIGNED_ZEROPAD */

#define EX_DATA_REG_DATA_SHIFT	0

#define EX_DATA_REG_DATA	GENMASK(4, 0)

#define EX_DATA_REG_ADDR_SHIFT	5

#define EX_DATA_REG_ADDR	GENMASK(9, 5)



#ifdef __ASSEMBLY__



#define __ASM_EXTABLE_RAW(insn, fixup, type, data)	\
@@ -57,11 +69,6 @@ 
#define _ASM_EXTABLE(insn, fixup) \

	__ASM_EXTABLE_RAW(#insn, #fixup, __stringify(EX_TYPE_FIXUP), "0")



#define EX_DATA_REG_ERR_SHIFT	0

#define EX_DATA_REG_ERR		GENMASK(4, 0)

#define EX_DATA_REG_ZERO_SHIFT	5

#define EX_DATA_REG_ZERO	GENMASK(9, 5)



#define EX_DATA_REG(reg, gpr)						\

	"((.L__gpr_num_" #gpr ") << " __stringify(EX_DATA_REG_##reg##_SHIFT) ")"
@@ -89,11 +96,6 @@ 
#define _ASM_EXTABLE_KACCESS_ERR(insn, fixup, err)			\

	_ASM_EXTABLE_KACCESS_ERR_ZERO(insn, fixup, err, wzr)



#define EX_DATA_REG_DATA_SHIFT	0

#define EX_DATA_REG_DATA	GENMASK(4, 0)

#define EX_DATA_REG_ADDR_SHIFT	5

#define EX_DATA_REG_ADDR	GENMASK(9, 5)



#define _ASM_EXTABLE_LOAD_UNALIGNED_ZEROPAD(insn, fixup, data, addr)		\

	__DEFINE_ASM_GPR_NUMS							\

	__ASM_EXTABLE_RAW(#insn, #fixup,					\