fix(cpufeat): context-switch: move FGT availability check to callers

To be inline with other features, and to allow the availability to be
checked for different contexts, move the FGT availability check out of
the save/restore functions. This is instead now checked at the caller.

Change-Id: I96e0638714f9d1b6fdadc1cb989cbd33bd48b1f6
Signed-off-by: Andre Przywara <andre.przywara@arm.com>

diff --git a/lib/el3_runtime/aarch64/context_mgmt.c b/lib/el3_runtime/aarch64/context_mgmt.c
index dab25d6816d2e3368e8b5a71813c6241109dcb46..341c4a5d024499df138de08c171c81cce7108b80 100644 (file)
--- a/lib/el3_runtime/aarch64/context_mgmt.c
+++ b/lib/el3_runtime/aarch64/context_mgmt.c
@@ -805,30 +805,26 @@ void cm_prepare_el3_exit(uint32_t security_state)
 
 static void el2_sysregs_context_save_fgt(el2_sysregs_t *ctx)
 {
-       if (is_feat_fgt_supported()) {
-               write_ctx_reg(ctx, CTX_HDFGRTR_EL2, read_hdfgrtr_el2());
-               if (is_feat_amu_supported()) {
-                       write_ctx_reg(ctx, CTX_HAFGRTR_EL2, read_hafgrtr_el2());
-               }
-               write_ctx_reg(ctx, CTX_HDFGWTR_EL2, read_hdfgwtr_el2());
-               write_ctx_reg(ctx, CTX_HFGITR_EL2, read_hfgitr_el2());
-               write_ctx_reg(ctx, CTX_HFGRTR_EL2, read_hfgrtr_el2());
-               write_ctx_reg(ctx, CTX_HFGWTR_EL2, read_hfgwtr_el2());
+       write_ctx_reg(ctx, CTX_HDFGRTR_EL2, read_hdfgrtr_el2());
+       if (is_feat_amu_supported()) {
+               write_ctx_reg(ctx, CTX_HAFGRTR_EL2, read_hafgrtr_el2());
        }
+       write_ctx_reg(ctx, CTX_HDFGWTR_EL2, read_hdfgwtr_el2());
+       write_ctx_reg(ctx, CTX_HFGITR_EL2, read_hfgitr_el2());
+       write_ctx_reg(ctx, CTX_HFGRTR_EL2, read_hfgrtr_el2());
+       write_ctx_reg(ctx, CTX_HFGWTR_EL2, read_hfgwtr_el2());
 }
 
 static void el2_sysregs_context_restore_fgt(el2_sysregs_t *ctx)
 {
-       if (is_feat_fgt_supported()) {
-               write_hdfgrtr_el2(read_ctx_reg(ctx, CTX_HDFGRTR_EL2));
-               if (is_feat_amu_supported()) {
-                       write_hafgrtr_el2(read_ctx_reg(ctx, CTX_HAFGRTR_EL2));
-               }
-               write_hdfgwtr_el2(read_ctx_reg(ctx, CTX_HDFGWTR_EL2));
-               write_hfgitr_el2(read_ctx_reg(ctx, CTX_HFGITR_EL2));
-               write_hfgrtr_el2(read_ctx_reg(ctx, CTX_HFGRTR_EL2));
-               write_hfgwtr_el2(read_ctx_reg(ctx, CTX_HFGWTR_EL2));
+       write_hdfgrtr_el2(read_ctx_reg(ctx, CTX_HDFGRTR_EL2));
+       if (is_feat_amu_supported()) {
+               write_hafgrtr_el2(read_ctx_reg(ctx, CTX_HAFGRTR_EL2));
        }
+       write_hdfgwtr_el2(read_ctx_reg(ctx, CTX_HDFGWTR_EL2));
+       write_hfgitr_el2(read_ctx_reg(ctx, CTX_HFGITR_EL2));
+       write_hfgrtr_el2(read_ctx_reg(ctx, CTX_HFGRTR_EL2));
+       write_hfgwtr_el2(read_ctx_reg(ctx, CTX_HFGWTR_EL2));
 }
 
 /*******************************************************************************
@@ -863,7 +859,9 @@ void cm_el2_sysregs_context_save(uint32_t security_state)
                el2_sysregs_context_save_mpam(el2_sysregs_ctx);
 #endif
 
-               el2_sysregs_context_save_fgt(el2_sysregs_ctx);
+               if (is_feat_fgt_supported()) {
+                       el2_sysregs_context_save_fgt(el2_sysregs_ctx);
+               }
 
 #if ENABLE_FEAT_ECV
                el2_sysregs_context_save_ecv(el2_sysregs_ctx);
@@ -921,7 +919,9 @@ void cm_el2_sysregs_context_restore(uint32_t security_state)
                el2_sysregs_context_restore_mpam(el2_sysregs_ctx);
 #endif
 
-               el2_sysregs_context_restore_fgt(el2_sysregs_ctx);
+               if (is_feat_fgt_supported()) {
+                       el2_sysregs_context_restore_fgt(el2_sysregs_ctx);
+               }
 
 #if ENABLE_FEAT_ECV
                el2_sysregs_context_restore_ecv(el2_sysregs_ctx);