Commit 97e58e39 authored by Hou Tao's avatar Hou Tao Committed by Will Deacon
Browse files

arm64: move AARCH64_BREAK_FAULT into insn-def.h 



If CONFIG_ARM64_LSE_ATOMICS is off, encoders for LSE-related instructions
can return AARCH64_BREAK_FAULT directly in insn.h. In order to access
AARCH64_BREAK_FAULT in insn.h, we can not include debug-monitors.h in
insn.h, because debug-monitors.h has already depends on insn.h, so just
move AARCH64_BREAK_FAULT into insn-def.h.

It will be used by the following patch to eliminate unnecessary LSE-related
encoders when CONFIG_ARM64_LSE_ATOMICS is off.

Signed-off-by: default avatarHou Tao <houtao1@huawei.com>
Link: https://lore.kernel.org/r/20220217072232.1186625-2-houtao1@huawei.com


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

arch/arm64/include/asm/debug-monitors.h

+0 −12
Original line number Diff line number Diff line
@@ -34,18 +34,6 @@ 
 */

#define BREAK_INSTR_SIZE		AARCH64_INSN_SIZE



/*

 * BRK instruction encoding

 * The #imm16 value should be placed at bits[20:5] within BRK ins

 */

#define AARCH64_BREAK_MON	0xd4200000



/*

 * BRK instruction for provoking a fault on purpose

 * Unlike kgdb, #imm16 value with unallocated handler is used for faulting.

 */

#define AARCH64_BREAK_FAULT	(AARCH64_BREAK_MON | (FAULT_BRK_IMM << 5))



#define AARCH64_BREAK_KGDB_DYN_DBG	\

	(AARCH64_BREAK_MON | (KGDB_DYN_DBG_BRK_IMM << 5))

arch/arm64/include/asm/insn-def.h

+14 −0
Original line number Diff line number Diff line
@@ -3,7 +3,21 @@ 
#ifndef __ASM_INSN_DEF_H

#define __ASM_INSN_DEF_H



#include <asm/brk-imm.h>



/* A64 instructions are always 32 bits. */

#define	AARCH64_INSN_SIZE		4



/*

 * BRK instruction encoding

 * The #imm16 value should be placed at bits[20:5] within BRK ins

 */

#define AARCH64_BREAK_MON	0xd4200000



/*

 * BRK instruction for provoking a fault on purpose

 * Unlike kgdb, #imm16 value with unallocated handler is used for faulting.

 */

#define AARCH64_BREAK_FAULT	(AARCH64_BREAK_MON | (FAULT_BRK_IMM << 5))



#endif /* __ASM_INSN_DEF_H */