Merge "feat(ras): introduce RAS KFH support test"
diff --git a/spm/cactus/plat/arm/fvp/fdts/cactus-secondary.dts b/spm/cactus/plat/arm/fvp/fdts/cactus-secondary.dts
index a8fd83d..871cf0b 100644
--- a/spm/cactus/plat/arm/fvp/fdts/cactus-secondary.dts
+++ b/spm/cactus/plat/arm/fvp/fdts/cactus-secondary.dts
@@ -26,7 +26,7 @@
 	load-address = <0x7100000>;
 	entrypoint-offset = <0x00004000>;
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = <0>;
+	boot-order = <1>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non secure interrupts are signaled. */
 	notification-support; /* Support receipt of notifications. */
diff --git a/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts b/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts
index a9d5e50..65a5c23 100644
--- a/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts
+++ b/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts
@@ -26,7 +26,7 @@
 	load-address = <0x7200000>;
 	entrypoint-offset = <0x00004000>;
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = <0>;
+	boot-order = <2>;
 	notification-support;
 	messaging-method = <3>; /* Direct messaging only */
 	managed-exit; /* Managed exit is supported */
diff --git a/spm/cactus/plat/arm/tc0/fdts/cactus-secondary.dts b/spm/cactus/plat/arm/tc0/fdts/cactus-secondary.dts
index 13d489c..01caf4d 100644
--- a/spm/cactus/plat/arm/tc0/fdts/cactus-secondary.dts
+++ b/spm/cactus/plat/arm/tc0/fdts/cactus-secondary.dts
@@ -24,7 +24,7 @@
 	load-address = <0xfe100000>;
 	entrypoint-offset = <0x00004000>;
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = <0>;
+	boot-order = <1>;
 	messaging-method = <3>; /* Direct messaging only */
 	notification-support; /* Support receipt of notifications. */
 	run-time-model = <1>; /* Run to completion */
diff --git a/spm/cactus/plat/arm/tc0/fdts/cactus-tertiary.dts b/spm/cactus/plat/arm/tc0/fdts/cactus-tertiary.dts
index 79ccb64..dba2777 100644
--- a/spm/cactus/plat/arm/tc0/fdts/cactus-tertiary.dts
+++ b/spm/cactus/plat/arm/tc0/fdts/cactus-tertiary.dts
@@ -24,7 +24,7 @@
 	load-address = <0xfe200000>;
 	entrypoint-offset = <0x00004000>;
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = <0>;
+	boot-order = <2>;
 	messaging-method = <3>; /* Direct messaging only */
 	notification-support; /* Support receipt of notifications. */
 	run-time-model = <1>; /* Run to completion */
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 76a5e3c..3317e21 100644
--- a/spm/ivy/app/plat/arm/fvp/fdts/ivy-sel0.dts
+++ b/spm/ivy/app/plat/arm/fvp/fdts/ivy-sel0.dts
@@ -22,7 +22,7 @@
 	execution-state = <0>; /* AARCH64 */
 	load-address = <0x7600000>;
 	entrypoint-offset = <0x00004000>;
-	boot-order = <0>;
+	boot-order = <3>;
 	messaging-method = <3>; /* Direct messaging only */
 
 	/* Boot protocol */
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 36c04ba..eb6108a 100644
--- a/spm/ivy/app/plat/arm/fvp/fdts/ivy-sel1.dts
+++ b/spm/ivy/app/plat/arm/fvp/fdts/ivy-sel1.dts
@@ -23,7 +23,7 @@
 	execution-state = <0>; /* AARCH64 */
 	load-address = <0x7600000>;
 	entrypoint-offset = <0x00004000>;
-	boot-order = <0>;
+	boot-order = <3>;
 	messaging-method = <3>; /* Direct messaging only */
 	/* Non-secure interrupts are signaled by default. */
 
diff --git a/spm/ivy/app/plat/arm/tc0/fdts/ivy-sel0.dts b/spm/ivy/app/plat/arm/tc0/fdts/ivy-sel0.dts
index 93e7da3..f8d4f63 100644
--- a/spm/ivy/app/plat/arm/tc0/fdts/ivy-sel0.dts
+++ b/spm/ivy/app/plat/arm/tc0/fdts/ivy-sel0.dts
@@ -21,7 +21,7 @@
 	execution-state = <0>; /* AARCH64 */
 	load-address = <0xfe280000>;
 	entrypoint-offset = <0x00004000>;
-	boot-order = <0>;
+	boot-order = <3>;
 	messaging-method = <3>; /* Direct messaging only */
 
 	/* Boot protocol */
diff --git a/spm/ivy/app/plat/arm/tc0/fdts/ivy-sel1.dts b/spm/ivy/app/plat/arm/tc0/fdts/ivy-sel1.dts
index 1d4df60..d9da2a5 100644
--- a/spm/ivy/app/plat/arm/tc0/fdts/ivy-sel1.dts
+++ b/spm/ivy/app/plat/arm/tc0/fdts/ivy-sel1.dts
@@ -22,7 +22,7 @@
 	execution-state = <0>; /* AARCH64 */
 	load-address = <0xfe280000>;
 	entrypoint-offset = <0x00004000>;
-	boot-order = <0>;
+	boot-order = <3>;
 	messaging-method = <3>; /* Direct messaging only */
 
 	/* Boot protocol */
diff --git a/tftf/tests/extensions/sme/test_sme.c b/tftf/tests/extensions/sme/test_sme.c
index 58690ea..64391ab 100644
--- a/tftf/tests/extensions/sme/test_sme.c
+++ b/tftf/tests/extensions/sme/test_sme.c
@@ -17,10 +17,9 @@
 #ifdef __aarch64__
 
 /* Global buffers*/
-static uint64_t ZA_In_vector[8] = {0xaaff, 0xbbff, 0xccff, 0xddff, 0xeeff,
+static __aligned(16) uint64_t ZA_In_vector[8] = {0xaaff, 0xbbff, 0xccff, 0xddff, 0xeeff,
 					0xffff, 0xff00, 0xff00};
-static uint64_t ZA_Out_vector[8] = {0};
-
+static __aligned(16) uint64_t ZA_Out_vector[8] = {0};
 
 /**
  * sme_zero_ZA
diff --git a/tftf/tests/extensions/sme/test_sme2.c b/tftf/tests/extensions/sme/test_sme2.c
index 67122f2..c16b7c3 100644
--- a/tftf/tests/extensions/sme/test_sme2.c
+++ b/tftf/tests/extensions/sme/test_sme2.c
@@ -19,8 +19,8 @@
 #define SME2_INPUT_DATA		(0x1fffffffffffffff)
 
 /* Global buffers */
-static uint64_t sme2_input_buffer[SME2_ARRAYSIZE] = {0};
-static uint64_t sme2_output_buffer[SME2_ARRAYSIZE] = {0};
+static __aligned(16) uint64_t sme2_input_buffer[SME2_ARRAYSIZE] = {0};
+static __aligned(16) uint64_t sme2_output_buffer[SME2_ARRAYSIZE] = {0};
 
 /*
  * clear_ZT0: ZERO all bytes of the ZT0 register.