UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

arm64: s/AMEVTYPE/AMEVTYPER 

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

Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20200721091259.102756-1-vladimir.murzin@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
Vladimir Murzin 2020-07-21 10:12:59 +01:00 committed by Catalin Marinas
parent abb7962adc
commit 493cf9b723
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/include/asm/sysreg.h
View File

@ -421,9 +421,9 @@
*/ */
#define SYS_AMEVCNTR0_EL0(n) SYS_AM_EL0(4 + ((n) >> 3), (n) & 7) #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_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 */ /* AMU v1: Fixed (architecturally defined) activity monitors */
#define SYS_AMEVCNTR0_CORE_EL0 SYS_AMEVCNTR0_EL0(0) #define SYS_AMEVCNTR0_CORE_EL0 SYS_AMEVCNTR0_EL0(0)

68
arch/arm64/kvm/sys_regs.c
View File

@ -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*/ /* Macro to expand the AMU counter and type registers*/
#define AMU_AMEVCNTR0_EL0(n) { SYS_DESC(SYS_AMEVCNTR0_EL0(n)), access_amu } #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_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, static bool trap_ptrauth(struct kvm_vcpu *vcpu,
struct sys_reg_params *p, 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(13),
AMU_AMEVCNTR0_EL0(14), AMU_AMEVCNTR0_EL0(14),
AMU_AMEVCNTR0_EL0(15), AMU_AMEVCNTR0_EL0(15),
AMU_AMEVTYPE0_EL0(0), AMU_AMEVTYPER0_EL0(0),
AMU_AMEVTYPE0_EL0(1), AMU_AMEVTYPER0_EL0(1),
AMU_AMEVTYPE0_EL0(2), AMU_AMEVTYPER0_EL0(2),
AMU_AMEVTYPE0_EL0(3), AMU_AMEVTYPER0_EL0(3),
AMU_AMEVTYPE0_EL0(4), AMU_AMEVTYPER0_EL0(4),
AMU_AMEVTYPE0_EL0(5), AMU_AMEVTYPER0_EL0(5),
AMU_AMEVTYPE0_EL0(6), AMU_AMEVTYPER0_EL0(6),
AMU_AMEVTYPE0_EL0(7), AMU_AMEVTYPER0_EL0(7),
AMU_AMEVTYPE0_EL0(8), AMU_AMEVTYPER0_EL0(8),
AMU_AMEVTYPE0_EL0(9), AMU_AMEVTYPER0_EL0(9),
AMU_AMEVTYPE0_EL0(10), AMU_AMEVTYPER0_EL0(10),
AMU_AMEVTYPE0_EL0(11), AMU_AMEVTYPER0_EL0(11),
AMU_AMEVTYPE0_EL0(12), AMU_AMEVTYPER0_EL0(12),
AMU_AMEVTYPE0_EL0(13), AMU_AMEVTYPER0_EL0(13),
AMU_AMEVTYPE0_EL0(14), AMU_AMEVTYPER0_EL0(14),
AMU_AMEVTYPE0_EL0(15), AMU_AMEVTYPER0_EL0(15),
AMU_AMEVCNTR1_EL0(0), AMU_AMEVCNTR1_EL0(0),
AMU_AMEVCNTR1_EL0(1), AMU_AMEVCNTR1_EL0(1),
AMU_AMEVCNTR1_EL0(2), AMU_AMEVCNTR1_EL0(2),
@ -1661,22 +1661,22 @@ static const struct sys_reg_desc sys_reg_descs[] = {
AMU_AMEVCNTR1_EL0(13), AMU_AMEVCNTR1_EL0(13),
AMU_AMEVCNTR1_EL0(14), AMU_AMEVCNTR1_EL0(14),
AMU_AMEVCNTR1_EL0(15), AMU_AMEVCNTR1_EL0(15),
AMU_AMEVTYPE1_EL0(0), AMU_AMEVTYPER1_EL0(0),
AMU_AMEVTYPE1_EL0(1), AMU_AMEVTYPER1_EL0(1),
AMU_AMEVTYPE1_EL0(2), AMU_AMEVTYPER1_EL0(2),
AMU_AMEVTYPE1_EL0(3), AMU_AMEVTYPER1_EL0(3),
AMU_AMEVTYPE1_EL0(4), AMU_AMEVTYPER1_EL0(4),
AMU_AMEVTYPE1_EL0(5), AMU_AMEVTYPER1_EL0(5),
AMU_AMEVTYPE1_EL0(6), AMU_AMEVTYPER1_EL0(6),
AMU_AMEVTYPE1_EL0(7), AMU_AMEVTYPER1_EL0(7),
AMU_AMEVTYPE1_EL0(8), AMU_AMEVTYPER1_EL0(8),
AMU_AMEVTYPE1_EL0(9), AMU_AMEVTYPER1_EL0(9),
AMU_AMEVTYPE1_EL0(10), AMU_AMEVTYPER1_EL0(10),
AMU_AMEVTYPE1_EL0(11), AMU_AMEVTYPER1_EL0(11),
AMU_AMEVTYPE1_EL0(12), AMU_AMEVTYPER1_EL0(12),
AMU_AMEVTYPE1_EL0(13), AMU_AMEVTYPER1_EL0(13),
AMU_AMEVTYPE1_EL0(14), AMU_AMEVTYPER1_EL0(14),
AMU_AMEVTYPE1_EL0(15), AMU_AMEVTYPER1_EL0(15),
{ SYS_DESC(SYS_CNTP_TVAL_EL0), access_arch_timer }, { SYS_DESC(SYS_CNTP_TVAL_EL0), access_arch_timer },
{ SYS_DESC(SYS_CNTP_CTL_EL0), access_arch_timer }, { SYS_DESC(SYS_CNTP_CTL_EL0), access_arch_timer },