commit 013f4d6768f405de76a8880282f4c9d5d5ca9d28
author Olivier Deprez <olivier.deprez@arm.com> Mon Nov 21 15:46:20 2022 +0100
committer Olivier Deprez <olivier.deprez@arm.com> Wed Nov 23 14:37:18 2022 +0100
tree b0fc03caa84a9a8b1970b7e01195aecdd87a0085
parent 6f64439fd6c16deba813a5142af8367b88070835

fix: partition info get count flags usage

Follow up to change [1] fix statements related to
FFA_PARTITION_COUNT_FLAG_MASK and FFA_PARTITION_COUNT_FLAG
macros usage.

[1] https://review.trustedfirmware.org/c/hafnium/hafnium/+/13033

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

src/api.c

diff --git a/src/api.c b/src/api.c
index ae9bb68..46eb892 100644
--- a/src/api.c
+++ b/src/api.c
@@ -430,7 +430,7 @@
 {
 	struct vm *current_vm = current->vm;
 	ffa_vm_count_t vm_count = 0;
-	bool count_flag = (flags && FFA_PARTITION_COUNT_FLAG_MASK) ==
+	bool count_flag = (flags & FFA_PARTITION_COUNT_FLAG_MASK) ==
 			  FFA_PARTITION_COUNT_FLAG;
 	bool uuid_is_null = ffa_uuid_is_null(uuid);
 	struct ffa_partition_info partitions[2 * MAX_VMS] = {0};
@@ -438,7 +438,7 @@
 	struct ffa_value ret;
 
 	/* Bits 31:1 Must Be Zero */
-	if ((flags & ~FFA_PARTITION_COUNT_FLAG) != 0) {
+	if ((flags & ~FFA_PARTITION_COUNT_FLAG_MASK) != 0) {
 		return ffa_error(FFA_INVALID_PARAMETERS);
 	}
 

src/arch/aarch64/plat/ffa/hypervisor.c

diff --git a/src/arch/aarch64/plat/ffa/hypervisor.c b/src/arch/aarch64/plat/ffa/hypervisor.c
index e7f9e94..4f7e8cc 100644
--- a/src/arch/aarch64/plat/ffa/hypervisor.c
+++ b/src/arch/aarch64/plat/ffa/hypervisor.c
@@ -877,7 +877,7 @@
 		return;
 	}
 
-	if ((flags && FFA_PARTITION_COUNT_FLAG_MASK) ==
+	if ((flags & FFA_PARTITION_COUNT_FLAG_MASK) ==
 	    FFA_PARTITION_COUNT_FLAG) {
 		vm_count += tee_partitions_count;
 	} else {