Merge changes from topic "ja/ffa_v1_3"
* changes:
test(spm): bump partitions to FF-A v1.3
fix: the FF-A version compatibility check
chore: drop unused FF-A version macros
test(ff-a): bump FF-A version to v1.3
diff --git a/include/runtime_services/ffa_helpers.h b/include/runtime_services/ffa_helpers.h
index 67fd393..1675b6e 100644
--- a/include/runtime_services/ffa_helpers.h
+++ b/include/runtime_services/ffa_helpers.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2023, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2025, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -23,7 +23,8 @@
FFA_VERSION_1_0 = 0x10000,
FFA_VERSION_1_1 = 0x10001,
FFA_VERSION_1_2 = 0x10002,
- FFA_VERSION_COMPILED = FFA_VERSION_1_2,
+ FFA_VERSION_1_3 = 0x10003,
+ FFA_VERSION_COMPILED = FFA_VERSION_1_3,
};
#define FFA_VERSION_MBZ_BIT (1U << 31U)
diff --git a/spm/cactus/plat/arm/fvp/fdts/cactus-secondary.dts b/spm/cactus/plat/arm/fvp/fdts/cactus-secondary.dts
index a8130c6..cae5884 100644
--- a/spm/cactus/plat/arm/fvp/fdts/cactus-secondary.dts
+++ b/spm/cactus/plat/arm/fvp/fdts/cactus-secondary.dts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019-2023, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2025, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -15,7 +15,7 @@
/* Properties */
description = "Base-1";
- ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010003>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0x092358d1 0xb94723f0 0x64447c82 0xc88f57f5>;
id = <2>;
auxiliary-id = <0xae>;
diff --git a/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts b/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts
index 6c0ea57..af0d4a7 100644
--- a/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts
+++ b/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020-2023, Arm Limited. All rights reserved.
+ * Copyright (c) 2020-2025, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -15,7 +15,7 @@
/* Properties */
description = "Base-1";
- ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010003>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0x735cb579 0xb9448c1d 0xe1619385 0xd2d80a77>;
id = <3>;
auxiliary-id = <0xae>;
diff --git a/spm/cactus/plat/arm/fvp/fdts/cactus.dts b/spm/cactus/plat/arm/fvp/fdts/cactus.dts
index 3a11a41..3ca54f4 100644
--- a/spm/cactus/plat/arm/fvp/fdts/cactus.dts
+++ b/spm/cactus/plat/arm/fvp/fdts/cactus.dts
@@ -15,7 +15,7 @@
/* Properties */
description = "Base-1";
- ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010003>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0x1e67b5b4 0xe14f904a 0x13fb1fb8 0xcbdae1da>;
id = <1>;
auxiliary-id = <0xae>;
diff --git a/spm/cactus/plat/arm/tc/fdts/cactus-secondary.dts b/spm/cactus/plat/arm/tc/fdts/cactus-secondary.dts
index aa48e29..f883ee8 100644
--- a/spm/cactus/plat/arm/tc/fdts/cactus-secondary.dts
+++ b/spm/cactus/plat/arm/tc/fdts/cactus-secondary.dts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020-2023, Arm Limited. All rights reserved.
+ * Copyright (c) 2020-2025, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -15,7 +15,7 @@
/* Properties */
description = "cactus-2";
- ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010003>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0x092358d1 0xb94723f0 0x64447c82 0xc88f57f5>;
id = <2>;
execution-ctx-count = <8>;
diff --git a/spm/cactus/plat/arm/tc/fdts/cactus-tertiary.dts b/spm/cactus/plat/arm/tc/fdts/cactus-tertiary.dts
index 145be36..0523bae 100644
--- a/spm/cactus/plat/arm/tc/fdts/cactus-tertiary.dts
+++ b/spm/cactus/plat/arm/tc/fdts/cactus-tertiary.dts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020-2023, Arm Limited. All rights reserved.
+ * Copyright (c) 2020-2025, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -15,7 +15,7 @@
/* Properties */
description = "cactus-3";
- ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010003>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0x735cb579 0xb9448c1d 0xe1619385 0xd2d80a77>;
id = <3>;
execution-ctx-count = <1>;
diff --git a/spm/cactus/plat/arm/tc/fdts/cactus.dts b/spm/cactus/plat/arm/tc/fdts/cactus.dts
index a4c71fe..4bde6e2 100644
--- a/spm/cactus/plat/arm/tc/fdts/cactus.dts
+++ b/spm/cactus/plat/arm/tc/fdts/cactus.dts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020-2023, Arm Limited. All rights reserved.
+ * Copyright (c) 2020-2025, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -15,7 +15,7 @@
/* Properties */
description = "cactus-1";
- ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010003>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0x1e67b5b4 0xe14f904a 0x13fb1fb8 0xcbdae1da>;
id = <1>;
execution-ctx-count = <8>;
diff --git a/spm/common/sp_tests/sp_test_ffa.c b/spm/common/sp_tests/sp_test_ffa.c
index fcc4780..951e44b 100644
--- a/spm/common/sp_tests/sp_test_ffa.c
+++ b/spm/common/sp_tests/sp_test_ffa.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2024, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2025, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -15,10 +15,6 @@
#include <spm_common.h>
#include <lib/libc/string.h>
-/* FFA version test helpers */
-#define FFA_MAJOR 1U
-#define FFA_MINOR 2U
-
static uint32_t spm_version;
static const struct ffa_uuid sp_uuids[] = {
@@ -207,9 +203,8 @@
struct ffa_value ret = ffa_version(FFA_VERSION_COMPILED);
spm_version = (uint32_t)ret.fid;
- EXPECT(spm_version, FFA_VERSION_COMPILED);
- bool compatible = ffa_versions_are_compatible(spm_version, FFA_VERSION_COMPILED);
+ bool compatible = ffa_versions_are_compatible(FFA_VERSION_COMPILED, spm_version);
INFO("Test FFA_VERSION. Return %u.%u; Compatible: %i\n",
ffa_version_get_major(spm_version),
diff --git a/spm/ivy/app/plat/arm/fvp/fdts/ivy-sel0.dts b/spm/ivy/app/plat/arm/fvp/fdts/ivy-sel0.dts
index f885c5f..c466356 100644
--- a/spm/ivy/app/plat/arm/fvp/fdts/ivy-sel0.dts
+++ b/spm/ivy/app/plat/arm/fvp/fdts/ivy-sel0.dts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022-2023, Arm Limited. All rights reserved.
+ * Copyright (c) 2022-2025, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -15,7 +15,7 @@
/* Properties */
description = "ivy-sel0-fvp";
- ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010003>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0xd883baea 0xaf4eafba 0xfdf74481 0xa744e5cb>;
execution-ctx-count = <1>;
exception-level = <1>; /* S-EL0 */
diff --git a/spm/ivy/app/plat/arm/fvp/fdts/ivy-sel1.dts b/spm/ivy/app/plat/arm/fvp/fdts/ivy-sel1.dts
index 1dfca01..35af412 100644
--- a/spm/ivy/app/plat/arm/fvp/fdts/ivy-sel1.dts
+++ b/spm/ivy/app/plat/arm/fvp/fdts/ivy-sel1.dts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2023, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2025, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -16,7 +16,7 @@
/* Properties */
description = "ivy-sel1-fvp";
- ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010003>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0xd883baea 0xaf4eafba 0xfdf74481 0xa744e5cb>;
execution-ctx-count = <1>;
exception-level = <2>; /* S-EL1 */
diff --git a/spm/ivy/app/plat/arm/tc/fdts/ivy-sel0.dts b/spm/ivy/app/plat/arm/tc/fdts/ivy-sel0.dts
index 1dd3b61..2358393 100644
--- a/spm/ivy/app/plat/arm/tc/fdts/ivy-sel0.dts
+++ b/spm/ivy/app/plat/arm/tc/fdts/ivy-sel0.dts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022-2023, Arm Limited. All rights reserved.
+ * Copyright (c) 2022-2025, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -14,7 +14,7 @@
/* Properties */
description = "ivy-sel0-tc";
- ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010003>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0xd883baea 0xaf4eafba 0xfdf74481 0xa744e5cb>;
execution-ctx-count = <1>;
exception-level = <1>; /* S-EL0 */
diff --git a/spm/ivy/app/plat/arm/tc/fdts/ivy-sel1.dts b/spm/ivy/app/plat/arm/tc/fdts/ivy-sel1.dts
index bcb3162..716d8dd 100644
--- a/spm/ivy/app/plat/arm/tc/fdts/ivy-sel1.dts
+++ b/spm/ivy/app/plat/arm/tc/fdts/ivy-sel1.dts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020-2023, Arm Limited. All rights reserved.
+ * Copyright (c) 2020-2025, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -15,7 +15,7 @@
/* Properties */
description = "ivy-sel1-tc";
- ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010003>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0xd883baea 0xaf4eafba 0xfdf74481 0xa744e5cb>;
execution-ctx-count = <1>;
exception-level = <2>; /* S-EL1 */