commit 86d87aed1f32bce306d2ff18e89c563dd4ccf311
author Olivier Deprez <olivier.deprez@arm.com> Thu Aug 19 14:27:46 2021 +0200
committer Olivier Deprez <olivier.deprez@arm.com> Wed Oct 06 14:38:42 2021 +0200
tree 89450cb394408c96d103f1a06412d148ee186f69
parent ce2f8d3af5bc32a09daf9ad1a65af12be3ad90b5

fix(ff-a): default print verbosity

Changed to verbose print:
INFO:   Memory region 0x71fc000 - 0x7200000 allocated

SMMU id unspecified for a given peripheral:
WARNING: SMMUv3: Unexpected smmu-id:4294967295 specified in manifest

'FF-A RXTX Unmap API consecutive' test:
ERROR: No buffer pair registered on behalf of the caller.

Change-Id: Ibc20d7e7e0ab51f4343fbdf0914cf4aa2b8e71d4
Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>

src/api.c

diff --git a/src/api.c b/src/api.c
index e5b7bb6..542b461 100644
--- a/src/api.c
+++ b/src/api.c
@@ -1152,7 +1152,7 @@
 
 	/* Get send and receive buffers. */
 	if (vm->mailbox.send == NULL || vm->mailbox.recv == NULL) {
-		dlog_error(
+		dlog_verbose(
 			"No buffer pair registered on behalf of the caller.\n");
 		return ffa_error(FFA_INVALID_PARAMETERS);
 	}

src/arch/aarch64/arm_smmuv3/arm_smmuv3.c

diff --git a/src/arch/aarch64/arm_smmuv3/arm_smmuv3.c b/src/arch/aarch64/arm_smmuv3/arm_smmuv3.c
index 8cbfc2a..fa2e81e 100644
--- a/src/arch/aarch64/arm_smmuv3/arm_smmuv3.c
+++ b/src/arch/aarch64/arm_smmuv3/arm_smmuv3.c
@@ -1391,7 +1391,8 @@
 	for (i = 0; i < manifest_vm->partition.dev_region_count; i++) {
 		upstream_peripheral = manifest_vm->partition.dev_regions[i];
 
-		if (upstream_peripheral.smmu_id != arm_smmuv3.smmu_id) {
+		if (upstream_peripheral.smmu_id != MANIFEST_INVALID_ID &&
+		    upstream_peripheral.smmu_id != arm_smmuv3.smmu_id) {
 			dlog_warning(
 				"SMMUv3: Unexpected smmu-id:%u specified "
 				"in manifest\n",

src/load.c

diff --git a/src/load.c b/src/load.c
index d6825df..1e6031b 100644
--- a/src/load.c
+++ b/src/load.c
@@ -518,7 +518,7 @@
 					goto out;
 				}
 
-				dlog_info(
+				dlog_verbose(
 					"  Memory region %#x - %#x allocated\n",
 					region_begin, region_end);
 			} else {

src/manifest.c

diff --git a/src/manifest.c b/src/manifest.c
index fc02daa..bb6ce53 100644
--- a/src/manifest.c
+++ b/src/manifest.c
@@ -488,7 +488,10 @@
 		TRY(read_optional_uint32(dev_node, "smmu-id",
 					 MANIFEST_INVALID_ID,
 					 &dev_regions[i].smmu_id));
-		dlog_verbose("      smmu-id:  %u\n", dev_regions[i].smmu_id);
+		if (dev_regions[i].smmu_id != MANIFEST_INVALID_ID) {
+			dlog_verbose("      smmu-id:  %u\n",
+				     dev_regions[i].smmu_id);
+		}
 
 		TRY(read_optional_uint32list(dev_node, "stream-ids", &list));
 		dlog_verbose("      Stream IDs assigned:\n");