refactor(policy): centralize shared execution policy state

Move shared execution-policy knobs out of scattered globals into a
dedicated acs_execution_policy_t with explicit reset and accessor APIs.
This keeps execution policy separate from run-request selection state,
routes defaults and overrides through one place, and removes direct
global and header coupling across VAL, PAL, baremetal, and UEFI paths.

- add acs_execution_policy.[ch] as the canonical shared policy object
  for print, PCIe, timeout, crypto, SLC, and EL1 trap settings
- replace direct policy g_* globals across VAL, PAL, test pool,
  baremetal, and UEFI code with policy fields or acs_policy_get_*()
  accessors
- update baremetal and UEFI entry paths to reset, populate, and consume
  execution policy explicitly
- split generic policy reset defaults from baremetal target overrides,
  and expose target defaults through
  acs_get_platform_execution_policy_defaults()
- update compile-time and EL3 override helpers to write execution
  policy separately from run-request filtering state
- remove duplicated policy declarations from PAL and UEFI headers and
  keep the shared policy API in one canonical header
- wire acs_execution_policy.c into the relevant VAL build files for
  baremetal and UEFI flows
- keep headers self-contained with shared fixed-width types and drop
  local scalar typedef wrappers that no longer add value
- retain documentation for sys_last_lvl_cache values and
  el1skiptrap_mask usage in the canonical policy definition

Change-Id: I1e320c46aaab9a6479b189d433a0a3d8f7a62258

Author: prashymh

apps/baremetal/acs.h

@@ -98,17 +98,9 @@ extern uint32_t g_num_modules;
 extern uint32_t g_skip_modules_arr[];
 extern uint32_t g_num_skip_modules;
 extern uint32_t g_level_filter_mode;
-extern uint32_t g_sys_last_lvl_cache;
-extern uint32_t g_timeout_pass;
-extern uint32_t g_timeout_fail;
 
-/* Globals from apps/baremetal/acs_globals.c */
-extern uint32_t  g_pcie_cache_present;
+/* Remaining baremetal execution globals from apps/baremetal/acs_globals.c */
 extern uint32_t  g_el1physkip;
-extern uint32_t  g_pcie_p2p;
-extern uint32_t  g_crypto_support;
-extern uint32_t  g_print_level;
-extern uint32_t  g_print_mmio;
 extern uint32_t  g_curr_module;
 extern uint32_t  g_enable_module;
 extern uint32_t  g_acs_tests_total;
@@ -117,7 +109,6 @@ extern uint32_t  g_acs_tests_fail;
 extern uint64_t  g_stack_pointer;
 extern uint64_t  g_exception_ret_addr;
 extern uint64_t  g_ret_addr;
-extern bool      g_pcie_skip_dp_nic_ms;
 extern uint32_t  g_build_sbsa;
 extern uint32_t  g_build_pcbsa;
 extern uint32_t  g_its_init;

apps/baremetal/acs_common.c

@@ -18,6 +18,7 @@
 #include "acs.h"
 #include <stdint.h>
 #include <stdbool.h>
+#include "pal/baremetal/base/include/pal_execution_policy.h"
 #include "val/include/val_interface.h"
 #include "val/include/acs_el3_param.h"
 #include "val/include/rule_based_execution_enum.h"
@@ -62,6 +63,57 @@ acs_list_contains(const uint32_t *list, uint32_t count, uint32_t value)
   return false;
 }
 
