mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 22:54:01 +00:00
perf: arm_spe: Use feature numbering for PMSEVFR_EL1 defines
Similar to commit 121a8fc088
("arm64/sysreg: Use feature numbering for
PMU and SPE revisions") use feature numbering instead of architecture
versions for the PMSEVFR_EL1 Res0 defines.
Tested-by: James Clark <james.clark@arm.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/20220825-arm-spe-v8-7-v4-1-327f860daf28@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>
This commit is contained in:
parent
093cf1f62f
commit
e080477a05
2 changed files with 5 additions and 5 deletions
|
@ -273,11 +273,11 @@
|
|||
#define SYS_PMSFCR_EL1_ST_SHIFT 18
|
||||
|
||||
#define SYS_PMSEVFR_EL1 sys_reg(3, 0, 9, 9, 5)
|
||||
#define SYS_PMSEVFR_EL1_RES0_8_2 \
|
||||
#define PMSEVFR_EL1_RES0_IMP \
|
||||
(GENMASK_ULL(47, 32) | GENMASK_ULL(23, 16) | GENMASK_ULL(11, 8) |\
|
||||
BIT_ULL(6) | BIT_ULL(4) | BIT_ULL(2) | BIT_ULL(0))
|
||||
#define SYS_PMSEVFR_EL1_RES0_8_3 \
|
||||
(SYS_PMSEVFR_EL1_RES0_8_2 & ~(BIT_ULL(18) | BIT_ULL(17) | BIT_ULL(11)))
|
||||
#define PMSEVFR_EL1_RES0_V1P1 \
|
||||
(PMSEVFR_EL1_RES0_IMP & ~(BIT_ULL(18) | BIT_ULL(17) | BIT_ULL(11)))
|
||||
|
||||
#define SYS_PMSLATFR_EL1 sys_reg(3, 0, 9, 9, 6)
|
||||
#define SYS_PMSLATFR_EL1_MINLAT_SHIFT 0
|
||||
|
|
|
@ -677,11 +677,11 @@ static u64 arm_spe_pmsevfr_res0(u16 pmsver)
|
|||
{
|
||||
switch (pmsver) {
|
||||
case ID_AA64DFR0_EL1_PMSVer_IMP:
|
||||
return SYS_PMSEVFR_EL1_RES0_8_2;
|
||||
return PMSEVFR_EL1_RES0_IMP;
|
||||
case ID_AA64DFR0_EL1_PMSVer_V1P1:
|
||||
/* Return the highest version we support in default */
|
||||
default:
|
||||
return SYS_PMSEVFR_EL1_RES0_8_3;
|
||||
return PMSEVFR_EL1_RES0_V1P1;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue