Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-19 02:54:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(mte): use ATA bit with FEAT_MTE2" into integration

Browse source
This commit is contained in:
Manish Pandey 2024-03-22 18:24:29 +01:00 • committed by TrustedFirmware Code Review
commit 869ee08638
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/el3_runtime/aarch64/context_mgmt.c
View file

@ -123,8 +123,8 @@ static void setup_secure_context(cpu_context_t *ctx, const struct entry_point_in
scr_el3 |= get_scr_el3_from_routing_model(SECURE);
#endif
/* Allow access to Allocation Tags when mte is set*/
if (is_feat_mte_supported()) {
/* Allow access to Allocation Tags when FEAT_MTE2 is implemented and enabled. */
if (is_feat_mte2_supported()) {
scr_el3 |= SCR_ATA_BIT;
}
@ -193,8 +193,10 @@ static void setup_ns_context(cpu_context_t *ctx, const struct entry_point_info *
/* SCR_NS: Set the NS bit */
scr_el3 |= SCR_NS_BIT;
/* Allow access to Allocation Tags when MTE is implemented. */
scr_el3 |= SCR_ATA_BIT;
/* Allow access to Allocation Tags when FEAT_MTE2 is implemented and enabled. */
if (is_feat_mte2_supported()) {
scr_el3 |= SCR_ATA_BIT;
}
#if !CTX_INCLUDE_PAUTH_REGS
/*