commit 24bd170c0288c302976bb26cc4af5dee039ecc4c
author Olivier Deprez <olivier.deprez@arm.com> Tue Oct 05 14:35:17 2021 +0200
committer Olivier Deprez <olivier.deprez@arm.com> Fri Oct 08 15:30:04 2021 +0200
tree 3fd2f927dcc2cfc0115a77678b0f9adc36672987
parent 2b9171502ee235cd72c2db09b0faa17cf2fe6863

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

spm/ivy/app/ivy_main.c

diff --git a/spm/ivy/app/ivy_main.c b/spm/ivy/app/ivy_main.c
index 28f93ab..777ef82 100644
--- a/spm/ivy/app/ivy_main.c
+++ b/spm/ivy/app/ivy_main.c
@@ -24,12 +24,16 @@
 
 	set_putc_impl(SVC_CALL_AS_STDOUT);
 
-	NOTICE("Entering S-EL0 Secure Partition\n");
+	args = (svc_args) {.fid = FFA_ID_GET};
+	ret = sp_svc(&args);
+
+	NOTICE("Booting Secure Partition (ID: %x)\n",
+		(unsigned int)args.arg2);
 	NOTICE("%s\n", build_message);
 	NOTICE("%s\n", version_string);
 
 init:
-	args = (svc_args){.fid = FFA_MSG_WAIT};
+	args = (svc_args) {.fid = FFA_MSG_WAIT};
 	ret = sp_svc(&args);
 
 	while (1) {

spm/ivy/shim/shim_main.c

diff --git a/spm/ivy/shim/shim_main.c b/spm/ivy/shim/shim_main.c
index 97df1cc..f03a52f 100644
--- a/spm/ivy/shim/shim_main.c
+++ b/spm/ivy/shim/shim_main.c
@@ -25,25 +25,25 @@
 
 static void shim_print_memory_layout(void)
 {
-	NOTICE("Secure Partition memory layout:\n");
+	INFO("Secure Partition memory layout:\n");
 
-	NOTICE("  Image regions\n");
-	NOTICE("    Text region            : %p - %p\n",
+	INFO("  Image regions\n");
+	INFO("    Text region            : %p - %p\n",
 		(void *)IVY_TEXT_START, (void *)IVY_TEXT_END);
-	NOTICE("    Read-only data region  : %p - %p\n",
+	INFO("    Read-only data region  : %p - %p\n",
 		(void *)IVY_RODATA_START, (void *)IVY_RODATA_END);
-	NOTICE("    Data region            : %p - %p\n",
+	INFO("    Data region            : %p - %p\n",
 		(void *)IVY_DATA_START, (void *)IVY_DATA_END);
-	NOTICE("    BSS region             : %p - %p\n",
+	INFO("    BSS region             : %p - %p\n",
 		(void *)IVY_BSS_START, (void *)IVY_BSS_END);
-	NOTICE("    Total image memory     : %p - %p\n",
+	INFO("    Total image memory     : %p - %p\n",
 		(void *)IVY_IMAGE_BASE,
 		(void *)(IVY_IMAGE_BASE + IVY_IMAGE_SIZE));
-	NOTICE("  SPM regions\n");
-	NOTICE("    SPM <-> SP buffer      : %p - %p\n",
+	INFO("  SPM regions\n");
+	INFO("    SPM <-> SP buffer      : %p - %p\n",
 		(void *)IVY_SPM_BUF_BASE,
 		(void *)(IVY_SPM_BUF_BASE + IVY_SPM_BUF_SIZE));
-	NOTICE("    NS <-> SP buffer       : %p - %p\n",
+	INFO("    NS <-> SP buffer       : %p - %p\n",
 		(void *)IVY_NS_BUF_BASE,
 		(void *)(IVY_NS_BUF_BASE + IVY_NS_BUF_SIZE));
 }
@@ -93,7 +93,7 @@
 	/* Initialise console */
 	set_putc_impl(HVC_CALL_AS_STDOUT);
 
-	NOTICE("Booting S-EL1 Shim\n");
+	INFO("Booting S-EL1 Shim\n");
 
 	/* Configure and enable Stage-1 MMU, enable D-Cache */
 	shim_plat_configure_mmu();