Commit bebe668e authored Oct 24, 2019 by Candle Sun Committed by Russell King Nov 15, 2019

ARM: 8927/1: ARM/hw_breakpoint: add more ARMv8 debug architecture versions support



When ARMv8 cores are used in AArch32 mode, arch_hw_breakpoint_init()
in arch/arm/kernel/hw_breakpoint.c will be used.

From ARMv8 specification, v8 debug architecture versions defined:
* 0110 ARMv8, v8 Debug architecture.
* 0111 ARMv8.1, v8 Debug architecture, with Virtualization Host
  Extensions.
* 1000 ARMv8.2, v8.2 Debug architecture.
* 1001 ARMv8.4, v8.4 Debug architecture.

So missing ARMv8.1/ARMv8.2/ARMv8.4 cases will cause
enable_monitor_mode() returns -ENODEV,and eventually
arch_hw_breakpoint_init() will fail.

Signed-off-by: Candle Sun <candle.sun@unisoc.com>
Signed-off-by: Nianfu Bai <nianfu.bai@unisoc.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

parent fb033c95

arch/arm/include/asm/hw_breakpoint.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,9 @@ static inline void decode_ctrl_reg(u32 reg,
		#define ARM_DEBUG_ARCH_V7_MM 4
		#define ARM_DEBUG_ARCH_V7_1 5
		#define ARM_DEBUG_ARCH_V8 6
		#define ARM_DEBUG_ARCH_V8_1 7
		#define ARM_DEBUG_ARCH_V8_2 8
		#define ARM_DEBUG_ARCH_V8_4 9

		/* Breakpoint */
		#define ARM_BREAKPOINT_EXECUTE 0

arch/arm/kernel/hw_breakpoint.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -246,6 +246,9 @@ static int enable_monitor_mode(void)
		case ARM_DEBUG_ARCH_V7_ECP14:
		case ARM_DEBUG_ARCH_V7_1:
		case ARM_DEBUG_ARCH_V8:
		case ARM_DEBUG_ARCH_V8_1:
		case ARM_DEBUG_ARCH_V8_2:
		case ARM_DEBUG_ARCH_V8_4:
		ARM_DBG_WRITE(c0, c2, 2, (dscr \| ARM_DSCR_MDBGEN));
		isb();
		break;

Admin message