commit b5a6399b99f09d3cf674d9709dc7e15ed3b9f29f
author J-Alves <joao.alves@arm.com> Fri Apr 30 10:23:19 2021 +0100
committer J-Alves <joao.alves@arm.com> Fri Apr 30 13:35:21 2021 +0100
tree 09d508aa24bb60854e0b3482887966241f23ffaf
parent 10446d8dec05a1b4ae2812ed91666af442b93c1f

Tests: Enabling FEAT_BTI and FEAT_PAUTH on FVP

Change-Id: I7d19e3604e6662df0e24db1d24952cd01ac1571a
Signed-off-by: J-Alves <joao.alves@arm.com>

test/hftest/hftest.py

diff --git a/test/hftest/hftest.py b/test/hftest/hftest.py
index 9cba489..2e70abf 100755
--- a/test/hftest/hftest.py
+++ b/test/hftest/hftest.py
@@ -499,8 +499,12 @@
         fvp_args += [
                 "-C", f"bp.pl011_uart0.in_file={FvpDriverSPMC.HFTEST_CMD_FILE}",
                 "-C", f"bp.pl011_uart0.shutdown_tag=\"{HFTEST_CTRL_FINISHED}\"",
-                "-C", "cluster0.has_arm_v8-4=1",
-                "-C", "cluster1.has_arm_v8-4=1",
+                "-C", "cluster0.has_arm_v8-5=1",
+                "-C", "cluster1.has_arm_v8-5=1",
+                "-C", "cluster0.has_branch_target_exception=1",
+                "-C", "cluster1.has_branch_target_exception=1",
+                "-C", "cluster0.restriction_on_speculative_execution=2",
+                "-C", "cluster1.restriction_on_speculative_execution=2",
             ]
         img_ldadd = self.get_img_and_ldadd(self.args.partitions["SPs"])
         for img, ldadd in img_ldadd: