Skip to content

val: centralize log indentation handling #496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chetan-rathore merged 1 commit into from
Aug 10, 2026
Merged

val: centralize log indentation handling #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions apps/baremetal/acs_runtime_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ acs_clamp_level_for_arch(uint32_t requested_level)

if (requested_level < min_level || requested_level > max_level) {
val_print(WARN,
"ACS Level (EL3 parameter) %d is not supported maxing it to level FR\n",
"\nACS Level (EL3 parameter) %d is not supported maxing it to level FR",
requested_level);
return max_level;
}
Expand Down Expand Up @@ -262,7 +262,7 @@ acs_apply_el3_params(acs_run_request_t *ctx, acs_execution_policy_t *policy)

if (!g_el3_param_addr) {
val_print(WARN,
"EL3 param magic set but param address is 0, ignoring\n");
"\nEL3 param magic set but param address is 0, ignoring");
return;
}

Expand All @@ -271,14 +271,14 @@ acs_apply_el3_params(acs_run_request_t *ctx, acs_execution_policy_t *policy)
/* Optional: version check (kept minimal, versioned for future proofing) */
if ((params->version < 0x1) || (params->version > ACS_EL3_PARAM_VERSION)) {
val_print(WARN,
"Unsupported EL3 param version %ld, ignoring\n", params->version);
"\nUnsupported EL3 param version %ld, ignoring", params->version);
return;
}

val_print(DEBUG, "EL3 params: tests=0x%lx", params->rule_array_addr);
val_print(DEBUG, "\nEL3 params: tests=0x%lx", params->rule_array_addr);
val_print(DEBUG, " (%ld),", params->rule_array_count);
val_print(DEBUG, " modules=0x%lx", params->module_array_addr);
val_print(DEBUG, " (%ld)\n", params->module_array_count);
val_print(DEBUG, " (%ld)", params->module_array_count);

/* Override tests if provided */
if (params->rule_array_addr && params->rule_array_count) {
Expand Down Expand Up @@ -328,13 +328,13 @@ acs_apply_el3_params(acs_run_request_t *ctx, acs_execution_policy_t *policy)
ctx->level_filter_mode = params->level_selection;
else
val_print(WARN,
"Override skipped for level filter mode %d\n", params->level_selection);
"\nOverride skipped for level filter mode %d", params->level_selection);

if (params->verbose >= TRACE && params->verbose <= FATAL)
policy->print_level = params->verbose;
else
val_print(WARN,
"Override skipped for verbose %d\n", params->verbose);
"\nOverride skipped for verbose %d", params->verbose);

if (params->timeout >= TIMEOUT_THRESHOLD
&& params->timeout <= TIMEOUT_MAX_THRESHOLD)
Expand All @@ -346,7 +346,7 @@ acs_apply_el3_params(acs_run_request_t *ctx, acs_execution_policy_t *policy)
}
else
val_print(WARN,
"Override skipped for timeout %d\n", params->timeout);
"\nOverride skipped for timeout %d", params->timeout);
}
}
#else
Expand All @@ -364,15 +364,15 @@ acs_apply_el3_params(acs_run_request_t *ctx, acs_execution_policy_t *policy)

if (!g_el3_param_addr) {
val_print(WARN,
"EL3 param magic set but param address is 0, ignoring\n");
"\nEL3 param magic set but param address is 0, ignoring");
return;
}

params = (acs_el3_params *)(uintptr_t)g_el3_param_addr;

if ((params->version < 0x1) || (params->version > ACS_EL3_PARAM_VERSION)) {
val_print(WARN,
"Unsupported EL3 param version %ld, ignoring\n", params->version);
"\nUnsupported EL3 param version %ld, ignoring", params->version);
return;
}

Expand Down
10 changes: 5 additions & 5 deletions apps/baremetal/bsa_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,18 +146,18 @@ ShellAppMainbsa()
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);
val_print(INFO, "\n Version %d.", BSA_ACS_MAJOR_VER);
val_print(INFO, "%d.", BSA_ACS_MINOR_VER);
val_print(INFO, "%d\n", BSA_ACS_SUBMINOR_VER);
val_print(INFO, " Built for target: %s\n", ACS_TARGET);
val_print(INFO, "\nBuilt for target: %s", ACS_TARGET);

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", policy->print_level);

#if ACS_ENABLE_MMU
val_print(INFO, " Enabling MMU\n");
val_print(INFO, "\nEnabling MMU");

/* Create MMU page tables before enabling the MMU at EL2 */
if (val_setup_mmu()) {
Expand All @@ -171,10 +171,10 @@ ShellAppMainbsa()
return ACS_STATUS_FAIL;
}
#else
val_print(INFO, "Skipping MMU setup/enable (ACS_ENABLE_MMU=0)\n");
val_print(INFO, "\nSkipping MMU setup/enable (ACS_ENABLE_MMU=0)");
#endif

