tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ArmPlatformPkg,MdePkg: Rename AARCH64 CPACR_CP_FULL_ACCESS 

CP_FULL_ACCESS is a misnomer, we only enable access to SIMD/FP state,
and although the register's mnemonic is CPACR_EL1, its full name is
"Architectural Feature Access Control Register", with AArch64 having no
coprocessors like AArch32 did, so the "CP" is also not appropriate.
Rename it to show it's the default value we use on entry, and define it
in terms of the existing CPACR_FPEN_FULL rather than a magic constant
with the same value to more clearly document that fact. Also update
comments to reflect all this (including the CPTR_EL2 case).

Continuous-integration-options: PatchCheck.ignore-multi-package
Signed-off-by: Jessica Clarke <jrtc27@jrtc27.com>
This commit is contained in:
Jessica Clarke 2024-11-06 21:26:01 +00:00 committed by mergify[bot]
parent 6f07aeb49c
commit ef35863880
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ArmPlatformPkg/Sec/AArch64/Helper.S
View File

@ -12,8 +12,8 @@
ASM_FUNC(SetupExceptionLevel1) ASM_FUNC(SetupExceptionLevel1)
mov x5, x30 // Save LR mov x5, x30 // Save LR
mov x0, #CPACR_CP_FULL_ACCESS mov x0, #CPACR_DEFAULT
bl ASM_PFX(ArmWriteCpacr) // Disable copro traps to EL1 bl ASM_PFX(ArmWriteCpacr) // Enable architectural features
ret x5 ret x5
@ -30,7 +30,7 @@ ASM_FUNC(SetupExceptionLevel2)
// NB: We assume that we have not been entered on VHE systems with // NB: We assume that we have not been entered on VHE systems with
// HCR_EL2.E2H set. // HCR_EL2.E2H set.
msr cptr_el2, xzr // Disable copro traps to EL2 msr cptr_el2, xzr // Enable architectural features
// Enable Timer access for non-secure EL1 and EL0 // Enable Timer access for non-secure EL1 and EL0
// The cnthctl_el2 register bits are architecturally // The cnthctl_el2 register bits are architecturally

8
MdePkg/Include/AArch64/AArch64.h
View File

@ -16,10 +16,10 @@
#define ARM_ARCH_EXCEPTION_IRQ EXCEPT_AARCH64_IRQ #define ARM_ARCH_EXCEPTION_IRQ EXCEPT_AARCH64_IRQ
// CPACR - Coprocessor Access Control Register definitions // CPACR - Coprocessor Access Control Register definitions
#define CPACR_TTA_EN (1UL << 28) #define CPACR_TTA_EN (1UL << 28)
#define CPACR_FPEN_EL1 (1UL << 20) #define CPACR_FPEN_EL1 (1UL << 20)
#define CPACR_FPEN_FULL (3UL << 20) #define CPACR_FPEN_FULL (3UL << 20)
#define CPACR_CP_FULL_ACCESS 0x300000 #define CPACR_DEFAULT CPACR_FPEN_FULL
// Coprocessor Trap Register (CPTR) // Coprocessor Trap Register (CPTR)
#define AARCH64_CPTR_TFP (1 << 10) #define AARCH64_CPTR_TFP (1 << 10)