feat(ff-a): update FF-A version to v1.2
Bump the required FF-A version in framework and manifests to v1.2 as
upstream feature development goes.
Signed-off-by: Kathleen Capella <kathleen.capella@arm.com>
Change-Id: Ic8b1822fc32a081350cc1e6123d33c0542dc237d
diff --git a/inc/vmapi/hf/ffa.h b/inc/vmapi/hf/ffa.h
index a4e4cbf..b7f6b81 100644
--- a/inc/vmapi/hf/ffa.h
+++ b/inc/vmapi/hf/ffa.h
@@ -13,7 +13,7 @@
#define FFA_VERSION_MAJOR 0x1
#define FFA_VERSION_MAJOR_OFFSET 16
#define FFA_VERSION_MAJOR_MASK 0x7FFF
-#define FFA_VERSION_MINOR 0x1
+#define FFA_VERSION_MINOR 0x2
#define FFA_VERSION_MINOR_OFFSET 0
#define FFA_VERSION_MINOR_MASK 0xFFFF
@@ -83,7 +83,7 @@
#define FFA_MEM_PERM_GET_64 0xC4000088
#define FFA_MEM_PERM_SET_64 0xC4000089
-/* Implementation-defined ABIs. */
+/* FF-A v1.2 */
#define FFA_CONSOLE_LOG_32 0x8400008A
#define FFA_CONSOLE_LOG_64 0xC400008A
#define FFA_PARTITION_INFO_GET_REGS_64 0xC400008B
@@ -102,6 +102,7 @@
#define FFA_RETRY INT32_C(-7)
#define FFA_ABORTED INT32_C(-8)
#define FFA_NO_DATA INT32_C(-9)
+#define FFA_NOT_READY INT32_C(-10)
/* clang-format on */
diff --git a/src/api.c b/src/api.c
index 843b8dc..695eef5 100644
--- a/src/api.c
+++ b/src/api.c
@@ -2456,7 +2456,13 @@
case FFA_MEM_PERM_GET_64:
case FFA_MEM_PERM_SET_64:
case FFA_MSG_SEND2_32:
+#endif
+#if (MAKE_FFA_VERSION(1, 2) <= FFA_VERSION_COMPILED)
+ /* FF-A v1.2 features. */
+ case FFA_CONSOLE_LOG_32:
+ case FFA_CONSOLE_LOG_64:
case FFA_PARTITION_INFO_GET_REGS_64:
+ case FFA_EL3_INTR_HANDLE_32:
#endif
return (struct ffa_value){.func = FFA_SUCCESS_32};
case FFA_MEM_RETRIEVE_REQ_32:
@@ -2954,7 +2960,7 @@
*out_v1_1 = (struct ffa_memory_region *)allocated;
- if (ffa_version == MAKE_FFA_VERSION(1, 1)) {
+ if (ffa_version >= MAKE_FFA_VERSION(1, 1)) {
return (struct ffa_value){.func = FFA_SUCCESS_32};
}
@@ -3292,7 +3298,7 @@
assert(fragment_length != NULL);
assert(retrieve_msg != NULL);
- if (ffa_version == MAKE_FFA_VERSION(1, 1)) {
+ if (ffa_version >= MAKE_FFA_VERSION(1, 1)) {
*out_v1_1 = (struct ffa_memory_region *)retrieve_msg;
return (struct ffa_value){.func = FFA_SUCCESS_32};
}
diff --git a/src/ffa_memory.c b/src/ffa_memory.c
index 74e0f82..d3434ff 100644
--- a/src/ffa_memory.c
+++ b/src/ffa_memory.c
@@ -2687,7 +2687,7 @@
uint32_t expected_fragment_offset;
uint32_t composite_constituents_offset;
- if (ffa_version == MAKE_FFA_VERSION(1, 1)) {
+ if (ffa_version >= MAKE_FFA_VERSION(1, 1)) {
/*
* Hafnium operates memory regions in FF-A v1.1 format, so we
* can retrieve the constituents offset from descriptor.
diff --git a/test/vmapi/arch/aarch64/smccc.c b/test/vmapi/arch/aarch64/smccc.c
index aea9c3e..84f5c66 100644
--- a/test/vmapi/arch/aarch64/smccc.c
+++ b/test/vmapi/arch/aarch64/smccc.c
@@ -120,7 +120,7 @@
struct ffa_value ret;
ret = test_ffa_smc(FFA_VERSION_32, 0x10001, 0, 0, 0, 0, 0, 0);
- EXPECT_EQ(ret.func, 0x10001);
+ EXPECT_EQ(ret.func, 0x10002);
EXPECT_EQ(ret.arg1, 0x0);
EXPECT_EQ(ret.arg2, 0x0);
EXPECT_EQ(ret.arg3, 0x0);
diff --git a/test/vmapi/common/ffa.c b/test/vmapi/common/ffa.c
index f9e4c07..47ff09c 100644
--- a/test/vmapi/common/ffa.c
+++ b/test/vmapi/common/ffa.c
@@ -598,8 +598,6 @@
CHECK(uuid != NULL);
CHECK(info != NULL);
- ffa_version(MAKE_FFA_VERSION(1, 1));
-
ret = ffa_partition_info_get(uuid, 0);
if (ffa_func_id(ret) != FFA_SUCCESS_32) {
@@ -669,7 +667,7 @@
assert(boot_info_header != NULL);
ASSERT_EQ(boot_info_header->signature, 0xFFAU);
- ASSERT_EQ(boot_info_header->version, 0x10001U);
+ ASSERT_GE(boot_info_header->version, 0x10001U);
ASSERT_EQ(boot_info_header->desc_size,
sizeof(struct ffa_boot_info_desc));
ASSERT_EQ((uintptr_t)boot_info_header + boot_info_header->desc_offset,
diff --git a/test/vmapi/ffa_both_worlds_el3_spmc/partition_manifest_nwd_primary.dts b/test/vmapi/ffa_both_worlds_el3_spmc/partition_manifest_nwd_primary.dts
index 2cd43bf..e428a6f 100644
--- a/test/vmapi/ffa_both_worlds_el3_spmc/partition_manifest_nwd_primary.dts
+++ b/test/vmapi/ffa_both_worlds_el3_spmc/partition_manifest_nwd_primary.dts
@@ -13,7 +13,7 @@
debug_name = "partition-manifest";
/* Properties */
- ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0xb4b5671e 0x4a904fe1 0xb81ffb13 0xdae1dacb>;
execution-ctx-count = <8>;
exception-level = <0>; /* EL1 */
diff --git a/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/partition_manifest_service_sp_first.dts b/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/partition_manifest_service_sp_first.dts
index 742342e..f4f9915 100644
--- a/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/partition_manifest_service_sp_first.dts
+++ b/test/vmapi/ffa_both_worlds_el3_spmc/services/arch/aarch64/secure/partition_manifest_service_sp_first.dts
@@ -13,7 +13,7 @@
debug_name = "SP Service First";
/* Properties */
- ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0x9458bb2d 0x353b4ee2 0xaa25710c 0x99b73ddc>;
execution-ctx-count = <8>;
exception-level = <2>; /* S-EL1 */
diff --git a/test/vmapi/ffa_secure_partition_el3_spmc/partition-manifest.dts b/test/vmapi/ffa_secure_partition_el3_spmc/partition-manifest.dts
index 49b90c7..78d8fa1 100644
--- a/test/vmapi/ffa_secure_partition_el3_spmc/partition-manifest.dts
+++ b/test/vmapi/ffa_secure_partition_el3_spmc/partition-manifest.dts
@@ -13,7 +13,7 @@
debug_name = "partition-manifest";
/* Properties */
- ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0xb4b5671e 0x4a904fe1 0xb81ffb13 0xdae1dacb>;
execution-ctx-count = <8>;
exception-level = <2>; /* S-EL1 */
diff --git a/test/vmapi/ffa_secure_partition_el3_spmc/secure_partition.c b/test/vmapi/ffa_secure_partition_el3_spmc/secure_partition.c
index 754a097..9491025 100644
--- a/test/vmapi/ffa_secure_partition_el3_spmc/secure_partition.c
+++ b/test/vmapi/ffa_secure_partition_el3_spmc/secure_partition.c
@@ -292,7 +292,7 @@
EXPECT_TRUE(fdt_is_compatible(&root, "arm,ffa-manifest-1.0"));
EXPECT_TRUE(fdt_read_number(&root, "ffa-version", &ffa_version));
HFTEST_LOG("FF-A Version: %x", ffa_version);
- ASSERT_EQ(ffa_version, MAKE_FFA_VERSION(1, 1));
+ ASSERT_EQ(ffa_version, FFA_VERSION_COMPILED);
}
/**
diff --git a/test/vmapi/ffa_secure_partition_only/partition-manifest.dts b/test/vmapi/ffa_secure_partition_only/partition-manifest.dts
index 65c26eb..27012ed 100644
--- a/test/vmapi/ffa_secure_partition_only/partition-manifest.dts
+++ b/test/vmapi/ffa_secure_partition_only/partition-manifest.dts
@@ -13,7 +13,7 @@
debug_name = "partition-manifest";
/* Properties */
- ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0xb4b5671e 0x4a904fe1 0xb81ffb13 0xdae1dacb>;
execution-ctx-count = <1>;
exception-level = <2>; /* S-EL1 */
diff --git a/test/vmapi/ffa_secure_partition_only/secure_partition.c b/test/vmapi/ffa_secure_partition_only/secure_partition.c
index 13ae95d..2f1a1b1 100644
--- a/test/vmapi/ffa_secure_partition_only/secure_partition.c
+++ b/test/vmapi/ffa_secure_partition_only/secure_partition.c
@@ -417,7 +417,7 @@
EXPECT_TRUE(fdt_is_compatible(&root, "arm,ffa-manifest-1.0"));
EXPECT_TRUE(fdt_read_number(&root, "ffa-version", &ffa_version));
HFTEST_LOG("FF-A Version: %x", ffa_version);
- ASSERT_EQ(ffa_version, MAKE_FFA_VERSION(1, 1));
+ ASSERT_EQ(ffa_version, MAKE_FFA_VERSION(1, 2));
}
/*
diff --git a/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/partition_manifest_service_sp_first.dts b/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/partition_manifest_service_sp_first.dts
index 1775f38..a6c50e7 100644
--- a/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/partition_manifest_service_sp_first.dts
+++ b/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/partition_manifest_service_sp_first.dts
@@ -13,7 +13,7 @@
debug_name = "SP Service First";
/* Properties */
- ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0x9458bb2d 0x353b4ee2 0xaa25710c 0x99b73ddc>;
execution-ctx-count = <8>;
exception-level = <2>; /* S-EL1 */
diff --git a/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/partition_manifest_service_sp_second.dts b/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/partition_manifest_service_sp_second.dts
index 83cc767..71a4ccd 100644
--- a/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/partition_manifest_service_sp_second.dts
+++ b/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/partition_manifest_service_sp_second.dts
@@ -13,7 +13,7 @@
debug_name = "SP Service Second EL1";
/* Properties */
- ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0xa609f132 0x6b4f 0x4c14 0x9489>;
execution-ctx-count = <8>;
exception-level = <2>; /* S-EL1 */
diff --git a/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/partition_manifest_service_sp_third.dts b/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/partition_manifest_service_sp_third.dts
index f3e1500..9e3d923 100644
--- a/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/partition_manifest_service_sp_third.dts
+++ b/test/vmapi/ffa_secure_partitions/services/arch/aarch64/secure/partition_manifest_service_sp_third.dts
@@ -13,7 +13,7 @@
debug_name = "SP Service Third";
/* Properties */
- ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0x1df938ef 0xe8b94490 0x84967204 0xab77f4a5>;
execution-ctx-count = <8>;
exception-level = <2>; /* S-EL1 */
diff --git a/test/vmapi/primary_only/primary_only.c b/test/vmapi/primary_only/primary_only.c
index 69b8208..f45c3e5 100644
--- a/test/vmapi/primary_only/primary_only.c
+++ b/test/vmapi/primary_only/primary_only.c
@@ -165,13 +165,15 @@
TEST(ffa, ffa_version)
{
const uint16_t major_revision = 1;
- const uint16_t minor_revision = 1;
+ const uint16_t minor_revision = 2;
const uint32_t current_version =
(int32_t)MAKE_FFA_VERSION(major_revision, minor_revision);
- const int32_t older_compatible_version = MAKE_FFA_VERSION(1, 0);
+ const int32_t older_compatible_version_0 = MAKE_FFA_VERSION(1, 0);
+ const int32_t older_compatible_version_1 = MAKE_FFA_VERSION(1, 1);
EXPECT_EQ(ffa_version(current_version), current_version);
- EXPECT_EQ(ffa_version(older_compatible_version), current_version);
+ EXPECT_EQ(ffa_version(older_compatible_version_0), current_version);
+ EXPECT_EQ(ffa_version(older_compatible_version_1), current_version);
EXPECT_EQ(ffa_version(0x0), (int32_t)FFA_NOT_SUPPORTED);
EXPECT_EQ(ffa_version(0x1), (int32_t)FFA_NOT_SUPPORTED);
EXPECT_EQ(ffa_version(0x10003), (int32_t)FFA_NOT_SUPPORTED);
@@ -288,6 +290,20 @@
ret = ffa_features(FFA_MSG_SEND2_32);
EXPECT_EQ(ret.func, FFA_SUCCESS_32);
#endif
+
+#if (MAKE_FFA_VERSION(1, 2) <= FFA_VERSION_COMPILED)
+ ret = ffa_features(FFA_CONSOLE_LOG_32);
+ EXPECT_EQ(ret.func, FFA_SUCCESS_32);
+
+ ret = ffa_features(FFA_CONSOLE_LOG_64);
+ EXPECT_EQ(ret.func, FFA_SUCCESS_32);
+
+ ret = ffa_features(FFA_PARTITION_INFO_GET_REGS_64);
+ EXPECT_EQ(ret.func, FFA_SUCCESS_32);
+
+ ret = ffa_features(FFA_EL3_INTR_HANDLE_32);
+ EXPECT_EQ(ret.func, FFA_SUCCESS_32);
+#endif
}
/**
diff --git a/test/vmapi/primary_only_ffa/partition-manifest.dts b/test/vmapi/primary_only_ffa/partition-manifest.dts
index c44728c..76b21a8 100644
--- a/test/vmapi/primary_only_ffa/partition-manifest.dts
+++ b/test/vmapi/primary_only_ffa/partition-manifest.dts
@@ -13,7 +13,7 @@
debug_name = "partition-manifest";
/* Properties */
- ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0xb4b5671e 0x4a904fe1 0xb81ffb13 0xdae1dacb>;
execution-ctx-count = <1>;
exception-level = <0>; /* EL1 */
diff --git a/test/vmapi/primary_with_secondaries/indirect_messaging.c b/test/vmapi/primary_with_secondaries/indirect_messaging.c
index aba8180..e561f4f 100644
--- a/test/vmapi/primary_with_secondaries/indirect_messaging.c
+++ b/test/vmapi/primary_with_secondaries/indirect_messaging.c
@@ -19,8 +19,11 @@
SET_UP(indirect_messaging)
{
- /* Call FFA_VERSION to inform the hypervisor we are v1.1. */
- ffa_version(MAKE_FFA_VERSION(1, 1));
+ /*
+ * Call FFA_VERSION to inform the hypervisor of the compiled FF-A
+ * Version.
+ */
+ ffa_version(FFA_VERSION_COMPILED);
}
/**
diff --git a/test/vmapi/primary_with_secondaries/memory_sharing.c b/test/vmapi/primary_with_secondaries/memory_sharing.c
index ded1950..7b9014b 100644
--- a/test/vmapi/primary_with_secondaries/memory_sharing.c
+++ b/test/vmapi/primary_with_secondaries/memory_sharing.c
@@ -281,7 +281,7 @@
SET_UP(memory_sharing)
{
- ffa_version(MAKE_FFA_VERSION(1, 1));
+ ffa_version(FFA_VERSION_COMPILED);
}
/**
diff --git a/test/vmapi/primary_with_secondaries/partition_manifest_nwd_primary.dts b/test/vmapi/primary_with_secondaries/partition_manifest_nwd_primary.dts
index 238d1fd..44bd89e 100644
--- a/test/vmapi/primary_with_secondaries/partition_manifest_nwd_primary.dts
+++ b/test/vmapi/primary_with_secondaries/partition_manifest_nwd_primary.dts
@@ -13,7 +13,7 @@
debug_name = "partition-manifest";
/* Properties */
- ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0xbdfaab86 0xe9ee 0x409a 0xde614c01>;
execution-ctx-count = <8>;
exception-level = <0>; /* EL1 */
diff --git a/test/vmapi/primary_with_secondaries/service1.dts b/test/vmapi/primary_with_secondaries/service1.dts
index 78b00af..997e450 100644
--- a/test/vmapi/primary_with_secondaries/service1.dts
+++ b/test/vmapi/primary_with_secondaries/service1.dts
@@ -13,7 +13,7 @@
debug_name = "Service1";
/* FF-A Properties */
- ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0xb4b5671e 0x4a904fe1 0xb81ffb13 0xdae1dacb>;
execution-ctx-count = <8>;
exception-level = <0>; /* EL1 */
diff --git a/test/vmapi/primary_with_secondaries/service2.dts b/test/vmapi/primary_with_secondaries/service2.dts
index a9e6f02..9294b7c 100644
--- a/test/vmapi/primary_with_secondaries/service2.dts
+++ b/test/vmapi/primary_with_secondaries/service2.dts
@@ -13,7 +13,7 @@
debug_name = "Service2";
/* FF-A Properties */
- ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0x5d45882e 0xf637 0xa720 0xe8669dc>;
execution-ctx-count = <8>;
exception-level = <0>; /* EL1 */
diff --git a/test/vmapi/primary_with_secondaries/service3.dts b/test/vmapi/primary_with_secondaries/service3.dts
index 2b39af0..44bd793 100644
--- a/test/vmapi/primary_with_secondaries/service3.dts
+++ b/test/vmapi/primary_with_secondaries/service3.dts
@@ -13,7 +13,7 @@
debug_name = "Service3";
/* FF-A Properties */
- ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0xcbd4482f 0xcbab 0x4dba 0x0738d>;
execution-ctx-count = <8>;
exception-level = <0>; /* EL1 */
diff --git a/test/vmapi/primary_with_secondaries/services/arch/aarch64/el0/service2.dts b/test/vmapi/primary_with_secondaries/services/arch/aarch64/el0/service2.dts
index 31e848f..5bb0ab8 100644
--- a/test/vmapi/primary_with_secondaries/services/arch/aarch64/el0/service2.dts
+++ b/test/vmapi/primary_with_secondaries/services/arch/aarch64/el0/service2.dts
@@ -13,7 +13,7 @@
debug_name = "partition-manifest";
/* Properties */
- ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0x5d45882e 0xf637 0xa720 0xe8669dc>;
execution-ctx-count = <1>;
exception-level = <6>; /* EL0 */
diff --git a/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/el0/partition_manifest_service_sp1.dts b/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/el0/partition_manifest_service_sp1.dts
index 2ab6e03..978dc13 100644
--- a/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/el0/partition_manifest_service_sp1.dts
+++ b/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/el0/partition_manifest_service_sp1.dts
@@ -13,7 +13,7 @@
debug_name = "Secure Service1 EL0";
/* Properties */
- ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0xb4b5671e 0x4a904fe1 0xb81ffb13 0xdae1dacb>;
execution-ctx-count = <1>;
exception-level = <1>; /* S-EL0 */
diff --git a/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/el0/partition_manifest_service_sp2.dts b/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/el0/partition_manifest_service_sp2.dts
index bb2b4bb..90f3ee3 100644
--- a/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/el0/partition_manifest_service_sp2.dts
+++ b/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/el0/partition_manifest_service_sp2.dts
@@ -13,7 +13,7 @@
debug_name = "Secure Service2";
/* Properties */
- ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0x5d45882e 0xf637 0xa720 0xe8669dc>;
execution-ctx-count = <1>;
exception-level = <1>; /* S-EL1 */
diff --git a/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/partition_manifest_service_sp1.dts b/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/partition_manifest_service_sp1.dts
index 9532d0e..964f792 100644
--- a/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/partition_manifest_service_sp1.dts
+++ b/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/partition_manifest_service_sp1.dts
@@ -13,7 +13,7 @@
debug_name = "Secure Service1";
/* Properties */
- ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0xb4b5671e 0x4a904fe1 0xb81ffb13 0xdae1dacb>;
execution-ctx-count = <8>;
exception-level = <2>; /* S-EL1 */
diff --git a/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/partition_manifest_service_sp2.dts b/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/partition_manifest_service_sp2.dts
index 119a0ad..d8642cd 100644
--- a/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/partition_manifest_service_sp2.dts
+++ b/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/partition_manifest_service_sp2.dts
@@ -13,7 +13,7 @@
debug_name = "Secure Service2";
/* Properties */
- ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0x5d45882e 0xf637 0xa720 0xe8669dc>;
execution-ctx-count = <8>;
exception-level = <2>; /* S-EL1 */
diff --git a/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/partition_manifest_service_sp3.dts b/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/partition_manifest_service_sp3.dts
index b3c48fe..5d461d3 100644
--- a/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/partition_manifest_service_sp3.dts
+++ b/test/vmapi/primary_with_secondaries/services/arch/aarch64/secure/partition_manifest_service_sp3.dts
@@ -13,7 +13,7 @@
debug_name = "Secure Service3";
/* Properties */
- ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0xcbd4482f 0xcbab 0x4dba 0x0738d>;
execution-ctx-count = <8>;
exception-level = <2>; /* S-EL1 */