diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2019-10-07 12:06:08 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-10-07 12:06:08 +0000 |
| commit | 80003d86a60272ef82b8bca3c71ee358222b825b (patch) | |
| tree | 66e7fabd4dbde3bfa8f36ec0febb96d205752972 /include | |
| parent | 25792ce44332e7d043db2cc2451eb57fb5db7b09 (diff) | |
| parent | 2a7adf2567aa103ced4a9a9b3ef8344935716d25 (diff) | |
Merge "Explicitly disable the SPME bit in MDCR_EL3" into integration
Diffstat (limited to 'include')
| -rw-r--r-- | include/arch/aarch64/el3_common_macros.S | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/arch/aarch64/el3_common_macros.S b/include/arch/aarch64/el3_common_macros.S index ee20d5b2..378e827c 100644 --- a/include/arch/aarch64/el3_common_macros.S +++ b/include/arch/aarch64/el3_common_macros.S @@ -113,11 +113,18 @@ * prohibited in Secure state. This bit is RES0 in versions of the * architecture earlier than ARMv8.5, setting it to 1 doesn't have any * effect on them. + * + * MDCR_EL3.SPME: Set to zero so that event counting by the programmable + * counters PMEVCNTR<n>_EL0 is prohibited in Secure state. If ARMv8.2 + * Debug is not implemented this bit does not have any effect on the + * counters unless there is support for the implementation defined + * authentication interface ExternalSecureNoninvasiveDebugEnabled(). * --------------------------------------------------------------------- */ mov_imm x0, ((MDCR_EL3_RESET_VAL | MDCR_SDD_BIT | \ MDCR_SPD32(MDCR_SPD32_DISABLE) | MDCR_SCCD_BIT) & \ - ~(MDCR_TDOSA_BIT | MDCR_TDA_BIT | MDCR_TPM_BIT)) + ~(MDCR_SPME_BIT | MDCR_TDOSA_BIT | MDCR_TDA_BIT | \ + MDCR_TPM_BIT)) msr mdcr_el3, x0 |