[ 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
Status in newer kernel trees: 6.14.y | Not found 6.13.y | Not found
Note: The patch differs from the upstream commit: --- 1: 858c7bfcb35e1 ! 1: f5de0f647be12 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: @@ arch/arm64/include/asm/el2_setup.h +.Lskip_fgt2_@: +.endm + - .macro __init_el2_gcs - mrs_s x1, SYS_ID_AA64PFR1_EL1 - ubfx x1, x1, #ID_AA64PFR1_EL1_GCS_SHIFT, #4 + .macro __init_el2_nvhe_prepare_eret + mov x0, #INIT_PSTATE_EL1 + msr spsr_el2, x0 @@ __init_el2_nvhe_idregs __init_el2_cptr __init_el2_fgt + __init_el2_fgt2 - __init_el2_gcs .endm
+ #ifndef __KVM_NVHE_HYPERVISOR__ + + ## arch/arm64/tools/sysreg ## +@@ arch/arm64/tools/sysreg: UnsignedEnum 11:8 PMUVer + 0b0110 V3P5 + 0b0111 V3P7 + 0b1000 V3P8 ++ 0b1001 V3P9 + 0b1111 IMP_DEF + EndEnum + UnsignedEnum 7:4 TraceVer ---
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-6.13.y | Success | Success |