diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-02-09 23:08:37 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-02-09 23:08:37 +0100 |
| commit | 397da2d0ab0d1398242622d80a74df7245395c63 (patch) | |
| tree | 51e01a67c653c67108f65d063b8b9cbfacf0b1a7 /arch/arm64/mm/proc-macros.S | |
| parent | b8cb3750ce94d7610934465263850dcf40736bca (diff) | |
| parent | 4dff5c7b7093b19c19d3a100f8a3ad87cb7cd9e7 (diff) | |
Merge branch 'topic/core-fixes' into for-linus
Diffstat (limited to 'arch/arm64/mm/proc-macros.S')
| -rw-r--r-- | arch/arm64/mm/proc-macros.S | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm64/mm/proc-macros.S b/arch/arm64/mm/proc-macros.S index 146bd99a7532..e6a30e1268a8 100644 --- a/arch/arm64/mm/proc-macros.S +++ b/arch/arm64/mm/proc-macros.S @@ -84,3 +84,15 @@ b.lo 9998b dsb \domain .endm + +/* + * reset_pmuserenr_el0 - reset PMUSERENR_EL0 if PMUv3 present + */ + .macro reset_pmuserenr_el0, tmpreg + mrs \tmpreg, id_aa64dfr0_el1 // Check ID_AA64DFR0_EL1 PMUVer + sbfx \tmpreg, \tmpreg, #8, #4 + cmp \tmpreg, #1 // Skip if no PMU present + b.lt 9000f + msr pmuserenr_el0, xzr // Disable PMU access from EL0 +9000: + .endm |