val_print(INFO, " Creating Platform Information Tables\n");
val_print(INFO, "\nCreating Platform Information Tables");

Status = createPeInfoTable();
if (Status) {
Expand Down
8 changes: 4 additions & 4 deletions apps/baremetal/mpam_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,11 @@ ShellAppMainmpam(void)
val_print(INFO, " Version %d.", MPAM_ACS_MAJOR_VER);
val_print(INFO, "%d.", MPAM_ACS_MINOR_VER);
val_print(INFO, "%d\n", MPAM_ACS_SUBMINOR_VER);
val_print(INFO, " Built for target: %s\n", ACS_TARGET);
val_print(INFO, "\nBuilt for target: %s", ACS_TARGET);
val_print(INFO, "(Print level is %2d)\n\n", acs_policy_get_print_level());

#if ACS_ENABLE_MMU
val_print(INFO, " Enabling MMU\n");
val_print(INFO, "\nEnabling MMU");

if (val_setup_mmu()) {
status = ACS_STATUS_FAIL;
Expand All @@ -140,7 +140,7 @@ ShellAppMainmpam(void)
goto exit_acs;
}
#else
val_print(INFO, "Skipping MMU setup/enable (ACS_ENABLE_MMU=0)\n");
val_print(INFO, "\nSkipping MMU setup/enable (ACS_ENABLE_MMU=0)");
#endif

if (!acs_is_module_enabled(ACS_MPAM_REGISTER_TEST_NUM_BASE) &&
Expand All @@ -152,7 +152,7 @@ ShellAppMainmpam(void)
goto print_test_status;
}

val_print(INFO, " Creating Platform Information Tables\n");
val_print(INFO, "\nCreating Platform Information Tables");

status = createPeInfoTable();
if (status)
Expand Down
10 changes: 5 additions & 5 deletions apps/baremetal/pc_bsa_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ ShellAppMainpcbsa(void)
acs_apply_el3_params(ctx, policy);

#if ACS_ENABLE_MMU
val_print(INFO, " Enabling MMU\n");
val_print(INFO, "\nEnabling MMU");

/* Create MMU page tables before enabling the MMU at EL2 */
if (val_setup_mmu()) {
Expand All @@ -169,21 +169,21 @@ ShellAppMainpcbsa(void)
return ACS_STATUS_FAIL;
}
#else
val_print(INFO, "Skipping MMU setup/enable (ACS_ENABLE_MMU=0)\n");
val_print(INFO, "\nSkipping MMU setup/enable (ACS_ENABLE_MMU=0)");
#endif

val_print(INFO, "\n\n PC BSA Architecture Compliance Suite\n");
val_print(INFO, "\n Version %d.", PC_BSA_ACS_MAJOR_VER);
val_print(INFO, "\n Version %d.", PC_BSA_ACS_MAJOR_VER);
val_print(INFO, "%d.", PC_BSA_ACS_MINOR_VER);
val_print(INFO, "%d\n", PC_BSA_ACS_SUBMINOR_VER);
val_print(INFO, " Built for target: %s\n", ACS_TARGET);
val_print(INFO, "\nBuilt for target: %s", ACS_TARGET);

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", policy->print_level);

val_print(INFO, " Creating Platform Information Tables\n");
val_print(INFO, "\nCreating Platform Information Tables");

Status = createPeInfoTable();
if (Status) {
Expand Down
6 changes: 3 additions & 3 deletions apps/baremetal/sbsa_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ ShellAppMainsbsa()
return ACS_STATUS_FAIL;
}
#else
val_print(INFO, "Skipping MMU setup/enable (ACS_ENABLE_MMU=0)\n");
val_print(INFO, "\nSkipping MMU setup/enable (ACS_ENABLE_MMU=0)");
#endif
/* Apply any compile-time test/module overrides before we consume the run request. */
acs_apply_compile_params(ctx, policy);
Expand All @@ -201,15 +201,15 @@ ShellAppMainsbsa()
val_print(INFO, " Version %d.", SBSA_ACS_MAJOR_VER);
val_print(INFO, "%d.", SBSA_ACS_MINOR_VER);
val_print(INFO, "%d\n", SBSA_ACS_SUBMINOR_VER);
val_print(INFO, " Built for target: %s\n", ACS_TARGET);
val_print(INFO, "\nBuilt for target: %s", ACS_TARGET);


val_print(INFO, LEVEL_PRINT_FORMAT(ctx->level_value, ctx->level_filter_mode,
SBSA_LEVEL_FR), ctx->level_value);

val_print(INFO, "(Print level is %2d)\n\n", policy->print_level);

val_print(INFO, " Creating Platform Information Tables\n");
val_print(INFO, "\nCreating Platform Information Tables");

Status = createPeInfoTable();
if (Status) {
Expand Down
2 changes: 1 addition & 1 deletion apps/uefi/bsa_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ execute_tests()
}

val_print(INFO, "\n\n BSA Architecture Compliance Suite");
val_print(INFO, "\n Version %d.", BSA_ACS_MAJOR_VER);
val_print(INFO, "\n Version %d.", BSA_ACS_MAJOR_VER);
val_print(INFO, "%d.", BSA_ACS_MINOR_VER);
val_print(INFO, "%d\n", BSA_ACS_SUBMINOR_VER);

Expand Down
2 changes: 1 addition & 1 deletion apps/uefi/drtm_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ execute_tests()
UINT32 Status;

val_print(INFO, "\n\n DRTM Architecture Compliance Suite");
val_print(INFO, "\n Version %d.", DRTM_ACS_MAJOR_VER);
val_print(INFO, "\n Version %d.", DRTM_ACS_MAJOR_VER);
val_print(INFO, "%d\n", DRTM_ACS_MINOR_VER);

val_print(INFO, "\n Starting tests with print level : %2d\n\n", acs_policy_get_print_level());
Expand Down
6 changes: 3 additions & 3 deletions apps/uefi/mem_test_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,8 +577,8 @@ command_init ()
}

