diff options
author | Olivier Deprez <olivier.deprez@arm.com> | 2021-10-05 14:35:17 +0200 |
---|---|---|
committer | Olivier Deprez <olivier.deprez@arm.com> | 2021-10-08 15:30:04 +0200 |
commit | 24bd170c0288c302976bb26cc4af5dee039ecc4c (patch) | |
tree | 3fd2f927dcc2cfc0115a77678b0f9adc36672987 /spm/cactus | |
parent | 2b9171502ee235cd72c2db09b0faa17cf2fe6863 (diff) |
fix(ff-a): cactus and ivy verbosity
Unify welcome message for all test partition types.
Reduce verbosity for release builds.
Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
Change-Id: I747ab52f13942d655092b07d029292895cb01159
Diffstat (limited to 'spm/cactus')
-rw-r--r-- | spm/cactus/cactus_main.c | 30 | ||||
-rw-r--r-- | spm/cactus/cactus_tests/cactus_test_ffa.c | 2 |
2 files changed, 15 insertions, 17 deletions
diff --git a/spm/cactus/cactus_main.c b/spm/cactus/cactus_main.c index 59cd7e7..78bb8fc 100644 --- a/spm/cactus/cactus_main.c +++ b/spm/cactus/cactus_main.c @@ -181,6 +181,7 @@ void __dead2 cactus_main(bool primary_cold_boot) assert(IS_IN_EL1() != 0); struct mailbox_buffers mb; + smc_ret_values ret; /* Get current FFA id */ smc_ret_values ffa_id_ret = ffa_id_get(); @@ -225,28 +226,25 @@ void __dead2 cactus_main(bool primary_cold_boot) set_putc_impl(PL011_AS_STDOUT); - NOTICE("Booting Primary Cactus Secure Partition\n%s\n%s\n", - build_message, version_string); } else { - smc_ret_values ret; set_putc_impl(HVC_CALL_AS_STDOUT); + } - NOTICE("Booting Secondary Cactus Secure Partition (ID: %x)\n%s\n%s\n", - ffa_id, build_message, version_string); - - if (ffa_id == (SPM_VM_ID_FIRST + 2)) { - VERBOSE("Mapping RXTX Region\n"); - CONFIGURE_AND_MAP_MAILBOX(mb, PAGE_SIZE, ret); - if (ffa_func_id(ret) != FFA_SUCCESS_SMC32) { - ERROR( - "Failed to map RXTX buffers. Error: %x\n", - ffa_error_code(ret)); - panic(); - } + /* Below string is monitored by CI expect script. */ + NOTICE("Booting Secure Partition (ID: %x)\n%s\n%s\n", + ffa_id, build_message, version_string); + + if (ffa_id == (SPM_VM_ID_FIRST + 2)) { + VERBOSE("Mapping RXTX Region\n"); + CONFIGURE_AND_MAP_MAILBOX(mb, PAGE_SIZE, ret); + if (ffa_func_id(ret) != FFA_SUCCESS_SMC32) { + ERROR( + "Failed to map RXTX buffers. Error: %x\n", + ffa_error_code(ret)); + panic(); } } - INFO("FF-A id: %x\n", ffa_id); cactus_print_memory_layout(ffa_id); register_secondary_entrypoint(); diff --git a/spm/cactus/cactus_tests/cactus_test_ffa.c b/spm/cactus/cactus_tests/cactus_test_ffa.c index ba069d0..2dc264e 100644 --- a/spm/cactus/cactus_tests/cactus_test_ffa.c +++ b/spm/cactus/cactus_tests/cactus_test_ffa.c @@ -141,7 +141,7 @@ void ffa_version_test(void) ((spm_version >> FFA_VERSION_MAJOR_SHIFT) == FFA_MAJOR && (spm_version & FFA_VERSION_MINOR_MASK) >= FFA_MINOR); - NOTICE("FFA_VERSION returned %u.%u; Compatible: %i\n", + VERBOSE("FFA_VERSION returned %u.%u; Compatible: %i\n", spm_version >> FFA_VERSION_MAJOR_SHIFT, spm_version & FFA_VERSION_MINOR_MASK, (int)ffa_version_compatible); |