commit 147a4e87448e83458d40a2aa2ce80954dc070021
author Karl Meakin <karl.meakin@arm.com> Thu Mar 27 15:12:27 2025 +0000
committer Joao Alves <joao.alves@arm.com> Mon Mar 31 12:46:33 2025 +0200
tree 3e089f92326d625ea0841012822f3a6b8b2e0c2b
parent 11f05474c182de5ac031c92dba55e5e15b2caff6

test: fix tests due to v1.1 downgrade

Fix tests that were failing due to the EL3 SPMC's version being
downgraded to v1.1.

Change-Id: I5711a8e2e5e395b4a8bd3b14472808f5286fa0b2
Signed-off-by: Karl Meakin <karl.meakin@arm.com>

src/api.c

diff --git a/src/api.c b/src/api.c
index 5c3d899..28d6734 100644
--- a/src/api.c
+++ b/src/api.c
@@ -2579,8 +2579,6 @@
 					     uint32_t input_property,
 					     struct vcpu *current)
 {
-	const bool el0_partition = current->vm->el0_partition;
-
 	if (ANY_BITS_SET(feature, FFA_FEATURES_FEATURE_MBZ_HI_BIT,
 			 FFA_FEATURES_FEATURE_MBZ_LO_BIT)) {
 		dlog_verbose(
@@ -2610,7 +2608,7 @@
 			return ffa_error(FFA_NOT_SUPPORTED);
 		}
 
-		if (el0_partition) {
+		if (current->vm->el0_partition) {
 			return ffa_error(FFA_NOT_SUPPORTED);
 		}
 		if (!vm_id_is_current_world(current->vm->id)) {
@@ -2622,7 +2620,7 @@
 		if (FFA_VERSION_1_2 > FFA_VERSION_COMPILED) {
 			return ffa_error(FFA_NOT_SUPPORTED);
 		}
-		if (el0_partition) {
+		if (current->vm->el0_partition) {
 			return ffa_error(FFA_NOT_SUPPORTED);
 		}
 		if (!vm_id_is_current_world(current->vm->id)) {