+void
+acs_load_execution_policy_defaults(acs_execution_policy_t *policy)
+{
+  const acs_execution_policy_t *defaults;
+  const acs_execution_policy_t *platform_defaults;
+
+  if (policy == NULL)
+      return;
+
+  acs_reset_execution_policy();
+  defaults = acs_get_execution_policy();
+  /*
+   * Baremetal entry paths currently pass the shared execution-policy singleton,
+   * so acs_reset_execution_policy() has already seeded `policy` with the base
+   * defaults. Keep support for detached policy objects without needlessly
+   * self-assigning the singleton fields here.
+   */
+  if (policy != defaults) {
+      policy->pcie_p2p = defaults->pcie_p2p;
+      policy->pcie_cache_present = defaults->pcie_cache_present;
+      policy->pcie_skip_dp_nic_ms = defaults->pcie_skip_dp_nic_ms;
+      policy->print_level = defaults->print_level;
+      policy->print_mmio = defaults->print_mmio;
+      policy->timeout_pass = defaults->timeout_pass;
+      policy->timeout_fail = defaults->timeout_fail;
+      policy->timer_timeout_us = defaults->timer_timeout_us;
+      policy->crypto_support = defaults->crypto_support;
+      policy->sys_last_lvl_cache = defaults->sys_last_lvl_cache;
+      policy->el1skiptrap_mask = defaults->el1skiptrap_mask;
+  }
+
+  platform_defaults = acs_get_platform_execution_policy_defaults();
+  if (platform_defaults == NULL)
+      return;
+
+  /* Overlay baremetal platform-specific defaults on top of the generic reset defaults. */
+  policy->pcie_p2p = platform_defaults->pcie_p2p;
+  policy->pcie_cache_present = platform_defaults->pcie_cache_present;
+  policy->pcie_skip_dp_nic_ms = platform_defaults->pcie_skip_dp_nic_ms;
+  policy->crypto_support = platform_defaults->crypto_support;
+  policy->sys_last_lvl_cache = platform_defaults->sys_last_lvl_cache;
+  policy->el1skiptrap_mask = platform_defaults->el1skiptrap_mask;
+
+  if (platform_defaults->timeout_pass != 0u)
+      policy->timeout_pass = platform_defaults->timeout_pass;
+  if (platform_defaults->timeout_fail != 0u)
+      policy->timeout_fail = platform_defaults->timeout_fail;
+  if (platform_defaults->timer_timeout_us != 0u)
+      policy->timer_timeout_us = platform_defaults->timer_timeout_us;
+}
+
 void
 acs_load_run_request_defaults(acs_run_request_t *ctx)
 {
@@ -104,11 +156,11 @@ acs_load_run_request_defaults(acs_run_request_t *ctx)
 }
 
 void
-acs_apply_el3_params(acs_run_request_t *ctx)
+acs_apply_el3_params(acs_run_request_t *ctx, acs_execution_policy_t *policy)
 {
   acs_el3_params *params;
 
-  if (ctx == NULL)
+  if (ctx == NULL || policy == NULL)
     return;
 
   /* If magic doesn't match, ignore X20 completely */
@@ -168,14 +220,14 @@ acs_apply_el3_params(acs_run_request_t *ctx)
     }
 
     /* Override shared runtime knobs and context filter settings from EL3 parameters. */
-    g_pcie_p2p            = params->p2p;
-    g_pcie_skip_dp_nic_ms = params->skip_dp_nic_ms;
-    g_print_mmio          = params->mmio;
-    g_crypto_support      = params->no_crypto_ext;
-    g_el1skiptrap_mask    = params->el1skiptrap_mask;
+    policy->pcie_p2p            = params->p2p;
+    policy->pcie_skip_dp_nic_ms = params->skip_dp_nic_ms;
+    policy->print_mmio          = params->mmio;
+    policy->crypto_support      = params->no_crypto_ext ? 0u : 1u;
+    policy->el1skiptrap_mask    = params->el1skiptrap_mask;
     ctx->bsa_sw_view_mask = params->software_view_filter;
-    g_pcie_cache_present  = params->cache;
-    g_sys_last_lvl_cache  = params->sys_cache;
+    policy->pcie_cache_present  = params->cache;
+    policy->sys_last_lvl_cache  = params->sys_cache;
     ctx->level_value = params->level;
 
     if (params->level_selection >= LVL_FILTER_NONE &&
@@ -186,17 +238,18 @@ acs_apply_el3_params(acs_run_request_t *ctx)
                 "Override skipped for level filter mode  %d\n", params->level_selection);
 
     if (params->verbose >= TRACE && params->verbose <= FATAL)
-      g_print_level         = params->verbose;
+      policy->print_level = params->verbose;
     else
       val_print(WARN,
                 "Override skipped for verbose  %d\n", params->verbose);
 
     if (params->timeout >= TIMEOUT_THRESHOLD
        && params->timeout <= TIMEOUT_MAX_THRESHOLD)
     {
-      g_timeout_pass        = params->timeout;
-      g_timer_timeout_us    = params->timeout;
-      g_timeout_fail        = g_timeout_pass * WAKEUP_WD_FAILSAFE_TIMEOUT_MULTIPLIER;
+      policy->timeout_pass = params->timeout;
+      policy->timer_timeout_us = params->timeout;
+      policy->timeout_fail =
+          policy->timeout_pass * WAKEUP_WD_FAILSAFE_TIMEOUT_MULTIPLIER;
     }
     else
       val_print(WARN,
@@ -205,9 +258,9 @@ acs_apply_el3_params(acs_run_request_t *ctx)
 }
 
 void
