* [PATCH V2 6.14.y 0/7] arm64/boot: Enable EL2 requirements for FEAT_PMUv3p9
@ 2025-04-14 4:58 Anshuman Khandual
2025-04-14 4:58 ` [PATCH V2 6.14.y 1/7] arm64/sysreg: Update register fields for ID_AA64MMFR0_EL1 Anshuman Khandual
` (6 more replies)
0 siblings, 7 replies; 15+ messages in thread
From: Anshuman Khandual @ 2025-04-14 4:58 UTC (permalink / raw)
To: stable, gregkh
Cc: catalin.marinas, will, robh, mark.rutland, anshuman.khandual
This series adds fine grained trap control in EL2 required for FEAT_PMUv3p9
registers like PMICNTR_EL0, PMICFILTR_EL0, and PMUACR_EL1 which are already
being used in the kernel. This is required to prevent their EL1 access trap
into EL2.
The following commits that enabled access into FEAT_PMUv3p9 registers have
already been merged upstream from 6.12 onwards.
d8226d8cfbaf ("perf: arm_pmuv3: Add support for Armv9.4 PMU instruction counter")
0bbff9ed8165 ("perf/arm_pmuv3: Add PMUv3.9 per counter EL0 access control")
The sysreg patches in this series are required for the final patch which
fixes the actual problem.
Changes in V2:
- Replaced [] with () for upstream commit reference across patches in response
to the following warning from Sasha
https://lore.kernel.org/stable/f1153021-846b-4fb1-8c4d-9fa813f982d3@arm.com/
Anshuman Khandual (7):
arm64/sysreg: Update register fields for ID_AA64MMFR0_EL1
arm64/sysreg: Add register fields for HDFGRTR2_EL2
arm64/sysreg: Add register fields for HDFGWTR2_EL2
arm64/sysreg: Add register fields for HFGITR2_EL2
arm64/sysreg: Add register fields for HFGRTR2_EL2
arm64/sysreg: Add register fields for HFGWTR2_EL2
arm64/boot: Enable EL2 requirements for FEAT_PMUv3p9
Documentation/arch/arm64/booting.rst | 22 ++++++
arch/arm64/include/asm/el2_setup.h | 25 +++++++
arch/arm64/tools/sysreg | 103 +++++++++++++++++++++++++++
3 files changed, 150 insertions(+)
--
2.30.2
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH V2 6.14.y 1/7] arm64/sysreg: Update register fields for ID_AA64MMFR0_EL1
2025-04-14 4:58 [PATCH V2 6.14.y 0/7] arm64/boot: Enable EL2 requirements for FEAT_PMUv3p9 Anshuman Khandual
@ 2025-04-14 4:58 ` Anshuman Khandual
2025-04-14 11:09 ` Sasha Levin
2025-04-14 4:58 ` [PATCH V2 6.14.y 2/7] arm64/sysreg: Add register fields for HDFGRTR2_EL2 Anshuman Khandual
` (5 subsequent siblings)
6 siblings, 1 reply; 15+ messages in thread
From: Anshuman Khandual @ 2025-04-14 4:58 UTC (permalink / raw)
To: stable, gregkh
Cc: catalin.marinas, will, robh, mark.rutland, anshuman.khandual
This updates ID_AA64MMFR0_EL1 register fields as per the definitions based
on DDI0601 2024-12.
Cc: Will Deacon <will@kernel.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/20250203050828.1049370-2-anshuman.khandual@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit cc15f548cc77574bcd68425ae01a796659bd3705)
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
arch/arm64/tools/sysreg | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
index 762ee084b37c..13479c5a9b1b 100644
--- a/arch/arm64/tools/sysreg
+++ b/arch/arm64/tools/sysreg
@@ -1664,6 +1664,7 @@ EndEnum
UnsignedEnum 59:56 FGT
0b0000 NI
0b0001 IMP
+ 0b0010 FGT2
EndEnum
Res0 55:48
UnsignedEnum 47:44 EXS
@@ -1725,6 +1726,7 @@ Enum 3:0 PARANGE
0b0100 44
0b0101 48
0b0110 52
+ 0b0111 56
EndEnum
EndSysreg
--
2.30.2
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH V2 6.14.y 2/7] arm64/sysreg: Add register fields for HDFGRTR2_EL2
2025-04-14 4:58 [PATCH V2 6.14.y 0/7] arm64/boot: Enable EL2 requirements for FEAT_PMUv3p9 Anshuman Khandual
2025-04-14 4:58 ` [PATCH V2 6.14.y 1/7] arm64/sysreg: Update register fields for ID_AA64MMFR0_EL1 Anshuman Khandual
@ 2025-04-14 4:58 ` Anshuman Khandual
2025-04-14 11:09 ` Sasha Levin
2025-04-14 4:58 ` [PATCH V2 6.14.y 3/7] arm64/sysreg: Add register fields for HDFGWTR2_EL2 Anshuman Khandual
` (4 subsequent siblings)
6 siblings, 1 reply; 15+ messages in thread
From: Anshuman Khandual @ 2025-04-14 4:58 UTC (permalink / raw)
To: stable, gregkh
Cc: catalin.marinas, will, robh, mark.rutland, anshuman.khandual
This adds register fields for HDFGRTR2_EL2 as per the definitions based
on DDI0601 2024-12.
Cc: Will Deacon <will@kernel.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/20250203050828.1049370-3-anshuman.khandual@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 44844551670cff70a8aa5c1cde27ad1e0367e009)
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
arch/arm64/tools/sysreg | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
index 13479c5a9b1b..736c72d772de 100644
--- a/arch/arm64/tools/sysreg
+++ b/arch/arm64/tools/sysreg
@@ -2643,6 +2643,35 @@ Field 0 E0HTRE
EndSysreg
+Sysreg HDFGRTR2_EL2 3 4 3 1 0
+Res0 63:25
+Field 24 nPMBMAR_EL1
+Field 23 nMDSTEPOP_EL1
+Field 22 nTRBMPAM_EL1
+Res0 21
+Field 20 nTRCITECR_EL1
+Field 19 nPMSDSFR_EL1
+Field 18 nSPMDEVAFF_EL1
+Field 17 nSPMID
+Field 16 nSPMSCR_EL1
+Field 15 nSPMACCESSR_EL1
+Field 14 nSPMCR_EL0
+Field 13 nSPMOVS
+Field 12 nSPMINTEN
+Field 11 nSPMCNTEN
+Field 10 nSPMSELR_EL0
+Field 9 nSPMEVTYPERn_EL0
+Field 8 nSPMEVCNTRn_EL0
+Field 7 nPMSSCR_EL1
+Field 6 nPMSSDATA
+Field 5 nMDSELR_EL1
+Field 4 nPMUACR_EL1
+Field 3 nPMICFILTR_EL0
+Field 2 nPMICNTR_EL0
+Field 1 nPMIAR_EL1
+Field 0 nPMECR_EL1
+EndSysreg
+
Sysreg HDFGRTR_EL2 3 4 3 1 4
Field 63 PMBIDR_EL1
Field 62 nPMSNEVFR_EL1
--
2.30.2
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH V2 6.14.y 3/7] arm64/sysreg: Add register fields for HDFGWTR2_EL2
2025-04-14 4:58 [PATCH V2 6.14.y 0/7] arm64/boot: Enable EL2 requirements for FEAT_PMUv3p9 Anshuman Khandual
2025-04-14 4:58 ` [PATCH V2 6.14.y 1/7] arm64/sysreg: Update register fields for ID_AA64MMFR0_EL1 Anshuman Khandual
2025-04-14 4:58 ` [PATCH V2 6.14.y 2/7] arm64/sysreg: Add register fields for HDFGRTR2_EL2 Anshuman Khandual
@ 2025-04-14 4:58 ` Anshuman Khandual
2025-04-14 11:09 ` Sasha Levin
2025-04-14 4:58 ` [PATCH V2 6.14.y 4/7] arm64/sysreg: Add register fields for HFGITR2_EL2 Anshuman Khandual
` (3 subsequent siblings)
6 siblings, 1 reply; 15+ messages in thread
From: Anshuman Khandual @ 2025-04-14 4:58 UTC (permalink / raw)
To: stable, gregkh
Cc: catalin.marinas, will, robh, mark.rutland, anshuman.khandual
This adds register fields for HDFGWTR2_EL2 as per the definitions based
on DDI0601 2024-12.
Cc: Will Deacon <will@kernel.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/20250203050828.1049370-4-anshuman.khandual@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 2f1f62a1257b9d5eb98a8e161ea7d11f1678f7ad)
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
arch/arm64/tools/sysreg | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
index 736c72d772de..f1c366866c93 100644
--- a/arch/arm64/tools/sysreg
+++ b/arch/arm64/tools/sysreg
@@ -2672,6 +2672,34 @@ Field 1 nPMIAR_EL1
Field 0 nPMECR_EL1
EndSysreg
+Sysreg HDFGWTR2_EL2 3 4 3 1 1
+Res0 63:25
+Field 24 nPMBMAR_EL1
+Field 23 nMDSTEPOP_EL1
+Field 22 nTRBMPAM_EL1
+Field 21 nPMZR_EL0
+Field 20 nTRCITECR_EL1
+Field 19 nPMSDSFR_EL1
+Res0 18:17
+Field 16 nSPMSCR_EL1
+Field 15 nSPMACCESSR_EL1
+Field 14 nSPMCR_EL0
+Field 13 nSPMOVS
+Field 12 nSPMINTEN
+Field 11 nSPMCNTEN
+Field 10 nSPMSELR_EL0
+Field 9 nSPMEVTYPERn_EL0
+Field 8 nSPMEVCNTRn_EL0
+Field 7 nPMSSCR_EL1
+Res0 6
+Field 5 nMDSELR_EL1
+Field 4 nPMUACR_EL1
+Field 3 nPMICFILTR_EL0
+Field 2 nPMICNTR_EL0
+Field 1 nPMIAR_EL1
+Field 0 nPMECR_EL1
+EndSysreg
+
Sysreg HDFGRTR_EL2 3 4 3 1 4
Field 63 PMBIDR_EL1
Field 62 nPMSNEVFR_EL1
--
2.30.2
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH V2 6.14.y 4/7] arm64/sysreg: Add register fields for HFGITR2_EL2
2025-04-14 4:58 [PATCH V2 6.14.y 0/7] arm64/boot: Enable EL2 requirements for FEAT_PMUv3p9 Anshuman Khandual
` (2 preceding siblings ...)
2025-04-14 4:58 ` [PATCH V2 6.14.y 3/7] arm64/sysreg: Add register fields for HDFGWTR2_EL2 Anshuman Khandual
@ 2025-04-14 4:58 ` Anshuman Khandual
2025-04-14 11:09 ` Sasha Levin
2025-04-14 4:58 ` [PATCH V2 6.14.y 5/7] arm64/sysreg: Add register fields for HFGRTR2_EL2 Anshuman Khandual
` (2 subsequent siblings)
6 siblings, 1 reply; 15+ messages in thread
From: Anshuman Khandual @ 2025-04-14 4:58 UTC (permalink / raw)
To: stable, gregkh
Cc: catalin.marinas, will, robh, mark.rutland, anshuman.khandual
This adds register fields for HFGITR2_EL2 as per the definitions based
on DDI0601 2024-12.
Cc: Will Deacon <will@kernel.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/20250203050828.1049370-5-anshuman.khandual@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 9401476f17747586a8bfb29abfdf5ade7a8bceef)
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
arch/arm64/tools/sysreg | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
index f1c366866c93..0008ff35a655 100644
--- a/arch/arm64/tools/sysreg
+++ b/arch/arm64/tools/sysreg
@@ -2872,6 +2872,12 @@ Field 1 AMEVCNTR00_EL0
Field 0 AMCNTEN0
EndSysreg
+Sysreg HFGITR2_EL2 3 4 3 1 7
+Res0 63:2
+Field 1 nDCCIVAPS
+Field 0 TSBCSYNC
+EndSysreg
+
Sysreg ZCR_EL2 3 4 1 2 0
Fields ZCR_ELx
EndSysreg
--
2.30.2
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH V2 6.14.y 5/7] arm64/sysreg: Add register fields for HFGRTR2_EL2
2025-04-14 4:58 [PATCH V2 6.14.y 0/7] arm64/boot: Enable EL2 requirements for FEAT_PMUv3p9 Anshuman Khandual
` (3 preceding siblings ...)
2025-04-14 4:58 ` [PATCH V2 6.14.y 4/7] arm64/sysreg: Add register fields for HFGITR2_EL2 Anshuman Khandual
@ 2025-04-14 4:58 ` Anshuman Khandual
2025-04-14 11:09 ` Sasha Levin
2025-04-14 4:58 ` [PATCH V2 6.14.y 6/7] arm64/sysreg: Add register fields for HFGWTR2_EL2 Anshuman Khandual
2025-04-14 4:58 ` [PATCH V2 6.14.y 7/7] arm64/boot: Enable EL2 requirements for FEAT_PMUv3p9 Anshuman Khandual
6 siblings, 1 reply; 15+ messages in thread
From: Anshuman Khandual @ 2025-04-14 4:58 UTC (permalink / raw)
To: stable, gregkh
Cc: catalin.marinas, will, robh, mark.rutland, anshuman.khandual
This adds register fields for HFGRTR2_EL2 as per the definitions based
on DDI0601 2024-12.
Cc: Will Deacon <will@kernel.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/20250203050828.1049370-6-anshuman.khandual@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 59236089ad5243377b6905d78e39ba4183dc35f5)
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
arch/arm64/tools/sysreg | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
index 0008ff35a655..cae085317b8c 100644
--- a/arch/arm64/tools/sysreg
+++ b/arch/arm64/tools/sysreg
@@ -2700,6 +2700,25 @@ Field 1 nPMIAR_EL1
Field 0 nPMECR_EL1
EndSysreg
+Sysreg HFGRTR2_EL2 3 4 3 1 2
+Res0 63:15
+Field 14 nACTLRALIAS_EL1
+Field 13 nACTLRMASK_EL1
+Field 12 nTCR2ALIAS_EL1
+Field 11 nTCRALIAS_EL1
+Field 10 nSCTLRALIAS2_EL1
+Field 9 nSCTLRALIAS_EL1
+Field 8 nCPACRALIAS_EL1
+Field 7 nTCR2MASK_EL1
+Field 6 nTCRMASK_EL1
+Field 5 nSCTLR2MASK_EL1
+Field 4 nSCTLRMASK_EL1
+Field 3 nCPACRMASK_EL1
+Field 2 nRCWSMASK_EL1
+Field 1 nERXGSR_EL1
+Field 0 nPFAR_EL1
+EndSysreg
+
Sysreg HDFGRTR_EL2 3 4 3 1 4
Field 63 PMBIDR_EL1
Field 62 nPMSNEVFR_EL1
--
2.30.2
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH V2 6.14.y 6/7] arm64/sysreg: Add register fields for HFGWTR2_EL2
2025-04-14 4:58 [PATCH V2 6.14.y 0/7] arm64/boot: Enable EL2 requirements for FEAT_PMUv3p9 Anshuman Khandual
` (4 preceding siblings ...)
2025-04-14 4:58 ` [PATCH V2 6.14.y 5/7] arm64/sysreg: Add register fields for HFGRTR2_EL2 Anshuman Khandual
@ 2025-04-14 4:58 ` Anshuman Khandual
2025-04-14 11:09 ` Sasha Levin
2025-04-14 4:58 ` [PATCH V2 6.14.y 7/7] arm64/boot: Enable EL2 requirements for FEAT_PMUv3p9 Anshuman Khandual
6 siblings, 1 reply; 15+ messages in thread
From: Anshuman Khandual @ 2025-04-14 4:58 UTC (permalink / raw)
To: stable, gregkh
Cc: catalin.marinas, will, robh, mark.rutland, anshuman.khandual
This adds register fields for HFGWTR2_EL2 as per the definitions based
on DDI0601 2024-12.
Cc: Will Deacon <will@kernel.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/20250203050828.1049370-7-anshuman.khandual@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit ea37be0773f04420515b8db49e50abedbaa97e23)
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
arch/arm64/tools/sysreg | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
index cae085317b8c..891fe033e1b6 100644
--- a/arch/arm64/tools/sysreg
+++ b/arch/arm64/tools/sysreg
@@ -2719,6 +2719,25 @@ Field 1 nERXGSR_EL1
Field 0 nPFAR_EL1
EndSysreg
+Sysreg HFGWTR2_EL2 3 4 3 1 3
+Res0 63:15
+Field 14 nACTLRALIAS_EL1
+Field 13 nACTLRMASK_EL1
+Field 12 nTCR2ALIAS_EL1
+Field 11 nTCRALIAS_EL1
+Field 10 nSCTLRALIAS2_EL1
+Field 9 nSCTLRALIAS_EL1
+Field 8 nCPACRALIAS_EL1
+Field 7 nTCR2MASK_EL1
+Field 6 nTCRMASK_EL1
+Field 5 nSCTLR2MASK_EL1
+Field 4 nSCTLRMASK_EL1
+Field 3 nCPACRMASK_EL1
+Field 2 nRCWSMASK_EL1
+Res0 1
+Field 0 nPFAR_EL1
+EndSysreg
+
Sysreg HDFGRTR_EL2 3 4 3 1 4
Field 63 PMBIDR_EL1
Field 62 nPMSNEVFR_EL1
--
2.30.2
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH V2 6.14.y 7/7] arm64/boot: Enable EL2 requirements for FEAT_PMUv3p9
2025-04-14 4:58 [PATCH V2 6.14.y 0/7] arm64/boot: Enable EL2 requirements for FEAT_PMUv3p9 Anshuman Khandual
` (5 preceding siblings ...)
2025-04-14 4:58 ` [PATCH V2 6.14.y 6/7] arm64/sysreg: Add register fields for HFGWTR2_EL2 Anshuman Khandual
@ 2025-04-14 4:58 ` Anshuman Khandual
2025-04-14 11:09 ` Sasha Levin
6 siblings, 1 reply; 15+ messages in thread
From: Anshuman Khandual @ 2025-04-14 4:58 UTC (permalink / raw)
To: stable, gregkh
Cc: catalin.marinas, will, robh, mark.rutland, anshuman.khandual
FEAT_PMUv3p9 registers such as PMICNTR_EL0, PMICFILTR_EL0, and PMUACR_EL1
access from EL1 requires appropriate EL2 fine grained trap configuration
via FEAT_FGT2 based trap control registers HDFGRTR2_EL2 and HDFGWTR2_EL2.
Otherwise such register accesses will result in traps into EL2.
Add a new helper __init_el2_fgt2() which initializes FEAT_FGT2 based fine
grained trap control registers HDFGRTR2_EL2 and HDFGWTR2_EL2 (setting the
bits nPMICNTR_EL0, nPMICFILTR_EL0 and nPMUACR_EL1) to enable access into
PMICNTR_EL0, PMICFILTR_EL0, and PMUACR_EL1 registers.
Also update booting.rst with SCR_EL3.FGTEn2 requirement for all FEAT_FGT2
based registers to be accessible in EL2.
Cc: Will Deacon <will@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Oliver Upton <oliver.upton@linux.dev>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-doc@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: kvmarm@lists.linux.dev
Fixes: 0bbff9ed8165 ("perf/arm_pmuv3: Add PMUv3.9 per counter EL0 access control")
Fixes: d8226d8cfbaf ("perf: arm_pmuv3: Add support for Armv9.4 PMU instruction counter")
Tested-by: Rob Herring (Arm) <robh@kernel.org>
Reviewed-by: Rob Herring (Arm) <robh@kernel.org>
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/20250227035119.2025171-1-anshuman.khandual@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 858c7bfcb35e1100b58bb63c9f562d86e09418d9)
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
Documentation/arch/arm64/booting.rst | 22 ++++++++++++++++++++++
arch/arm64/include/asm/el2_setup.h | 25 +++++++++++++++++++++++++
2 files changed, 47 insertions(+)
diff --git a/Documentation/arch/arm64/booting.rst b/Documentation/arch/arm64/booting.rst
index cad6fdc96b98..dee7b6de864f 100644
--- a/Documentation/arch/arm64/booting.rst
+++ b/Documentation/arch/arm64/booting.rst
@@ -288,6 +288,12 @@ Before jumping into the kernel, the following conditions must be met:
- SCR_EL3.FGTEn (bit 27) must be initialised to 0b1.
+ For CPUs with the Fine Grained Traps 2 (FEAT_FGT2) extension present:
+
+ - If EL3 is present and the kernel is entered at EL2:
+
+ - SCR_EL3.FGTEn2 (bit 59) must be initialised to 0b1.
+
For CPUs with support for HCRX_EL2 (FEAT_HCX) present:
- If EL3 is present and the kernel is entered at EL2:
@@ -382,6 +388,22 @@ Before jumping into the kernel, the following conditions must be met:
- SMCR_EL2.EZT0 (bit 30) must be initialised to 0b1.
+ For CPUs with the Performance Monitors Extension (FEAT_PMUv3p9):
+
+ - If EL3 is present:
+
+ - MDCR_EL3.EnPM2 (bit 7) must be initialised to 0b1.
+
+ - If the kernel is entered at EL1 and EL2 is present:
+
+ - HDFGRTR2_EL2.nPMICNTR_EL0 (bit 2) must be initialised to 0b1.
+ - HDFGRTR2_EL2.nPMICFILTR_EL0 (bit 3) must be initialised to 0b1.
+ - HDFGRTR2_EL2.nPMUACR_EL1 (bit 4) must be initialised to 0b1.
+
+ - HDFGWTR2_EL2.nPMICNTR_EL0 (bit 2) must be initialised to 0b1.
+ - HDFGWTR2_EL2.nPMICFILTR_EL0 (bit 3) must be initialised to 0b1.
+ - HDFGWTR2_EL2.nPMUACR_EL1 (bit 4) must be initialised to 0b1.
+
For CPUs with Memory Copy and Memory Set instructions (FEAT_MOPS):
- If the kernel is entered at EL1 and EL2 is present:
diff --git a/arch/arm64/include/asm/el2_setup.h b/arch/arm64/include/asm/el2_setup.h
index 555c613fd232..ebceaae3c749 100644
--- a/arch/arm64/include/asm/el2_setup.h
+++ b/arch/arm64/include/asm/el2_setup.h
@@ -259,6 +259,30 @@
.Lskip_fgt_\@:
.endm
+.macro __init_el2_fgt2
+ mrs x1, id_aa64mmfr0_el1
+ ubfx x1, x1, #ID_AA64MMFR0_EL1_FGT_SHIFT, #4
+ cmp x1, #ID_AA64MMFR0_EL1_FGT_FGT2
+ b.lt .Lskip_fgt2_\@
+
+ mov x0, xzr
+ mrs x1, id_aa64dfr0_el1
+ ubfx x1, x1, #ID_AA64DFR0_EL1_PMUVer_SHIFT, #4
+ cmp x1, #ID_AA64DFR0_EL1_PMUVer_V3P9
+ b.lt .Lskip_pmuv3p9_\@
+
+ orr x0, x0, #HDFGRTR2_EL2_nPMICNTR_EL0
+ orr x0, x0, #HDFGRTR2_EL2_nPMICFILTR_EL0
+ orr x0, x0, #HDFGRTR2_EL2_nPMUACR_EL1
+.Lskip_pmuv3p9_\@:
+ msr_s SYS_HDFGRTR2_EL2, x0
+ msr_s SYS_HDFGWTR2_EL2, x0
+ msr_s SYS_HFGRTR2_EL2, xzr
+ msr_s SYS_HFGWTR2_EL2, xzr
+ msr_s SYS_HFGITR2_EL2, xzr
+.Lskip_fgt2_\@:
+.endm
+
.macro __init_el2_gcs
mrs_s x1, SYS_ID_AA64PFR1_EL1
ubfx x1, x1, #ID_AA64PFR1_EL1_GCS_SHIFT, #4
@@ -304,6 +328,7 @@
__init_el2_nvhe_idregs
__init_el2_cptr
__init_el2_fgt
+ __init_el2_fgt2
__init_el2_gcs
.endm
--
2.30.2
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH V2 6.14.y 3/7] arm64/sysreg: Add register fields for HDFGWTR2_EL2
2025-04-14 4:58 ` [PATCH V2 6.14.y 3/7] arm64/sysreg: Add register fields for HDFGWTR2_EL2 Anshuman Khandual
@ 2025-04-14 11:09 ` Sasha Levin
0 siblings, 0 replies; 15+ messages in thread
From: Sasha Levin @ 2025-04-14 11:09 UTC (permalink / raw)
To: stable, anshuman.khandual; +Cc: Sasha Levin
[ Sasha's backport helper bot ]
Hi,
Summary of potential issues:
ℹ️ This is part 3/7 of a series
⚠️ Found matching upstream commit but patch is missing proper reference to it
Found matching upstream commit: 2f1f62a1257b9d5eb98a8e161ea7d11f1678f7ad
Note: The patch differs from the upstream commit:
---
1: 2f1f62a1257b9 ! 1: 3fadc0fbf42ee arm64/sysreg: Add register fields for HDFGWTR2_EL2
@@ Commit message
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/20250203050828.1049370-4-anshuman.khandual@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
+ (cherry picked from commit 2f1f62a1257b9d5eb98a8e161ea7d11f1678f7ad)
+ Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
## arch/arm64/tools/sysreg ##
@@ arch/arm64/tools/sysreg: Field 1 nPMIAR_EL1
---
NOTE: These results are for this patch alone. Full series testing will be
performed when all parts are received.
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.4.y | Success | Success |
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH V2 6.14.y 1/7] arm64/sysreg: Update register fields for ID_AA64MMFR0_EL1
2025-04-14 4:58 ` [PATCH V2 6.14.y 1/7] arm64/sysreg: Update register fields for ID_AA64MMFR0_EL1 Anshuman Khandual
@ 2025-04-14 11:09 ` Sasha Levin
0 siblings, 0 replies; 15+ messages in thread
From: Sasha Levin @ 2025-04-14 11:09 UTC (permalink / raw)
To: stable, anshuman.khandual; +Cc: Sasha Levin
[ Sasha's backport helper bot ]
Hi,
Summary of potential issues:
⚠️ Found matching upstream commit but patch is missing proper reference to it
Found matching upstream commit: cc15f548cc77574bcd68425ae01a796659bd3705
Note: The patch differs from the upstream commit:
---
1: cc15f548cc775 ! 1: 9582b0017ce89 arm64/sysreg: Update register fields for ID_AA64MMFR0_EL1
@@ Commit message
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/20250203050828.1049370-2-anshuman.khandual@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
+ (cherry picked from commit cc15f548cc77574bcd68425ae01a796659bd3705)
+ Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
## arch/arm64/tools/sysreg ##
@@ arch/arm64/tools/sysreg: EndEnum
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.14.y | Success | Success |
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH V2 6.14.y 4/7] arm64/sysreg: Add register fields for HFGITR2_EL2
2025-04-14 4:58 ` [PATCH V2 6.14.y 4/7] arm64/sysreg: Add register fields for HFGITR2_EL2 Anshuman Khandual
@ 2025-04-14 11:09 ` Sasha Levin
0 siblings, 0 replies; 15+ messages in thread
From: Sasha Levin @ 2025-04-14 11:09 UTC (permalink / raw)
To: stable, anshuman.khandual; +Cc: Sasha Levin
[ Sasha's backport helper bot ]
Hi,
Summary of potential issues:
ℹ️ This is part 4/7 of a series
⚠️ Found matching upstream commit but patch is missing proper reference to it
Found matching upstream commit: 9401476f17747586a8bfb29abfdf5ade7a8bceef
Note: The patch differs from the upstream commit:
---
1: 9401476f17747 ! 1: c12f9691c2424 arm64/sysreg: Add register fields for HFGITR2_EL2
@@ Commit message
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/20250203050828.1049370-5-anshuman.khandual@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
+ (cherry picked from commit 9401476f17747586a8bfb29abfdf5ade7a8bceef)
+ Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
## arch/arm64/tools/sysreg ##
@@ arch/arm64/tools/sysreg: Field 1 AMEVCNTR00_EL0
---
NOTE: These results are for this patch alone. Full series testing will be
performed when all parts are received.
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.4.y | Success | Success |
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH V2 6.14.y 6/7] arm64/sysreg: Add register fields for HFGWTR2_EL2
2025-04-14 4:58 ` [PATCH V2 6.14.y 6/7] arm64/sysreg: Add register fields for HFGWTR2_EL2 Anshuman Khandual
@ 2025-04-14 11:09 ` Sasha Levin
0 siblings, 0 replies; 15+ messages in thread
From: Sasha Levin @ 2025-04-14 11:09 UTC (permalink / raw)
To: stable, anshuman.khandual; +Cc: Sasha Levin
[ Sasha's backport helper bot ]
Hi,
Summary of potential issues:
ℹ️ This is part 6/7 of a series
⚠️ Found matching upstream commit but patch is missing proper reference to it
Found matching upstream commit: ea37be0773f04420515b8db49e50abedbaa97e23
Note: The patch differs from the upstream commit:
---
1: ea37be0773f04 ! 1: a4f04ab50798f arm64/sysreg: Add register fields for HFGWTR2_EL2
@@ Commit message
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/20250203050828.1049370-7-anshuman.khandual@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
+ (cherry picked from commit ea37be0773f04420515b8db49e50abedbaa97e23)
+ Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
## arch/arm64/tools/sysreg ##
@@ arch/arm64/tools/sysreg: Field 1 nERXGSR_EL1
---
NOTE: These results are for this patch alone. Full series testing will be
performed when all parts are received.
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.4.y | Success | Success |
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH V2 6.14.y 7/7] arm64/boot: Enable EL2 requirements for FEAT_PMUv3p9
2025-04-14 4:58 ` [PATCH V2 6.14.y 7/7] arm64/boot: Enable EL2 requirements for FEAT_PMUv3p9 Anshuman Khandual
@ 2025-04-14 11:09 ` Sasha Levin
0 siblings, 0 replies; 15+ messages in thread
From: Sasha Levin @ 2025-04-14 11:09 UTC (permalink / raw)
To: stable, anshuman.khandual; +Cc: Sasha Levin
[ Sasha's backport helper bot ]
Hi,
Summary of potential issues:
ℹ️ This is part 7/7 of a series
⚠️ Found matching upstream commit but patch is missing proper reference to it
Found matching upstream commit: 858c7bfcb35e1100b58bb63c9f562d86e09418d9
Note: The patch differs from the upstream commit:
---
1: 858c7bfcb35e1 ! 1: b879a2d018d84 arm64/boot: Enable EL2 requirements for FEAT_PMUv3p9
@@ Commit message
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/20250227035119.2025171-1-anshuman.khandual@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
+ (cherry picked from commit 858c7bfcb35e1100b58bb63c9f562d86e09418d9)
+ Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
## Documentation/arch/arm64/booting.rst ##
@@ Documentation/arch/arm64/booting.rst: Before jumping into the kernel, the following conditions must be met:
---
NOTE: These results are for this patch alone. Full series testing will be
performed when all parts are received.
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.4.y | Success | Success |
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH V2 6.14.y 5/7] arm64/sysreg: Add register fields for HFGRTR2_EL2
2025-04-14 4:58 ` [PATCH V2 6.14.y 5/7] arm64/sysreg: Add register fields for HFGRTR2_EL2 Anshuman Khandual
@ 2025-04-14 11:09 ` Sasha Levin
0 siblings, 0 replies; 15+ messages in thread
From: Sasha Levin @ 2025-04-14 11:09 UTC (permalink / raw)
To: stable, anshuman.khandual; +Cc: Sasha Levin
[ Sasha's backport helper bot ]
Hi,
Summary of potential issues:
ℹ️ This is part 5/7 of a series
⚠️ Found matching upstream commit but patch is missing proper reference to it
Found matching upstream commit: 59236089ad5243377b6905d78e39ba4183dc35f5
Note: The patch differs from the upstream commit:
---
1: 59236089ad524 ! 1: 2316dae089c5b arm64/sysreg: Add register fields for HFGRTR2_EL2
@@ Commit message
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/20250203050828.1049370-6-anshuman.khandual@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
+ (cherry picked from commit 59236089ad5243377b6905d78e39ba4183dc35f5)
+ Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
## arch/arm64/tools/sysreg ##
@@ arch/arm64/tools/sysreg: Field 1 nPMIAR_EL1
---
NOTE: These results are for this patch alone. Full series testing will be
performed when all parts are received.
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.4.y | Success | Success |
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH V2 6.14.y 2/7] arm64/sysreg: Add register fields for HDFGRTR2_EL2
2025-04-14 4:58 ` [PATCH V2 6.14.y 2/7] arm64/sysreg: Add register fields for HDFGRTR2_EL2 Anshuman Khandual
@ 2025-04-14 11:09 ` Sasha Levin
0 siblings, 0 replies; 15+ messages in thread
From: Sasha Levin @ 2025-04-14 11:09 UTC (permalink / raw)
To: stable, anshuman.khandual; +Cc: Sasha Levin
[ Sasha's backport helper bot ]
Hi,
Summary of potential issues:
ℹ️ This is part 2/7 of a series
⚠️ Found matching upstream commit but patch is missing proper reference to it
Found matching upstream commit: 44844551670cff70a8aa5c1cde27ad1e0367e009
Note: The patch differs from the upstream commit:
---
1: 44844551670cf ! 1: 461a657e32a15 arm64/sysreg: Add register fields for HDFGRTR2_EL2
@@ Commit message
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/20250203050828.1049370-3-anshuman.khandual@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
+ (cherry picked from commit 44844551670cff70a8aa5c1cde27ad1e0367e009)
+ Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
## arch/arm64/tools/sysreg ##
@@ arch/arm64/tools/sysreg: Field 0 E0HTRE
---
NOTE: These results are for this patch alone. Full series testing will be
performed when all parts are received.
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.4.y | Success | Success |
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2025-04-14 11:09 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-04-14 4:58 [PATCH V2 6.14.y 0/7] arm64/boot: Enable EL2 requirements for FEAT_PMUv3p9 Anshuman Khandual
2025-04-14 4:58 ` [PATCH V2 6.14.y 1/7] arm64/sysreg: Update register fields for ID_AA64MMFR0_EL1 Anshuman Khandual
2025-04-14 11:09 ` Sasha Levin
2025-04-14 4:58 ` [PATCH V2 6.14.y 2/7] arm64/sysreg: Add register fields for HDFGRTR2_EL2 Anshuman Khandual
2025-04-14 11:09 ` Sasha Levin
2025-04-14 4:58 ` [PATCH V2 6.14.y 3/7] arm64/sysreg: Add register fields for HDFGWTR2_EL2 Anshuman Khandual
2025-04-14 11:09 ` Sasha Levin
2025-04-14 4:58 ` [PATCH V2 6.14.y 4/7] arm64/sysreg: Add register fields for HFGITR2_EL2 Anshuman Khandual
2025-04-14 11:09 ` Sasha Levin
2025-04-14 4:58 ` [PATCH V2 6.14.y 5/7] arm64/sysreg: Add register fields for HFGRTR2_EL2 Anshuman Khandual
2025-04-14 11:09 ` Sasha Levin
2025-04-14 4:58 ` [PATCH V2 6.14.y 6/7] arm64/sysreg: Add register fields for HFGWTR2_EL2 Anshuman Khandual
2025-04-14 11:09 ` Sasha Levin
2025-04-14 4:58 ` [PATCH V2 6.14.y 7/7] arm64/boot: Enable EL2 requirements for FEAT_PMUv3p9 Anshuman Khandual
2025-04-14 11:09 ` Sasha Levin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).