Merge pull request #1 from avinaw01-arm/main

VAL Infrastructure Optimizations Release

Author: avinaw01-arm

README.md

@@ -3,6 +3,11 @@
 
 This Common VAL repository consolidates shared functionalities across the FF-A, RMM, and PSA-M ACS projects. This centralized approach ensures consistent implementation while eliminating redundant efforts among stakeholders. Key functionalities include Logging, Status reporting, Regression report, etc.
 
+
+## License
+
+Arm Common VAl ACS is distributed under BSD-3-Clause License.
+
 --------------
 
 *Copyright (c) 2024-2025, Arm Limited or its affiliates. All rights reserved.*

inc/val_common_framework.h

@@ -35,4 +35,6 @@ void val_handle_reboot_result(uint32_t test_progress);
 void val_update_regression_report(uint32_t test_result, regre_report_t *regre_report);
 void val_print_regression_report(regre_report_t *regre_report);
 
+void val_mem_copy(char *dest, const char *src, size_t len);
+
 #endif /* VAL_COMMON_FRAMEWORK_H */

src/val_common_framework.c

@@ -166,3 +166,16 @@ void val_print_regression_report(regre_report_t *regre_report)
     val_printf(ALWAYS, "******* END OF ACS *******\n");
     val_printf(ALWAYS, "\n");
 }
+
+/**
+ *  @brief   -  Copies 'len' bytes from source to destination buffer
+ *  @param   -  dest : Destination buffer
+ *           -  src  : Source buffer
+ *           -  len  : Number of bytes to copy
+ *  @return  -  void
+ */
+void val_mem_copy(char *dest, const char *src, size_t len)
+{
+    for (size_t i = 0; i < len; ++i)
+        dest[i] = src[i];
+}

src/val_common_log.c

@@ -6,6 +6,7 @@
  */
 
 #include "val_common_log.h"
+#include "val_common_framework.h"
 
 static void val_putc(char *c)
 {
@@ -587,16 +588,17 @@ static size_t val_log(const char *fmt, va_list args)
 uint32_t val_printf(print_verbosity_t verbosity, const char *msg, ...)
 {
     size_t chars_written = 0;
-    va_list args;
+    size_t len = log_strnlen_s(msg, LOG_MAX_STRING_LENGTH - 2);
     static bool lastWasNewline = true;
+    char formatted_msg[LOG_MAX_STRING_LENGTH];
+    va_list args;
 
     va_start(args, msg);
+
     if (verbosity >= VERBOSITY)
     {
-
         if (lastWasNewline)
         {
-            val_putc("\r");
             switch (verbosity)
             {
                 case INFO:
@@ -612,33 +614,39 @@ uint32_t val_printf(print_verbosity_t verbosity, const char *msg, ...)
                     break;
 
                 case WARN:
-                    print_raw_string("\tWARN: ");
+                    print_raw_string("\t\tWARN: ");
                     break;
 
                 case ERROR:
-                    print_raw_string("\tERROR: ");
+                    print_raw_string("\t\tERROR: ");
                     break;
 
                 case ALWAYS:
-                    print_raw_string("\t");
+                    print_raw_string("");
                     break;
 
                 default:
-                    chars_written = val_log(msg, args);
-                    return (uint32_t)chars_written;
                     break;
             }
         }
-        chars_written = val_log(msg, args);
 
-        size_t len = log_strnlen_s(msg, LOG_MAX_STRING_LENGTH);
         if (len > 0 && msg[len - 1] == '\n')
+        {
+            val_mem_copy(formatted_msg, msg, len - 1);
+            formatted_msg[len - 1] = '\r';
+            formatted_msg[len] = '\n';
+            formatted_msg[len + 1] = '\0';
+
+            chars_written = val_log(formatted_msg, args);
             lastWasNewline = true;
+        }
         else
+        {
+            chars_written = val_log(msg, args);
             lastWasNewline = false;
-
-        va_end(args);
+        }
     }
+    va_end(args);
 
     return (uint32_t)chars_written;
 }

src/val_common_status.c

@@ -8,11 +8,6 @@
 #include "val_common_status.h"
 #include "val_common_log.h"
 
-#ifndef PLATFORM_SHARED_REGION_BASE
-val_test_status_buffer_ts g_status_buffer;
-#define PLATFORM_SHARED_REGION_BASE (&g_status_buffer)
-#endif
-
 static uint64_t width;
 
 /**
@@ -94,34 +89,33 @@ uint32_t val_report_status(void)
     {
         case TEST_PASS:
             state = TEST_PASS;
-            val_printf(ALWAYS, "\nResult => Passed\n");
+            val_printf(ALWAYS, "Result=Passed\n");
             break;
 
         case TEST_FAIL:
             state = TEST_FAIL;
-            val_printf(ALWAYS, "\nResult => Failed (Error code=%d)\n",
+            val_printf(ALWAYS, "Result=Failed (Error code=%d)\n",
                 status_code);
             break;
 
         case TEST_SKIP:
             state = TEST_SKIP;
-            val_printf(ALWAYS, "\nResult => Skipped (Skip code=%d)\n",
+            val_printf(ALWAYS, "Result=Skipped (Skip code=%d)\n",
                 status_code);
             break;
 
         case TEST_ERROR:
             state = TEST_ERROR;
-            val_printf(ALWAYS, "\nResult => Error (Error code=%d)\n",
+            val_printf(ALWAYS, "Result=Error (Error code=%d)\n",
                 status_code);
             break;
         default:
             state = TEST_FAIL;
-            val_printf(ALWAYS, "\nResult => Failed (Error Code=%d)\n",
+            val_printf(ALWAYS, "Result=Failed (Error Code=%d)\n",
                 status_code);
             break;
     }
 
-    val_printf(ALWAYS, "\n");
     val_printf(ALWAYS, "***********************************\n");
     return state;
 }