Commit 493cf9b7 authored by Vladimir Murzin's avatar Vladimir Murzin Committed by Catalin Marinas
Browse files

arm64: s/AMEVTYPE/AMEVTYPER 



Activity Monitor Event Type Registers are named as AMEVTYPER{0,1}<n>

Signed-off-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20200721091259.102756-1-vladimir.murzin@arm.com


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent abb7962a

arch/arm64/include/asm/sysreg.h

+2 −2
Original line number Diff line number Diff line
@@ -421,9 +421,9 @@ 
 */



#define SYS_AMEVCNTR0_EL0(n)		SYS_AM_EL0(4 + ((n) >> 3), (n) & 7)

#define SYS_AMEVTYPE0_EL0(n)		SYS_AM_EL0(6 + ((n) >> 3), (n) & 7)

#define SYS_AMEVTYPER0_EL0(n)		SYS_AM_EL0(6 + ((n) >> 3), (n) & 7)

#define SYS_AMEVCNTR1_EL0(n)		SYS_AM_EL0(12 + ((n) >> 3), (n) & 7)

#define SYS_AMEVTYPE1_EL0(n)		SYS_AM_EL0(14 + ((n) >> 3), (n) & 7)

#define SYS_AMEVTYPER1_EL0(n)		SYS_AM_EL0(14 + ((n) >> 3), (n) & 7)



/* AMU v1: Fixed (architecturally defined) activity monitors */

#define SYS_AMEVCNTR0_CORE_EL0		SYS_AMEVCNTR0_EL0(0)

arch/arm64/kvm/sys_regs.c

+34 −34
Original line number Diff line number Diff line
@@ -1024,9 +1024,9 @@ static bool access_amu(struct kvm_vcpu *vcpu, struct sys_reg_params *p, 


/* Macro to expand the AMU counter and type registers*/

#define AMU_AMEVCNTR0_EL0(n) { SYS_DESC(SYS_AMEVCNTR0_EL0(n)), access_amu }

#define AMU_AMEVTYPE0_EL0(n) { SYS_DESC(SYS_AMEVTYPE0_EL0(n)), access_amu }

#define AMU_AMEVTYPER0_EL0(n) { SYS_DESC(SYS_AMEVTYPER0_EL0(n)), access_amu }

#define AMU_AMEVCNTR1_EL0(n) { SYS_DESC(SYS_AMEVCNTR1_EL0(n)), access_amu }

#define AMU_AMEVTYPE1_EL0(n) { SYS_DESC(SYS_AMEVTYPE1_EL0(n)), access_amu }

#define AMU_AMEVTYPER1_EL0(n) { SYS_DESC(SYS_AMEVTYPER1_EL0(n)), access_amu }



static bool trap_ptrauth(struct kvm_vcpu *vcpu,

			 struct sys_reg_params *p,
@@ -1629,22 +1629,22 @@ static const struct sys_reg_desc sys_reg_descs[] = { 
	AMU_AMEVCNTR0_EL0(13),

	AMU_AMEVCNTR0_EL0(14),

	AMU_AMEVCNTR0_EL0(15),

	AMU_AMEVTYPE0_EL0(0),

	AMU_AMEVTYPE0_EL0(1),

	AMU_AMEVTYPE0_EL0(2),

	AMU_AMEVTYPE0_EL0(3),

	AMU_AMEVTYPE0_EL0(4),

	AMU_AMEVTYPE0_EL0(5),

	AMU_AMEVTYPE0_EL0(6),

	AMU_AMEVTYPE0_EL0(7),

	AMU_AMEVTYPE0_EL0(8),

	AMU_AMEVTYPE0_EL0(9),

	AMU_AMEVTYPE0_EL0(10),

	AMU_AMEVTYPE0_EL0(11),

	AMU_AMEVTYPE0_EL0(12),

	AMU_AMEVTYPE0_EL0(13),

	AMU_AMEVTYPE0_EL0(14),

	AMU_AMEVTYPE0_EL0(15),

	AMU_AMEVTYPER0_EL0(0),

	AMU_AMEVTYPER0_EL0(1),

	AMU_AMEVTYPER0_EL0(2),

	AMU_AMEVTYPER0_EL0(3),

	AMU_AMEVTYPER0_EL0(4),

	AMU_AMEVTYPER0_EL0(5),

	AMU_AMEVTYPER0_EL0(6),

	AMU_AMEVTYPER0_EL0(7),

	AMU_AMEVTYPER0_EL0(8),

	AMU_AMEVTYPER0_EL0(9),

	AMU_AMEVTYPER0_EL0(10),

	AMU_AMEVTYPER0_EL0(11),

	AMU_AMEVTYPER0_EL0(12),

	AMU_AMEVTYPER0_EL0(13),

	AMU_AMEVTYPER0_EL0(14),

	AMU_AMEVTYPER0_EL0(15),

	AMU_AMEVCNTR1_EL0(0),

	AMU_AMEVCNTR1_EL0(1),

	AMU_AMEVCNTR1_EL0(2),
@@ -1661,22 +1661,22 @@ static const struct sys_reg_desc sys_reg_descs[] = { 
	AMU_AMEVCNTR1_EL0(13),

	AMU_AMEVCNTR1_EL0(14),

	AMU_AMEVCNTR1_EL0(15),

	AMU_AMEVTYPE1_EL0(0),

	AMU_AMEVTYPE1_EL0(1),

	AMU_AMEVTYPE1_EL0(2),

	AMU_AMEVTYPE1_EL0(3),

	AMU_AMEVTYPE1_EL0(4),

	AMU_AMEVTYPE1_EL0(5),

	AMU_AMEVTYPE1_EL0(6),

	AMU_AMEVTYPE1_EL0(7),

	AMU_AMEVTYPE1_EL0(8),

	AMU_AMEVTYPE1_EL0(9),

	AMU_AMEVTYPE1_EL0(10),

	AMU_AMEVTYPE1_EL0(11),

	AMU_AMEVTYPE1_EL0(12),

	AMU_AMEVTYPE1_EL0(13),

	AMU_AMEVTYPE1_EL0(14),

	AMU_AMEVTYPE1_EL0(15),

	AMU_AMEVTYPER1_EL0(0),

	AMU_AMEVTYPER1_EL0(1),

	AMU_AMEVTYPER1_EL0(2),

	AMU_AMEVTYPER1_EL0(3),

	AMU_AMEVTYPER1_EL0(4),

	AMU_AMEVTYPER1_EL0(5),

	AMU_AMEVTYPER1_EL0(6),

	AMU_AMEVTYPER1_EL0(7),

	AMU_AMEVTYPER1_EL0(8),

	AMU_AMEVTYPER1_EL0(9),

	AMU_AMEVTYPER1_EL0(10),

	AMU_AMEVTYPER1_EL0(11),

	AMU_AMEVTYPER1_EL0(12),

	AMU_AMEVTYPER1_EL0(13),

	AMU_AMEVTYPER1_EL0(14),

	AMU_AMEVTYPER1_EL0(15),



	{ SYS_DESC(SYS_CNTP_TVAL_EL0), access_arch_timer },

	{ SYS_DESC(SYS_CNTP_CTL_EL0), access_arch_timer },

CRA Git | Maintained and supported by SUSTech CRA and CCSE