diff options
| author | Madhukar Pappireddy <madhukar.pappireddy@arm.com> | 2022-08-18 19:29:35 +0200 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2022-08-18 19:29:35 +0200 |
| commit | f34b9477fdc940bf9c263a2a3c21a87536afb1c6 (patch) | |
| tree | 75bcafb9019d5a7490acdab80ff00fead1ae8372 /include | |
| parent | 29039db03dc0db29bd53e6380b9e2f06cde238c2 (diff) | |
| parent | 9303f4d1c196a1a193e6c49d19edaff41bb71bfd (diff) | |
Merge "feat(rng_trap): add tests for FEAT_RNG_TRAP"
Diffstat (limited to 'include')
| -rw-r--r-- | include/common/test_helpers.h | 9 | ||||
| -rw-r--r-- | include/lib/aarch64/arch.h | 6 | ||||
| -rw-r--r-- | include/lib/aarch64/arch_features.h | 7 | ||||
| -rw-r--r-- | include/lib/aarch64/arch_helpers.h | 4 |
4 files changed, 26 insertions, 0 deletions
diff --git a/include/common/test_helpers.h b/include/common/test_helpers.h index c51c785..b1349dd 100644 --- a/include/common/test_helpers.h +++ b/include/common/test_helpers.h @@ -334,6 +334,15 @@ typedef test_result_t (*test_function_arg_t)(void *arg); } \ } while (false) +#define SKIP_TEST_IF_RNG_TRAP_NOT_SUPPORTED() \ + do { \ + if (!is_feat_rng_trap_present()) { \ + tftf_testcase_printf("ARMv8.5-RNG_TRAP not" \ + "supported\n"); \ + return TEST_RESULT_SKIPPED; \ + } \ + } while (false) + /* Helper macro to verify if system suspend API is supported */ #define is_psci_sys_susp_supported() \ (tftf_get_psci_feature_info(SMC_PSCI_SYSTEM_SUSPEND) \ diff --git a/include/lib/aarch64/arch.h b/include/lib/aarch64/arch.h index c5c94fb..0c36785 100644 --- a/include/lib/aarch64/arch.h +++ b/include/lib/aarch64/arch.h @@ -292,6 +292,12 @@ #define ID_AA64PFR1_EL1_MTE_SHIFT U(8) #define ID_AA64PFR1_EL1_MTE_MASK ULL(0xf) +#define ID_AA64PFR1_EL1_RNDR_TRAP_SHIFT U(28) +#define ID_AA64PFR1_EL1_RNDR_TRAP_MASK ULL(0xf) + +#define ID_AA64PFR1_EL1_RNG_TRAP_SUPPORTED ULL(0x1) +#define ID_AA64PFR1_EL1_RNG_TRAP_NOT_SUPPORTED ULL(0x0) + #define MTE_UNIMPLEMENTED ULL(0) #define MTE_IMPLEMENTED_EL0 ULL(1) /* MTE is only implemented at EL0 */ #define MTE_IMPLEMENTED_ELX ULL(2) /* MTE is implemented at all ELs */ diff --git a/include/lib/aarch64/arch_features.h b/include/lib/aarch64/arch_features.h index 46d12c9..1d90138 100644 --- a/include/lib/aarch64/arch_features.h +++ b/include/lib/aarch64/arch_features.h @@ -166,4 +166,11 @@ static inline bool get_feat_wfxt_present(void) ID_AA64ISAR2_WFXT_MASK) == ID_AA64ISAR2_WFXT_SUPPORTED); } +static inline bool is_feat_rng_trap_present(void) +{ + return (((read_id_aa64pfr1_el1() >> ID_AA64PFR1_EL1_RNDR_TRAP_SHIFT) & + ID_AA64PFR1_EL1_RNDR_TRAP_MASK) + == ID_AA64PFR1_EL1_RNG_TRAP_SUPPORTED); +} + #endif /* ARCH_FEATURES_H */ diff --git a/include/lib/aarch64/arch_helpers.h b/include/lib/aarch64/arch_helpers.h index b366cdd..e10ddab 100644 --- a/include/lib/aarch64/arch_helpers.h +++ b/include/lib/aarch64/arch_helpers.h @@ -417,6 +417,10 @@ DEFINE_SYSREG_RW_FUNCS(pmccfiltr_el0) DEFINE_SYSREG_RW_FUNCS(pmevtyper0_el0) DEFINE_SYSREG_READ_FUNC(pmevcntr0_el0) +/* Armv8.5 FEAT_RNG Registers */ +DEFINE_SYSREG_READ_FUNC(rndr) +DEFINE_SYSREG_READ_FUNC(rndrrs) + /* GICv3 System Registers */ DEFINE_RENAME_SYSREG_RW_FUNCS(icc_sre_el1, ICC_SRE_EL1) |