#define BSA_LEVEL_PRINT_FORMAT(level, only) ((level > BSA_MAX_LEVEL_SUPPORTED) ? \
((only) != 0 ? "\n Starting tests for only level FR " : "\n Starting tests for level FR ") : \
((only) != 0 ? "\n Starting tests for only level %2d " : "\n Starting tests for level %2d "))
((only) != 0 ? "\nStarting tests for only level FR " : "\nStarting tests for level FR ") : \
((only) != 0 ? "\nStarting tests for only level %2d " : "\nStarting tests for level %2d "))

VOID FlushImage (VOID)
{
Expand Down Expand Up @@ -709,7 +709,7 @@ execute_tests()
UINT32 Status;

val_print(INFO, "\n\n BSA Architecture Compliance Suite");
val_print(INFO, "\n Version %d.", BSA_ACS_MAJOR_VER);
val_print(INFO, "\n Version %d.", BSA_ACS_MAJOR_VER);
val_print(INFO, "%d.", BSA_ACS_MINOR_VER);
val_print(INFO, "%d\n", BSA_ACS_SUBMINOR_VER);

Expand Down
6 changes: 3 additions & 3 deletions apps/uefi/mpam_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,13 +394,13 @@ execute_tests()
branch_label = &&print_test_status;
val_pe_context_save(AA64ReadSp(), (uint64_t)branch_label);

Print(L"\n\n MPAM System Architecture Compliance Suite \n");
Print(L"\n\nMPAM System Architecture Compliance Suite \n");
Print(L" Version %d.%d.", MPAM_ACS_MAJOR_VER, MPAM_ACS_MINOR_VER);
Print(L"%d \n", MPAM_ACS_SUBMINOR_VER);

Print(L"\n Starting tests for Print level %2d\n\n", acs_policy_get_print_level());
Print(L"\nStarting tests for Print level %2d\n", acs_policy_get_print_level());

Print(L" Creating Platform Information Tables \n");
Print(L"\nCreating Platform Information Tables");
Status = createPeInfoTable();
if (Status)
return Status;
Expand Down
2 changes: 1 addition & 1 deletion apps/uefi/pc_bsa_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ execute_tests()
}

val_print(INFO, "\n\n PC BSA Architecture Compliance Suite");
val_print(INFO, "\n Version %d.", PC_BSA_ACS_MAJOR_VER);
val_print(INFO, "\n Version %d.", PC_BSA_ACS_MAJOR_VER);
val_print(INFO, "%d.", PC_BSA_ACS_MINOR_VER);
val_print(INFO, "%d\n", PC_BSA_ACS_SUBMINOR_VER);

Expand Down
2 changes: 1 addition & 1 deletion apps/uefi/pfdi_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ execute_tests()
}

val_print(INFO, "\n\n PFDI Architecture Compliance Suite");
val_print(INFO, "\n Version %d.", PFDI_ACS_MAJOR_VER);
val_print(INFO, "\n Version %d.", PFDI_ACS_MAJOR_VER);
val_print(INFO, "%d.", PFDI_ACS_MINOR_VER);
val_print(INFO, "%d\n", PFDI_ACS_SUBMINOR_VER);

Expand Down
4 changes: 2 additions & 2 deletions apps/uefi/sbsa_nist_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ SHELL_FILE_HANDLE g_acs_log_file_handle;
UINT32 g_build_sbsa = TRUE;

