Skip to content
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

Skip test for PE Already On state #428

Merged
merged 1 commit into from
Jan 31, 2025
Merged

Skip test for PE Already On state #428

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
9 changes: 8 additions & 1 deletion val/common/src/acs_pe_infra.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ val_pe_get_index_mpid(uint64_t mpid)
@param None
@return None
**/

void
val_test_entry(void)
{
Expand Down Expand Up @@ -268,8 +269,14 @@ val_execute_on_pe(uint32_t index, void (*payload)(void), uint64_t test_input)

} while (g_smc_args.Arg0 == (uint64_t)ARM_SMC_PSCI_RET_ALREADY_ON && timeout--);

if (g_smc_args.Arg0 == (uint64_t)ARM_SMC_PSCI_RET_ALREADY_ON)
if (g_smc_args.Arg0 == (uint64_t)ARM_SMC_PSCI_RET_ALREADY_ON) {
val_print(ACS_PRINT_ERR, "\n PSCI_CPU_ON: cpu already on", 0);
val_print(ACS_PRINT_WARN, "\n WARNING: Skipping test for PE index %d "
"since it is already on\n", index);

val_set_status(index, RESULT_SKIP(0, 0x120 - (int)g_smc_args.Arg0));
return;
}
else {
if(g_smc_args.Arg0 == 0) {
val_print(ACS_PRINT_INFO, "\n PSCI_CPU_ON: success", 0);
Expand Down
6 changes: 5 additions & 1 deletion val/common/src/acs_status.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/** @file
* Copyright (c) 2016-2024, Arm Limited or its affiliates. All rights reserved.
* Copyright (c) 2016-2025, Arm Limited or its affiliates. All rights reserved.
* SPDX-License-Identifier : Apache-2.0

* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -42,6 +42,10 @@ val_report_status(uint32_t index, uint32_t status, char8_t *ruleid)
val_print(ACS_PRINT_ERR, "\n Failed on PE - %4d", index);
}

if (IS_TEST_SKIP(status)) {
val_print(ACS_PRINT_ERR, "\n Skipped on PE - %4d", index);
}

if (IS_TEST_PASS(status)) {
val_print(ACS_PRINT_DEBUG, "\n ", 0);
val_print(ACS_PRINT_DEBUG, ruleid, 0);
Expand Down