-acs_apply_compile_params(acs_run_request_t *ctx)
+acs_apply_compile_params(acs_run_request_t *ctx, acs_execution_policy_t *policy)
 {
-  if (ctx == NULL)
+  if (ctx == NULL || policy == NULL)
       return;
 
 #if ACS_HAS_ENABLED_MODULE_LIST
@@ -220,12 +273,12 @@ acs_apply_compile_params(acs_run_request_t *ctx)
   /*
    * Allow compile-time override of the default print verbosity.
    */
-  g_print_level = ACS_VERBOSE_LEVEL;
+  policy->print_level = ACS_VERBOSE_LEVEL;
 
-  if (g_print_level < TRACE)
-    g_print_level = TRACE;
-  else if (g_print_level > FATAL)
-    g_print_level = FATAL;
+  if (policy->print_level < TRACE)
+    policy->print_level = TRACE;
+  else if (policy->print_level > FATAL)
+    policy->print_level = FATAL;
 #endif
 
   return;

apps/baremetal/acs_globals.c

@@ -21,10 +21,6 @@
 #include "acs.h"
 
 /* Global Variables */
-bool      g_pcie_skip_dp_nic_ms = 0;
-uint32_t  g_pcie_p2p;
-uint32_t  g_print_level;
-uint32_t  g_print_mmio;
 uint32_t  g_curr_module;
 uint32_t  g_enable_module;
 uint32_t  g_acs_tests_total;
@@ -33,7 +29,6 @@ uint32_t  g_acs_tests_fail;
 uint32_t  g_build_sbsa = 0;
 uint32_t  g_build_pcbsa = 0;
 uint32_t  g_its_init = 0;
-uint32_t  g_pcie_cache_present;
 uint64_t  g_stack_pointer;
 uint64_t  g_exception_ret_addr;
 uint64_t  g_ret_addr;

apps/baremetal/bsa_main.c

@@ -65,20 +65,21 @@ freeAcsMeM(void)
 
 /* This routine will furnish global variables with user defined config and set any
    default values for the ACS */
-uint32_t apply_user_config_and_defaults(acs_run_request_t *ctx)
+uint32_t apply_user_config_and_defaults(acs_run_request_t *ctx, acs_execution_policy_t *policy)
 {
-    if (ctx == NULL)
+    if (ctx == NULL || policy == NULL)
         return ACS_STATUS_FAIL;
 
     acs_load_run_request_defaults(ctx);
+    acs_load_execution_policy_defaults(policy);
 
     /* Set user defined compliance level to be run for
        as defined pal/baremetal/target/../include/platform_override_fvp.h  */
     ctx->level_value = PLATFORM_OVERRIDE_BSA_LEVEL;
-    g_print_level = PLATFORM_OVERRIDE_PRINT_LEVEL;
+    policy->print_level = PLATFORM_OVERRIDE_PRINT_LEVEL;
 
-    /* Set default values for g_print_mmio */
-    g_print_mmio = 0;
+    /* Disable MMIO trace prints by default for standalone baremetal runs. */
+    policy->print_mmio = 0;
     /* If selected rule count is zero, default to BSA */
     if (ctx->rule_count == 0) {
         /* Standalone BSA Baremetal app, default the run request to BSA */
@@ -87,24 +88,24 @@ uint32_t apply_user_config_and_defaults(acs_run_request_t *ctx)
 
     /* Check sanity of value of level if not valid default to extremes */
     if (ctx->level_value < BSA_LEVEL_1) {
-        val_print(g_print_level, "\nBSA Level %d is not supported.\n", ctx->level_value);
-        val_print(g_print_level, "\nSetting BSA level to %d\n", BSA_LEVEL_1);
+        val_print(policy->print_level, "\nBSA Level %d is not supported.\n", ctx->level_value);
+        val_print(policy->print_level, "\nSetting BSA level to %d\n", BSA_LEVEL_1);
         ctx->level_value = BSA_LEVEL_1;
     } else if (ctx->level_value >= BSA_LEVEL_SENTINEL) {
-        val_print(g_print_level, "\nBSA Level %d is not supported.\n", ctx->level_value);
-        val_print(g_print_level, "\nSetting BSA level FR", BSA_LEVEL_FR);
+        val_print(policy->print_level, "\nBSA Level %d is not supported.\n", ctx->level_value);
+        val_print(policy->print_level, "\nSetting BSA level FR", BSA_LEVEL_FR);
         ctx->level_value = BSA_LEVEL_FR;
     }
 
     /* Check sanity of print level, default accordingly */
-    if (g_print_level < TRACE) {
-        val_print(ERROR, "\nPrint Level %d is not supported.\n", g_print_level);
+    if (policy->print_level < TRACE) {
+        val_print(ERROR, "\nPrint Level %d is not supported.\n", policy->print_level);
         val_print(ERROR, "\nSetting Print level to %d\n", TRACE);
-        g_print_level = TRACE;
-    } else if (g_print_level > ERROR) {
-        val_print(ERROR, "\nPrint Level %d is not supported.\n", g_print_level);
+        policy->print_level = TRACE;
+    } else if (policy->print_level > ERROR) {
+        val_print(ERROR, "\nPrint Level %d is not supported.\n", policy->print_level);
         val_print(ERROR, "\nSetting Print level to %d\n", ERROR);
-        g_print_level = ERROR;
+        policy->print_level = ERROR;
     }
 
     return ACS_STATUS_PASS;
@@ -126,20 +127,22 @@ ShellAppMainbsa()
     uint32_t             Status;
     void                 *branch_label;
     acs_run_request_t    *ctx;
+    acs_execution_policy_t *policy;
 
     acs_reset_run_request();
     ctx = acs_get_run_request_mut();
+    policy = acs_get_execution_policy_mut();
 
-    Status = apply_user_config_and_defaults(ctx);
+    Status = apply_user_config_and_defaults(ctx, policy);
     if (Status != ACS_STATUS_PASS) {
         val_print(ERROR, "\napply_user_config_and_defaults() failed, Exiting...\n");
         goto exit_acs;
     }
 
     /* Apply any compile-time rule/module overrides before we consume the run request. */
-    acs_apply_compile_params(ctx);
+    acs_apply_compile_params(ctx, policy);
     /* Apply any EL3-supplied selection overrides before we consume the run request. */
-    acs_apply_el3_params(ctx);
+    acs_apply_el3_params(ctx, policy);
 
     val_print(INFO, "\n\n BSA Architecture Compliance Suite\n");
     val_print(INFO, "\n          Version %d.", BSA_ACS_MAJOR_VER);
@@ -149,7 +152,7 @@ ShellAppMainbsa()
     val_print(INFO, LEVEL_PRINT_FORMAT(ctx->level_value, ctx->level_filter_mode,
                 BSA_LEVEL_FR), ctx->level_value);
 
-    val_print(INFO, "(Print level is %2d)\n\n", g_print_level);
+    val_print(INFO, "(Print level is %2d)\n\n", policy->print_level);
 
 #if ACS_ENABLE_MMU
     val_print(INFO, " Enabling MMU\n");

apps/baremetal/pc_bsa_main.c

@@ -75,20 +75,21 @@ freeAcsMem(void)
 /* This routine will furnish global variables with user defined config and set any
    default values for the ACS */
 static uint32_t
-apply_user_config_and_defaults(acs_run_request_t *ctx)
+apply_user_config_and_defaults(acs_run_request_t *ctx, acs_execution_policy_t *policy)
 {
-    if (ctx == NULL)
+    if (ctx == NULL || policy == NULL)
         return ACS_STATUS_FAIL;
 
     acs_load_run_request_defaults(ctx);
+    acs_load_execution_policy_defaults(policy);
 
     /* Set user defined compliance level to be run for
        as defined pal/baremetal/target/../include/platform_override_fvp.h  */
     ctx->level_value = PLATFORM_OVERRIDE_PCBSA_LEVEL;
-    g_print_level  = PLATFORM_OVERRIDE_PRINT_LEVEL;
+    policy->print_level = PLATFORM_OVERRIDE_PRINT_LEVEL;
 
-    /* Set default values for g_print_mmio */
-    g_print_mmio = 0;
+    /* Disable MMIO trace prints by default for standalone baremetal runs. */
+    policy->print_mmio = 0;
 
     /* If selected rule count is zero, default to PCBSA */
     if (ctx->rule_count == 0) {
@@ -98,24 +99,24 @@ apply_user_config_and_defaults(acs_run_request_t *ctx)
 
     /* Check sanity of value of level if not valid default to extremes */
     if (ctx->level_value < PCBSA_LEVEL_1) {
-        val_print(g_print_level, "\nPCBSA Level %d is not supported.\n", ctx->level_value);
-        val_print(g_print_level, "\nSetting PCBSA level to %d\n", PCBSA_LEVEL_1);
+        val_print(policy->print_level, "\nPCBSA Level %d is not supported.\n", ctx->level_value);
+        val_print(policy->print_level, "\nSetting PCBSA level to %d\n", PCBSA_LEVEL_1);
         ctx->level_value = PCBSA_LEVEL_1;
     } else if (ctx->level_value >= PCBSA_LEVEL_SENTINEL) {
-        val_print(g_print_level, "\nPCBSA Level %d is not supported.\n", ctx->level_value);
-        val_print(g_print_level, "\nSetting PCBSA level to %d\n", PCBSA_LEVEL_1);
+        val_print(policy->print_level, "\nPCBSA Level %d is not supported.\n", ctx->level_value);
+        val_print(policy->print_level, "\nSetting PCBSA level to %d\n", PCBSA_LEVEL_1);
         ctx->level_value = PCBSA_LEVEL_1;
     }
 
     /* Check sanity of print level, default accordingly */
-    if (g_print_level < TRACE) {
-        val_print(ERROR, "\nPrint Level %d is not supported.\n", g_print_level);
+    if (policy->print_level < TRACE) {
+        val_print(ERROR, "\nPrint Level %d is not supported.\n", policy->print_level);
         val_print(ERROR, "\nSetting Print level to %d\n", TRACE);
-        g_print_level = TRACE;
-    } else if (g_print_level > ERROR) {
-        val_print(ERROR, "\nPrint Level %d is not supported.\n", g_print_level);
+        policy->print_level = TRACE;
+    } else if (policy->print_level > ERROR) {
+        val_print(ERROR, "\nPrint Level %d is not supported.\n", policy->print_level);
         val_print(ERROR, "\nSetting Print level to %d\n", ERROR);
-        g_print_level = ERROR;
+        policy->print_level = ERROR;
     }
 
     return ACS_STATUS_PASS;
@@ -135,20 +136,22 @@ ShellAppMainpcbsa(void)
     uint32_t Status;
     void     *branch_label;
     acs_run_request_t *ctx;
+    acs_execution_policy_t *policy;
 
     acs_reset_run_request();
     ctx = acs_get_run_request_mut();
+    policy = acs_get_execution_policy_mut();
 
-    Status = apply_user_config_and_defaults(ctx);
+    Status = apply_user_config_and_defaults(ctx, policy);
     if (Status != ACS_STATUS_PASS) {
         val_print(ERROR, "\napply_user_config_and_defaults() failed, Exiting...\n");
         goto exit_acs;
     }
 
     /* Apply any compile-time test/module overrides before we consume the run request. */
-    acs_apply_compile_params(ctx);
+    acs_apply_compile_params(ctx, policy);
     /* Apply any EL3-supplied selection overrides before we consume the run request. */
-    acs_apply_el3_params(ctx);
+    acs_apply_el3_params(ctx, policy);
 
 #if ACS_ENABLE_MMU
     val_print(INFO, " Enabling MMU\n");
@@ -176,7 +179,7 @@ ShellAppMainpcbsa(void)
     val_print(INFO, LEVEL_PRINT_FORMAT(ctx->level_value, ctx->level_filter_mode,
                 PCBSA_LEVEL_FR), ctx->level_value);
 
-    val_print(INFO, "(Print level is %2d)\n\n", g_print_level);
+    val_print(INFO, "(Print level is %2d)\n\n", policy->print_level);
 
     val_print(INFO, " Creating Platform Information Tables\n");