andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix MTE support from causing unused variable warnings" into integration

This commit is contained in:
Soby Mathew 2019-09-27 09:46:59 +00:00 committed by TrustedFirmware Code Review
parent 17b0bb6cf5 019b03a300
commit 95982ffc98
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/el3_runtime/aarch64/context_mgmt.c
View File

@ -142,11 +142,11 @@ void cm_setup_context(cpu_context_t *ctx, const entry_point_info_t *ep)
* world, and only for the secure world when CTX_INCLUDE_MTE_REGS is * world, and only for the secure world when CTX_INCLUDE_MTE_REGS is
* set. * set.
*/ */
unsigned int mte = get_armv8_5_mte_support();
#if CTX_INCLUDE_MTE_REGS #if CTX_INCLUDE_MTE_REGS
assert(mte == MTE_IMPLEMENTED_ELX); assert(get_armv8_5_mte_support() == MTE_IMPLEMENTED_ELX);
scr_el3 |= SCR_ATA_BIT; scr_el3 |= SCR_ATA_BIT;
#else #else
unsigned int mte = get_armv8_5_mte_support();
if (mte == MTE_IMPLEMENTED_EL0) { if (mte == MTE_IMPLEMENTED_EL0) {
/* /*
* Can enable MTE across both worlds as no MTE registers are * Can enable MTE across both worlds as no MTE registers are