feat: Move test status to header file.

SapthagiriP · prashymh · commit ec25c68ec1c8 · 2026-04-17T13:38:46.000+05:30
- make the test status shareable in
     both VAL and PAL layer
   - Added new file to hold shared data
     between VAL and PAL
   - Remove pal_common_intf.h

Signed-off-by: sapthagiri padmanabhan &lt;sapthagiri.padmanabhan@arm.com&gt;
Change-Id: Ia7f8b7f498ae3da2d4b7d24b48468fd2e667c8a0
diff --git a/apps/baremetal/acs_globals.c b/apps/baremetal/acs_globals.c
@@ -56,7 +56,6 @@ uint32_t g_bsa_sw_view_mask  = 0;
  * Global counters for rule/test outcomes.
  * Updated in val/src/rule_based_execution_helpers.c::print_rule_test_status().
  */
-acs_test_status_counters_t g_rule_test_stats = {0};
 
 /* ***Note***: few globals are defined in pal/baremetal/target/../src/platform_cfg_fvp.c
-   for partners to furnish */
+   for partners to furnish */
diff --git a/apps/uefi/acs_globals.c b/apps/uefi/acs_globals.c
@@ -80,4 +80,3 @@ BOOLEAN g_invalid_arg_seen = FALSE;
  * Global counters for rule/test outcomes.
  * Updated in val/src/rule_based_execution_helpers.c::print_rule_test_status().
  */
-acs_test_status_counters_t g_rule_test_stats = {0};
diff --git a/pal/baremetal/pal.cmake b/pal/baremetal/pal.cmake
@@ -35,6 +35,7 @@ target_include_directories(${PAL_LIB} PRIVATE
  ${ROOT_DIR}/pal/include/
  ${ROOT_DIR}/pal/baremetal/base/include/
  ${ROOT_DIR}/pal/baremetal/base/src/AArch64/
+ ${ROOT_DIR}/val/include/
  ${ROOT_DIR}/pal/baremetal/target/${TARGET}/include/
  ${ROOT_DIR}/pal/include/
 )
diff --git a/pal/baremetal/target/RDN2/src/pal_bsa.c b/pal/baremetal/target/RDN2/src/pal_bsa.c
@@ -22,6 +22,7 @@
 #include "platform_override_struct.h"
 #include "platform_override_fvp.h"
 #include "pal_pl011_uart.h"
+#include "acs_interface.h"
 
 /**
   Conduits for service calls (SMC vs HVC).
diff --git a/pal/baremetal/target/RDV3/src/pal_bsa.c b/pal/baremetal/target/RDV3/src/pal_bsa.c
@@ -22,6 +22,7 @@
 #include "platform_override_struct.h"
 #include "platform_override_fvp.h"
 #include "pal_pl011_uart.h"
+#include "acs_interface.h"
 
 /**
   Conduits for service calls (SMC vs HVC).
diff --git a/pal/baremetal/target/RDV3CFG1/src/pal_bsa.c b/pal/baremetal/target/RDV3CFG1/src/pal_bsa.c
@@ -22,6 +22,7 @@
 #include "platform_override_struct.h"
 #include "platform_override_fvp.h"
 #include "pal_pl011_uart.h"
+#include "acs_interface.h"
 
 /**
   Conduits for service calls (SMC vs HVC).
diff --git a/val/include/acs_interface.h b/val/include/acs_interface.h
@@ -0,0 +1,42 @@
+/** @file
+ * Copyright (c) 2026, Arm Limited or its affiliates. All rights reserved.
+ * SPDX-License-Identifier : Apache-2.0
+
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+**/
+/* These APIs and definitions can be used throughout ACS*/
+#ifndef __ACS_INTERFACE_H__
+#define __ACS_INTERFACE_H__
+
+#ifdef TARGET_UEFI
+typedef UINT32 acs_uint32_t;
+#else
+typedef uint32_t acs_uint32_t;
+#endif
+
+/* Test status counters visible across ACS */
+typedef struct {
+    acs_uint32_t total_rules_run;     /* Total rules/tests that reported a status */
+    acs_uint32_t passed;              /* Count of TEST_PASS */
+    acs_uint32_t partial_coverage;    /* Count of TEST_PARTIAL_COV */
+    acs_uint32_t warnings;            /* Count of TEST_WARN */
+    acs_uint32_t skipped;             /* Count of TEST_SKIP */
+    acs_uint32_t failed;              /* Count of TEST_FAIL */
+    acs_uint32_t not_implemented;     /* Count of TEST_NO_IMP */
+    acs_uint32_t pal_not_supported;   /* Count of TEST_PAL_NS */
+} acs_test_status_counters_t;
+
+acs_test_status_counters_t *acs_get_test_status(void);
+void acs_reset_test_status(void);
+
+#endif /* __ACS_INTERFACE_H__ */
diff --git a/val/include/pal_common_intf.h b/val/include/pal_common_intf.h
diff --git a/val/include/pal_interface.h b/val/include/pal_interface.h
@@ -17,13 +17,14 @@
 
 #ifndef __PAL_INTERFACE_H__
 #define __PAL_INTERFACE_H__
