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

Commit 4ae7ebe9 authored by Michael Neuling's avatar Michael Neuling Committed by Benjamin Herrenschmidt
Browse files

powerpc: Change hardware breakpoint to allow longer ranges 



Change the hardware breakpoint code so that we can support wider ranged
breakpoints.

This means both ptrace and perf hardware breakpoints can use upto 512 byte long
breakpoints when using the DAWR and only 8 byte when using the DABR.

Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 05d694ea

arch/powerpc/include/asm/hw_breakpoint.h

+0 −2
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ struct pmu; 
struct perf_sample_data;



#define HW_BREAKPOINT_ALIGN 0x7

/* Maximum permissible length of any HW Breakpoint */

#define HW_BREAKPOINT_LEN 0x8



extern int hw_breakpoint_slots(int type);

extern int arch_bp_generic_fields(int type, int *gen_bp_type);

arch/powerpc/kernel/hw_breakpoint.c

+10 −2
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ int arch_bp_generic_fields(int type, int *gen_bp_type) 
 */

int arch_validate_hwbkpt_settings(struct perf_event *bp)

{

	int ret = -EINVAL;

	int ret = -EINVAL, length_max;

	struct arch_hw_breakpoint *info = counter_arch_bp(bp);



	if (!bp)
@@ -171,8 +171,16 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp) 
	 * HW_BREAKPOINT_ALIGN by rounding off to the lower address, the

	 * 'symbolsize' should satisfy the check below.

	 */

	length_max = 8; /* DABR */

	if (cpu_has_feature(CPU_FTR_DAWR)) {

		length_max = 512 ; /* 64 doublewords */

		/* DAWR region can't cross 512 boundary */

		if ((bp->attr.bp_addr >> 10) != 

		    ((bp->attr.bp_addr + bp->attr.bp_len) >> 10))

			return -EINVAL;

	}

	if (info->len >

	    (HW_BREAKPOINT_LEN - (info->address & HW_BREAKPOINT_ALIGN)))

	    (length_max - (info->address & HW_BREAKPOINT_ALIGN)))

		return -EINVAL;

	return 0;

}