Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76b1c796 authored by Pratyush Anand's avatar Pratyush Anand Committed by Bernhard Thoben
Browse files

UPSTREAM: arm64: Allow hw watchpoint of length 3,5,6 and 7 



(cherry picked from commit 0ddb8e0b784ba034f3096d5a54684d0d73155e2a)

Since, arm64 can support all offset within a double word limit. Therefore,
now support other lengths within that range as well.

Signed-off-by: default avatarPratyush Anand <panand@redhat.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarPavel Labath <labath@google.com>
Change-Id: Ibcb263a3903572336ccbf96e0180d3990326545a
Bug: 30919905
(cherry picked from commit a474fad20abbc3cc68e92339292b021d570ccffa)
parent feb0787c

arch/arm64/include/asm/hw_breakpoint.h

+4 −0
Original line number Diff line number Diff line
@@ -65,7 +65,11 @@ static inline void decode_ctrl_reg(u32 reg, 
/* Lengths */

#define ARM_BREAKPOINT_LEN_1	0x1

#define ARM_BREAKPOINT_LEN_2	0x3

#define ARM_BREAKPOINT_LEN_3	0x7

#define ARM_BREAKPOINT_LEN_4	0xf

#define ARM_BREAKPOINT_LEN_5	0x1f

#define ARM_BREAKPOINT_LEN_6	0x3f

#define ARM_BREAKPOINT_LEN_7	0x7f

#define ARM_BREAKPOINT_LEN_8	0xff



/* Kernel stepping */

arch/arm64/kernel/hw_breakpoint.c

+36 −0
Original line number Diff line number Diff line
@@ -311,9 +311,21 @@ static int get_hbp_len(u8 hbp_len) 
	case ARM_BREAKPOINT_LEN_2:

		len_in_bytes = 2;

		break;

	case ARM_BREAKPOINT_LEN_3:

		len_in_bytes = 3;

		break;

	case ARM_BREAKPOINT_LEN_4:

		len_in_bytes = 4;

		break;

	case ARM_BREAKPOINT_LEN_5:

		len_in_bytes = 5;

		break;

	case ARM_BREAKPOINT_LEN_6:

		len_in_bytes = 6;

		break;

	case ARM_BREAKPOINT_LEN_7:

		len_in_bytes = 7;

		break;

	case ARM_BREAKPOINT_LEN_8:

		len_in_bytes = 8;

		break;
@@ -375,9 +387,21 @@ int arch_bp_generic_fields(struct arch_hw_breakpoint_ctrl ctrl, 
	case ARM_BREAKPOINT_LEN_2:

		*gen_len = HW_BREAKPOINT_LEN_2;

		break;

	case ARM_BREAKPOINT_LEN_3:

		*gen_len = HW_BREAKPOINT_LEN_3;

		break;

	case ARM_BREAKPOINT_LEN_4:

		*gen_len = HW_BREAKPOINT_LEN_4;

		break;

	case ARM_BREAKPOINT_LEN_5:

		*gen_len = HW_BREAKPOINT_LEN_5;

		break;

	case ARM_BREAKPOINT_LEN_6:

		*gen_len = HW_BREAKPOINT_LEN_6;

		break;

	case ARM_BREAKPOINT_LEN_7:

		*gen_len = HW_BREAKPOINT_LEN_7;

		break;

	case ARM_BREAKPOINT_LEN_8:

		*gen_len = HW_BREAKPOINT_LEN_8;

		break;
@@ -421,9 +445,21 @@ static int arch_build_bp_info(struct perf_event *bp) 
	case HW_BREAKPOINT_LEN_2:

		info->ctrl.len = ARM_BREAKPOINT_LEN_2;

		break;

	case HW_BREAKPOINT_LEN_3:

		info->ctrl.len = ARM_BREAKPOINT_LEN_3;

		break;

	case HW_BREAKPOINT_LEN_4:

		info->ctrl.len = ARM_BREAKPOINT_LEN_4;

		break;

	case HW_BREAKPOINT_LEN_5:

		info->ctrl.len = ARM_BREAKPOINT_LEN_5;

		break;

	case HW_BREAKPOINT_LEN_6:

		info->ctrl.len = ARM_BREAKPOINT_LEN_6;

		break;

	case HW_BREAKPOINT_LEN_7:

		info->ctrl.len = ARM_BREAKPOINT_LEN_7;

		break;

	case HW_BREAKPOINT_LEN_8:

		info->ctrl.len = ARM_BREAKPOINT_LEN_8;

		break;