-
 #ifdef TARGET_BAREMETAL
   #include <stdlib.h>
   #include <stdint.h>
+  #include <stdarg.h>
   #include <stddef.h>
   #include <stdbool.h>
   #include "platform_override_fvp.h"
+  #include "acs_interface.h"
 
   typedef uint64_t addr_t;
   typedef char     char8_t;
@@ -68,8 +69,12 @@
 #endif // TARGET_BAREMETAL
 
 #ifdef TARGET_LINUX
+ #include <linux/stdarg.h>
+ #include <linux/stddef.h>
+ #include <linux/types.h>
+ #include <linux/slab.h>
+ #include "acs_interface.h"
 
-  #include <linux/slab.h>
   typedef char          char8_t;
   typedef long long int addr_t;
 
@@ -90,8 +95,13 @@
 #endif //TARGET_LINUX
 
 #ifdef TARGET_UEFI
+  #include <stdarg.h>
+  #include <stdbool.h>
+  #include <stddef.h>
   #include <Base.h>
   #include "platform_override.h"
+  #include "acs_interface.h"
+
   typedef INT8    int8_t;
   typedef INT16   int16_t;
   typedef INT32   int32_t;
@@ -109,10 +119,11 @@
   typedef CHAR8   char8_t;
   typedef CHAR16  char16_t;
 
-  #if defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L
-   /* bool is a keyword  */
-  #else
-   typedef BOOLEAN bool;
+  /* Avoid redefining bool when the language or headers already provide it. */
+  #if !defined(__cplusplus) && \
+      !(defined(__STDC_VERSION__) && __STDC_VERSION__ > 201710L) && \
+      !defined(__bool_true_false_are_defined)
+    typedef BOOLEAN bool;
   #endif
 
   #define MAX_SID  32
@@ -153,8 +164,6 @@
 int32_t pal_psci_get_conduit(void);
 void pal_dump_dtb(void);
 uint32_t pal_target_is_dt(void);
-
-
 /**
   @brief  number of PEs discovered
 **/
@@ -800,6 +809,7 @@ uint32_t pal_mem_set_wb_executable(void *addr, uint32_t size);
 void     pal_print(uint64_t data);
 void     pal_uart_print(int log, const char *fmt, ...);
 void     pal_print_raw(uint64_t addr, char8_t *string, uint64_t data);
+void     pal_uart_putc(char c);
 uint32_t pal_strncmp(char8_t *str1, char8_t *str2, uint32_t len);
 void     pal_mmu_add_mmap(void);
 void    *pal_mmu_get_mmap_list(void);
@@ -1463,3 +1473,8 @@ void pal_pfdi_verify_regs(ARM_SMC_ARGS *ArmSmcArgs, int32_t Conduit,
                      uint64_t PreSmcRegs[REG_COUNT_X5_X17],
                      uint64_t PostSmcRegs[REG_COUNT_X5_X17]);
 #endif
+
+#define LOG_BUFFER_SIZE 8192
+#ifndef static_assert
+#define static_assert _Static_assert
+#endif
diff --git a/val/include/val_interface.h b/val/include/val_interface.h
@@ -65,20 +65,6 @@ extern uint32_t g_print_level;
 #define EL1SKIPTRAP_CNTPCT   (1u << 1)
 #define EL1SKIPTRAP_DEVMEM   (1u << 2)
 
