mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 08:26:59 +00:00
perf: arm_spe: Support new SPEv1.2/v8.7 'not taken' event
Arm SPEv1.2 (Armv8.7/v9.2) adds a new event, 'not taken', in bit 6 of the PMSEVFR_EL1 register. Update arm_spe_pmsevfr_res0() to support the additional event. 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-6-327f860daf28@kernel.org Signed-off-by: Will Deacon <will@kernel.org>
This commit is contained in:
parent
05e4c88e2b
commit
4998897b1e
2 changed files with 5 additions and 1 deletions
|
@ -221,6 +221,8 @@
|
||||||
BIT_ULL(6) | BIT_ULL(4) | BIT_ULL(2) | BIT_ULL(0))
|
BIT_ULL(6) | BIT_ULL(4) | BIT_ULL(2) | BIT_ULL(0))
|
||||||
#define PMSEVFR_EL1_RES0_V1P1 \
|
#define PMSEVFR_EL1_RES0_V1P1 \
|
||||||
(PMSEVFR_EL1_RES0_IMP & ~(BIT_ULL(18) | BIT_ULL(17) | BIT_ULL(11)))
|
(PMSEVFR_EL1_RES0_IMP & ~(BIT_ULL(18) | BIT_ULL(17) | BIT_ULL(11)))
|
||||||
|
#define PMSEVFR_EL1_RES0_V1P2 \
|
||||||
|
(PMSEVFR_EL1_RES0_V1P1 & ~BIT_ULL(6))
|
||||||
|
|
||||||
/* Buffer error reporting */
|
/* Buffer error reporting */
|
||||||
#define PMBSR_EL1_FAULT_FSC_SHIFT PMBSR_EL1_MSS_SHIFT
|
#define PMBSR_EL1_FAULT_FSC_SHIFT PMBSR_EL1_MSS_SHIFT
|
||||||
|
|
|
@ -677,9 +677,11 @@ static u64 arm_spe_pmsevfr_res0(u16 pmsver)
|
||||||
case ID_AA64DFR0_EL1_PMSVer_IMP:
|
case ID_AA64DFR0_EL1_PMSVer_IMP:
|
||||||
return PMSEVFR_EL1_RES0_IMP;
|
return PMSEVFR_EL1_RES0_IMP;
|
||||||
case ID_AA64DFR0_EL1_PMSVer_V1P1:
|
case ID_AA64DFR0_EL1_PMSVer_V1P1:
|
||||||
|
return PMSEVFR_EL1_RES0_V1P1;
|
||||||
|
case ID_AA64DFR0_EL1_PMSVer_V1P2:
|
||||||
/* Return the highest version we support in default */
|
/* Return the highest version we support in default */
|
||||||
default:
|
default:
|
||||||
return PMSEVFR_EL1_RES0_V1P1;
|
return PMSEVFR_EL1_RES0_V1P2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue