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

Merge "fix(cm): remove ENABLE_FEAT_MTE usage" into integration

Browse source
This commit is contained in:
Madhukar Pappireddy 2024-04-12 15:21:12 +02:00 • committed by TrustedFirmware Code Review
commit 0c038fe593
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
include/lib/el3_runtime/context_el2.h
View file

@ -49,9 +49,9 @@ typedef struct el2_common_regs {
uint64_t vttbr_el2; uint64_t vttbr_el2;
} el2_common_regs_t; } el2_common_regs_t;
typedef struct el2_mte_regs { typedef struct el2_mte2_regs {
uint64_t tfsr_el2; uint64_t tfsr_el2;
} el2_mte_regs_t; } el2_mte2_regs_t;
typedef struct el2_fgt_regs { typedef struct el2_fgt_regs {
uint64_t hdfgrtr_el2; uint64_t hdfgrtr_el2;
@ -118,8 +118,8 @@ typedef struct el2_sysregs {
el2_common_regs_t common; el2_common_regs_t common;
#if ENABLE_FEAT_MTE #if ENABLE_FEAT_MTE2
el2_mte_regs_t mte; el2_mte2_regs_t mte2;
#endif #endif
#if ENABLE_FEAT_FGT #if ENABLE_FEAT_FGT
@ -185,14 +185,14 @@ typedef struct el2_sysregs {
#define write_el2_ctx_common(ctx, reg, val) ((((ctx)->common).reg) \ #define write_el2_ctx_common(ctx, reg, val) ((((ctx)->common).reg) \
= (uint64_t) (val)) = (uint64_t) (val))
#if ENABLE_FEAT_MTE #if ENABLE_FEAT_MTE2
#define read_el2_ctx_mte(ctx, reg) (((ctx)->mte).reg) #define read_el2_ctx_mte2(ctx, reg) (((ctx)->mte2).reg)
#define write_el2_ctx_mte(ctx, reg, val) ((((ctx)->mte).reg) \ #define write_el2_ctx_mte2(ctx, reg, val) ((((ctx)->mte2).reg) \
= (uint64_t) (val)) = (uint64_t) (val))
#else #else
#define read_el2_ctx_mte(ctx, reg) ULL(0) #define read_el2_ctx_mte2(ctx, reg) ULL(0)
#define write_el2_ctx_mte(ctx, reg, val) #define write_el2_ctx_mte2(ctx, reg, val)
#endif /* ENABLE_FEAT_MTE */ #endif /* ENABLE_FEAT_MTE2 */
#if ENABLE_FEAT_FGT #if ENABLE_FEAT_FGT
#define read_el2_ctx_fgt(ctx, reg) (((ctx)->fgt).reg) #define read_el2_ctx_fgt(ctx, reg) (((ctx)->fgt).reg)

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

@ -1278,7 +1278,7 @@ void cm_el2_sysregs_context_save(uint32_t security_state)
el2_sysregs_context_save_gic(el2_sysregs_ctx); el2_sysregs_context_save_gic(el2_sysregs_ctx);
if (is_feat_mte2_supported()) { if (is_feat_mte2_supported()) {
write_el2_ctx_mte(el2_sysregs_ctx, tfsr_el2, read_tfsr_el2()); write_el2_ctx_mte2(el2_sysregs_ctx, tfsr_el2, read_tfsr_el2());
} }
#if CTX_INCLUDE_MPAM_REGS #if CTX_INCLUDE_MPAM_REGS
@ -1364,7 +1364,7 @@ void cm_el2_sysregs_context_restore(uint32_t security_state)
el2_sysregs_context_restore_gic(el2_sysregs_ctx); el2_sysregs_context_restore_gic(el2_sysregs_ctx);
if (is_feat_mte2_supported()) { if (is_feat_mte2_supported()) {
write_tfsr_el2(read_el2_ctx_mte(el2_sysregs_ctx, tfsr_el2)); write_tfsr_el2(read_el2_ctx_mte2(el2_sysregs_ctx, tfsr_el2));
} }
#if CTX_INCLUDE_MPAM_REGS #if CTX_INCLUDE_MPAM_REGS