-/* Test status counters visible across ACS */
-typedef struct {
-    uint32_t total_rules_run;     /* Total rules/tests that reported a status */
-    uint32_t passed;              /* Count of TEST_PASS */
-    uint32_t partial_coverage;    /* Count of TEST_PARTIAL_COV */
-    uint32_t warnings;            /* Count of TEST_WARN */
-    uint32_t skipped;             /* Count of TEST_SKIP */
-    uint32_t failed;              /* Count of TEST_FAIL */
-    uint32_t not_implemented;     /* Count of TEST_NO_IMP */
-    uint32_t pal_not_supported;   /* Count of TEST_PAL_NS */
-} acs_test_status_counters_t;
-
-extern acs_test_status_counters_t g_rule_test_stats;
-
 /* Module init operation type enum */
 typedef enum {
     INIT_OP_INIT,
diff --git a/val/include/val_libc.h b/val/include/val_libc.h
@@ -23,7 +23,6 @@ extern "C" {
 #endif
 
 #include "pal_interface.h"
-#include "pal_common_intf.h"
 
 int val_memory_compare(void *s1, void *s2, uint32_t len);
 
diff --git a/val/include/val_logger.h b/val/include/val_logger.h
@@ -9,7 +9,6 @@
 #define VAL_LOG_H
 
 #include "pal_interface.h"
-#include "pal_common_intf.h"
 
 /* Verbosity enums, Lower the value, higher the verbosity */
 typedef enum {
diff --git a/val/include/val_sysreg.h b/val/include/val_sysreg.h
@@ -10,7 +10,6 @@
 
 #include "val_arch.h"
 #include "pal_interface.h"
-#include "pal_common_intf.h"
 
 typedef unsigned long u_register_t;
 
diff --git a/val/src/acs_test_infra.c b/val/src/acs_test_infra.c
@@ -24,7 +24,7 @@
 #include "val_status.h"
 
 uint32_t g_override_skip;
-
+static acs_test_status_counters_t g_rule_test_stats;
 /**
   @brief  Print standardized log context prefix.
           1. Caller       - Application/VAL layers
@@ -147,31 +147,23 @@ val_print_test_end(uint32_t status, char8_t *string)
 void
 val_print_acs_test_status_summary(void)
 {
+  acs_test_status_counters_t *stats = acs_get_test_status();
+
   val_print(INFO, "\n---------- ACS Summary ----------\n");
   val_print(INFO, "   Total Rules Run        : %d\n",
-            g_rule_test_stats.total_rules_run);
-  val_print(INFO, "   Passed                 : %d\n", g_rule_test_stats.passed);
+            stats->total_rules_run);
+  val_print(INFO, "   Passed                 : %d\n", stats->passed);
   val_print(INFO, "   Passed (*Partial)      : %d\n",
-            g_rule_test_stats.partial_coverage);
-  val_print(INFO, "   Warnings               : %d\n", g_rule_test_stats.warnings);
-  val_print(INFO, "   Skipped                : %d\n", g_rule_test_stats.skipped);
-  val_print(INFO, "   Failed                 : %d\n", g_rule_test_stats.failed);
+            stats->partial_coverage);
+  val_print(INFO, "   Warnings               : %d\n", stats->warnings);
+  val_print(INFO, "   Skipped                : %d\n", stats->skipped);
+  val_print(INFO, "   Failed                 : %d\n", stats->failed);
   val_print(INFO, "   PAL Not Supported      : %d\n",
-            g_rule_test_stats.pal_not_supported);
+            stats->pal_not_supported);
   val_print(INFO, "   Test Not Implemented   : %d\n",
-            g_rule_test_stats.not_implemented);
+            stats->not_implemented);
   val_print(INFO, "---------------------------------\n");
 
-  /* Reset global rule/test status counters after printing summary */
-  g_rule_test_stats.total_rules_run = 0;
-  g_rule_test_stats.passed = 0;
-  g_rule_test_stats.partial_coverage = 0;
-  g_rule_test_stats.warnings = 0;
-  g_rule_test_stats.skipped = 0;
-  g_rule_test_stats.failed = 0;
-  g_rule_test_stats.pal_not_supported = 0;
-  g_rule_test_stats.not_implemented = 0;
-
 }
 
 /**
@@ -934,3 +926,37 @@ val_exit_acs(void)
 {
   return pal_exit_acs();
 }
+
+/* Definition of APIs declared in acs_interface.h */
+
+/**
+  @brief  Get pointer to global ACS test status counters.
+          1. Caller       - VAL/PAL layers needing aggregated results
+          2. Prerequisite - None.
+
+  @return Pointer to the shared test status counter structure.
+ **/
+acs_test_status_counters_t *acs_get_test_status(void)
+{
+  return &g_rule_test_stats;
+}
+
+/**
+  @brief  Reset global ACS test status counters to zero.
+          1. Caller       - VAL/PAL layers before starting a run or while
+                            end of ACS
+          2. Prerequisite - None.
+
+  @return None
+ **/
+void acs_reset_test_status(void)
+{
+  g_rule_test_stats.total_rules_run   = 0;
+  g_rule_test_stats.passed            = 0;
+  g_rule_test_stats.partial_coverage  = 0;
+  g_rule_test_stats.warnings          = 0;
+  g_rule_test_stats.skipped           = 0;
+  g_rule_test_stats.failed            = 0;
+  g_rule_test_stats.not_implemented   = 0;
+  g_rule_test_stats.pal_not_supported = 0;
+}
diff --git a/val/src/rule_based_execution_helpers.c b/val/src/rule_based_execution_helpers.c
@@ -250,6 +250,7 @@ print_rule_test_status(uint32_t rule_enum, uint32_t indent, uint32_t status)
     (void)rule_enum;
     /* Only count top-level rules (indent == 0) */
     uint32_t top_level_rule = (indent == 0);
+    acs_test_status_counters_t *stats = acs_get_test_status();
 
     val_print(INFO, "\n");
     /* Print other PAL(s) that validate this rule */
@@ -269,30 +270,30 @@ print_rule_test_status(uint32_t rule_enum, uint32_t indent, uint32_t status)
 
     /* Update global counters for top-level rules only */
     if (top_level_rule) {
-        g_rule_test_stats.total_rules_run++;
+        stats->total_rules_run++;
     }
 
     switch (state) {
     case TEST_PASS:
-        if (top_level_rule) g_rule_test_stats.passed++;
+        if (top_level_rule) stats->passed++;
         break;
     case TEST_PARTIAL_COVERED:
-        if (top_level_rule) g_rule_test_stats.partial_coverage++;
+        if (top_level_rule) stats->partial_coverage++;
         break;
     case TEST_WARNING:
-        if (top_level_rule) g_rule_test_stats.warnings++;
+        if (top_level_rule) stats->warnings++;
         break;
     case TEST_SKIP:
-        if (top_level_rule) g_rule_test_stats.skipped++;
+        if (top_level_rule) stats->skipped++;
         break;
     case TEST_FAIL:
-        if (top_level_rule) g_rule_test_stats.failed++;
+        if (top_level_rule) stats->failed++;
         break;
     case TEST_NOT_IMPLEMENTED:
-        if (top_level_rule) g_rule_test_stats.not_implemented++;
+        if (top_level_rule) stats->not_implemented++;
         break;
     case TEST_PAL_NOT_SUPPORTED:
-        if (top_level_rule) g_rule_test_stats.pal_not_supported++;
+        if (top_level_rule) stats->pal_not_supported++;
         break;
     default:
         val_print(INFO, "STATUS:0x%08x", status);
diff --git a/val/val.cmake b/val/val.cmake

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ target_include_directories(${PAL_LIB} PRIVATE`
`35`	`35`	`${ROOT_DIR}/pal/include/`
`36`	`36`	`${ROOT_DIR}/pal/baremetal/base/include/`
`37`	`37`	`${ROOT_DIR}/pal/baremetal/base/src/AArch64/`
	`38`	`+ ${ROOT_DIR}/val/include/`
`38`	`39`	`${ROOT_DIR}/pal/baremetal/target/${TARGET}/include/`
`39`	`40`	`${ROOT_DIR}/pal/include/`
`40`	`41`	`)`