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

Commit 3085bb01 authored by Suzuki K. Poulose's avatar Suzuki K. Poulose Committed by Catalin Marinas
Browse files

arm64/debug: Make use of the system wide safe value 



Use the system wide value of ID_AA64DFR0 to make safer decisions

Signed-off-by: default avatarSuzuki K. Poulose <suzuki.poulose@arm.com>
Tested-by: default avatarDave Martin <Dave.Martin@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent fe80f9f2

arch/arm64/include/asm/hw_breakpoint.h

+7 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#define __ASM_HW_BREAKPOINT_H



#include <asm/cputype.h>

#include <asm/cpufeature.h>



#ifdef __KERNEL__
@@ -137,13 +138,17 @@ extern struct pmu perf_ops_bp; 
/* Determine number of BRP registers available. */

static inline int get_num_brps(void)

{

	return ((read_cpuid(ID_AA64DFR0_EL1) >> 12) & 0xf) + 1;

	return 1 +

		cpuid_feature_extract_field(read_system_reg(SYS_ID_AA64DFR0_EL1),

						ID_AA64DFR0_BRPS_SHIFT);

}



/* Determine number of WRP registers available. */

static inline int get_num_wrps(void)

{

	return ((read_cpuid(ID_AA64DFR0_EL1) >> 20) & 0xf) + 1;

	return 1 +

		cpuid_feature_extract_field(read_system_reg(SYS_ID_AA64DFR0_EL1),

						ID_AA64DFR0_WRPS_SHIFT);

}



#endif	/* __KERNEL__ */

arch/arm64/kernel/debug-monitors.c

+4 −2
Original line number Diff line number Diff line
@@ -26,14 +26,16 @@ 
#include <linux/stat.h>

#include <linux/uaccess.h>



#include <asm/debug-monitors.h>

#include <asm/cpufeature.h>

#include <asm/cputype.h>

#include <asm/debug-monitors.h>

#include <asm/system_misc.h>



/* Determine debug architecture. */

u8 debug_monitors_arch(void)

{

	return read_cpuid(ID_AA64DFR0_EL1) & 0xf;

	return cpuid_feature_extract_field(read_system_reg(SYS_ID_AA64DFR0_EL1),

						ID_AA64DFR0_DEBUGVER_SHIFT);

}



/*