diff options
| author | Manish V Badarkhe <manish.badarkhe@arm.com> | 2026-08-17 08:40:09 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2026-08-17 08:40:09 +0000 |
| commit | c4e0b993bf8dbda44b42ff6df063872de703340c (patch) | |
| tree | c2803e5c281cc364be58f150fd0cc7db6ee06d3a /include | |
| parent | 29ba042c84420b03e21b05e5ede34a0bf53a5cbc (diff) | |
| parent | f6d627e334c1c913b477c4071ea44515cd310967 (diff) | |
| download | arm-trusted-firmware-c4e0b993bf8dbda44b42ff6df063872de703340c.tar.gz arm-trusted-firmware-c4e0b993bf8dbda44b42ff6df063872de703340c.zip | |
Merge changes from topic "bk/fien" into integration
* changes:
fix(smccc): report SCR_EL3.FIEN for FEATURE_AVAILABILITY
fix(smccc): always report SCR_EL3.TERR for FEATURE_AVAILABILITY
Diffstat (limited to 'include')
| -rw-r--r-- | include/services/arm_arch_svc.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/services/arm_arch_svc.h b/include/services/arm_arch_svc.h index 5f44539f8..b903549ce 100644 --- a/include/services/arm_arch_svc.h +++ b/include/services/arm_arch_svc.h @@ -140,6 +140,12 @@ #define SCR_FEAT_RAS (0) #endif +#if !FAULT_INJECTION_SUPPORT +#define SCR_FEAT_RAS_2 SCR_FIEN_BIT +#else +#define SCR_FEAT_RAS_2 (0) +#endif + #if ENABLE_FEAT_MEC #define SCR_FEAT_MEC SCR_MECEn_BIT #else @@ -234,7 +240,8 @@ SCR_FEAT_MTE2 | \ SCR_FEAT_CSV2_2 | \ SCR_APK_BIT | /* FEAT_Pauth */ \ - SCR_FEAT_RAS | \ + SCR_TERR_BIT | \ + SCR_FIEN_BIT | \ SCR_FEAT_AIE | \ SCR_FEAT_PFAR | \ SCR_FEAT_IDTE3 | \ @@ -244,6 +251,7 @@ SCR_PLAT_FEATS) #define SCR_EL3_FLIPPED ( \ SCR_FEAT_RAS | \ + SCR_FEAT_RAS_2 | \ SCR_PLAT_FLIPPED) #define SCR_EL3_IGNORED ( \ SCR_API_BIT | \ |