#define SBSA_LEVEL_PRINT_FORMAT(level, only) ((level > SBSA_MAX_LEVEL_SUPPORTED) ? \
((only) != 0 ? "\n Starting tests for only level FR " : "\n Starting tests for level FR ") : \
((only) != 0 ? "\n Starting tests for only level %2d " : "\n Starting tests for level %2d "))
((only) != 0 ? "\nStarting tests for only level FR " : "\nStarting tests for level FR ") : \
((only) != 0 ? "\nStarting tests for only level %2d " : "\nStarting tests for level %2d "))

VOID FlushImage (VOID)
{
Expand Down
2 changes: 1 addition & 1 deletion apps/uefi/vbsa_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ execute_tests()
}

val_print(INFO, "\n\n VBSA Architecture Compliance Suite");
val_print(INFO, "\n Version %d.", VBSA_ACS_MAJOR_VER);
val_print(INFO, "\n Version %d.", VBSA_ACS_MAJOR_VER);
val_print(INFO, "%d.", VBSA_ACS_MINOR_VER);
val_print(INFO, "%d\n", VBSA_ACS_SUBMINOR_VER);

Expand Down
2 changes: 1 addition & 1 deletion apps/uefi/xbsa_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ execute_tests()

/* Print ACS header */
val_print(INFO, "\n\nxBSA Architecture Compliance Suite");
val_print(INFO, "\n Version %d.", XBSA_ACS_MAJOR_VER);
val_print(INFO, "\n Version %d.", XBSA_ACS_MAJOR_VER);
val_print(INFO, "%d.", XBSA_ACS_MINOR_VER);
val_print(INFO, "%d\n", XBSA_ACS_SUBMINOR_VER);
val_print(INFO, "(Print level is %2d)\n\n", acs_policy_get_print_level());
Expand Down
8 changes: 4 additions & 4 deletions pal/baremetal/base/src/pal_cxl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ pal_cxl_create_info_table(CXL_INFO_TABLE *CxlTable)

if (CxlTable == NULL) {
pal_print_msg(ACS_PRINT_ERR,
"Input CXL Table Pointer is NULL. Cannot create CXL INFO Table\n");
"\n Input CXL Table Pointer is NULL. Cannot create CXL INFO Table");
return;
}

CxlTable->num_entries = 0;

if (platform_cxl_cfg.num_entries == 0) {
pal_print_msg(ACS_PRINT_ERR,
"Number of HB is 0. Cannot create CXL INFO\n");
"\n Number of HB is 0. Cannot create CXL INFO");
return;
}

Expand All @@ -58,7 +58,7 @@ pal_cxl_create_info_table(CXL_INFO_TABLE *CxlTable)
if (window_count > max_windows) {
window_count = max_windows;
pal_print_msg(ACS_PRINT_WARN,
"CFMWS count exceeds per-host capacity. Truncating\n");
"\n CFMWS count exceeds per-host capacity. Truncating");
}
CxlTable->device[i].cfmws_count = window_count;

Expand Down Expand Up @@ -88,7 +88,7 @@ pal_cxl_get_host_bridge_uid(uint32_t bdf, uint32_t *uid)
*uid = 0;
else
pal_print_msg(ACS_PRINT_ERR,
" %s UID pointer NULL ",
"\n %s UID pointer NULL",
__func__);
return 1;
}
6 changes: 3 additions & 3 deletions pal/baremetal/base/src/pal_hmat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ void pal_hmat_dump_info_table(HMAT_INFO_TABLE *HmatTable)

curr_entry = HmatTable->bw_info;
pal_print_msg(ACS_PRINT_INFO,
"\n*** HMAT info table entries ***\n");
"\n *** HMAT info table entries ***");
for (i = 0 ; i < HmatTable->num_of_mem_prox_domain ; i++) {
pal_print_msg(ACS_PRINT_INFO,
"\nMemory Proximity domain : 0x%llx",
Expand All @@ -48,7 +48,7 @@ void pal_hmat_dump_info_table(HMAT_INFO_TABLE *HmatTable)
"\n Write bandwidth : 0x%llx",
curr_entry->write_bw);
pal_print_msg(ACS_PRINT_INFO,
"\n Read bandwidth : 0x%llx\n",
"\n Read bandwidth : 0x%llx",
curr_entry->read_bw);
curr_entry++;
}
Expand All @@ -72,7 +72,7 @@ void pal_hmat_create_info_table(HMAT_INFO_TABLE *HmatTable)

if (HmatTable == NULL) {
pal_print_msg(ACS_PRINT_ERR,
" Unable to create HMAT info table, input pointer is NULL\n");
"\n Unable to create HMAT info table, input pointer is NULL");
return;
}

Expand Down
Loading
Loading