ci: use new panic expect script in trace and BRBE test configs
The newly introduced panic expect script was used in trace and
BRBE extension test configurations to verify the panic occurs
when accessing registers that correspond to these extensions
from lower ELs.
These changes have been made as a effect of this patch [1]/
Also, refactored the code to move duplicated code into the
common header.
[1]: https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/18002
Change-Id: I70d2b45397e2011b68f9f5a5040c12c173fa6838
Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>
diff --git a/expect-lava/crash_roxlattables_unhandled_exception_at_el3.exp b/expect-lava/crash_roxlattables_unhandled_exception_at_el3.exp
index dd97369..e117882 100644
--- a/expect-lava/crash_roxlattables_unhandled_exception_at_el3.exp
+++ b/expect-lava/crash_roxlattables_unhandled_exception_at_el3.exp
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2021-2022, Arm Limited. All rights reserved.
+# Copyright (c) 2021-2023, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -8,81 +8,4 @@
expect_string+=('i;Translation tables are now read-only at EL3.')
expect_string+=('i;Unhandled Exception in EL3.')
-expect_string+=('i;x30')
-expect_string+=('i;x0')
-expect_string+=('i;x1')
-expect_string+=('i;x2')
-expect_string+=('i;x3')
-expect_string+=('i;x4')
-expect_string+=('i;x5')
-expect_string+=('i;x6')
-expect_string+=('i;x7')
-expect_string+=('i;x8')
-expect_string+=('i;x9')
-expect_string+=('i;x10')
-expect_string+=('i;x11')
-expect_string+=('i;x12')
-expect_string+=('i;x13')
-expect_string+=('i;x14')
-expect_string+=('i;x15')
-expect_string+=('i;x16')
-expect_string+=('i;x17')
-expect_string+=('i;x18')
-expect_string+=('i;x19')
-expect_string+=('i;x20')
-expect_string+=('i;x21')
-expect_string+=('i;x22')
-expect_string+=('i;x23')
-expect_string+=('i;x24')
-expect_string+=('i;x25')
-expect_string+=('i;x26')
-expect_string+=('i;x27')
-expect_string+=('i;x28')
-expect_string+=('i;x29')
-expect_string+=('i;scr_el3')
-expect_string+=('i;sctlr_el3')
-expect_string+=('i;cptr_el3')
-expect_string+=('i;tcr_el3')
-expect_string+=('i;daif')
-expect_string+=('i;mair_el3')
-expect_string+=('i;spsr_el3')
-expect_string+=('i;elr_el3')
-expect_string+=('i;ttbr0_el3')
-expect_string+=('i;esr_el3')
-expect_string+=('i;far_el3')
-expect_string+=('i;spsr_el1')
-expect_string+=('i;elr_el1')
-expect_string+=('i;spsr_abt')
-expect_string+=('i;spsr_und')
-expect_string+=('i;spsr_irq')
-expect_string+=('i;spsr_fiq')
-expect_string+=('i;sctlr_el1')
-expect_string+=('i;actlr_el1')
-expect_string+=('i;cpacr_el1')
-expect_string+=('i;csselr_el1')
-expect_string+=('i;sp_el1')
-expect_string+=('i;esr_el1')
-expect_string+=('i;ttbr0_el1')
-expect_string+=('i;ttbr1_el1')
-expect_string+=('i;mair_el1')
-expect_string+=('i;amair_el1')
-expect_string+=('i;tcr_el1')
-expect_string+=('i;tpidr_el1')
-expect_string+=('i;tpidr_el0')
-expect_string+=('i;tpidrro_el0')
-expect_string+=('i;par_el1')
-expect_string+=('i;mpidr_el1')
-expect_string+=('i;afsr0_el1')
-expect_string+=('i;afsr1_el1')
-expect_string+=('i;contextidr_el1')
-expect_string+=('i;vbar_el1')
-expect_string+=('i;cntp_ctl_el0')
-expect_string+=('i;cntp_cval_el0')
-expect_string+=('i;cntv_ctl_el0')
-expect_string+=('i;cntv_cval_el0')
-expect_string+=('i;cntkctl_el1')
-expect_string+=('i;sp_el0')
-expect_string+=('i;isr_el1')
-expect_string+=('i;icc_hppir0_el1')
-expect_string+=('i;icc_hppir1_el1')
-expect_string+=('i;icc_ctlr_el3')
+source $ci_root/expect-lava/exception_regs.inc
diff --git a/expect-lava/crash_test.exp b/expect-lava/crash_test.exp
index 5305978..0cdb3a0 100644
--- a/expect-lava/crash_test.exp
+++ b/expect-lava/crash_test.exp
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2021-2022 Arm Limited. All rights reserved.
+# Copyright (c) 2021-2023 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -8,83 +8,4 @@
expect_string+=('i;Unhandled External Abort received')
expect_string+=('i;Unhandled Exception from EL2')
-expect_string+=('i;x0')
-expect_string+=('i;x1')
-expect_string+=('i;x2')
-expect_string+=('i;x3')
-expect_string+=('i;x4')
-expect_string+=('i;x5')
-expect_string+=('i;x6')
-expect_string+=('i;x7')
-expect_string+=('i;x8')
-expect_string+=('i;x9')
-expect_string+=('i;x10')
-expect_string+=('i;x11')
-expect_string+=('i;x12')
-expect_string+=('i;x13')
-expect_string+=('i;x14')
-expect_string+=('i;x15')
-expect_string+=('i;x16')
-expect_string+=('i;x17')
-expect_string+=('i;x18')
-expect_string+=('i;x19')
-expect_string+=('i;x20')
-expect_string+=('i;x21')
-expect_string+=('i;x22')
-expect_string+=('i;x23')
-expect_string+=('i;x24')
-expect_string+=('i;x25')
-expect_string+=('i;x26')
-expect_string+=('i;x27')
-expect_string+=('i;x28')
-expect_string+=('i;x29')
-expect_string+=('i;x30')
-expect_string+=('i;scr_el3')
-expect_string+=('i;sctlr_el3')
-expect_string+=('i;cptr_el3')
-expect_string+=('i;tcr_el3')
-expect_string+=('i;daif')
-expect_string+=('i;mair_el3')
-expect_string+=('i;spsr_el3')
-expect_string+=('i;elr_el3')
-expect_string+=('i;ttbr0_el3')
-expect_string+=('i;esr_el3')
-expect_string+=('i;far_el3')
-expect_string+=('i;spsr_el1')
-expect_string+=('i;elr_el1')
-expect_string+=('i;spsr_abt')
-expect_string+=('i;spsr_und')
-expect_string+=('i;spsr_irq')
-expect_string+=('i;spsr_fiq')
-expect_string+=('i;sctlr_el1')
-expect_string+=('i;actlr_el1')
-expect_string+=('i;cpacr_el1')
-expect_string+=('i;csselr_el1')
-expect_string+=('i;sp_el1')
-expect_string+=('i;esr_el1')
-expect_string+=('i;ttbr0_el1')
-expect_string+=('i;ttbr1_el1')
-expect_string+=('i;mair_el1')
-expect_string+=('i;amair_el1')
-expect_string+=('i;tcr_el1')
-expect_string+=('i;tpidr_el1')
-expect_string+=('i;tpidr_el0')
-expect_string+=('i;tpidrro_el0')
-expect_string+=('i;par_el1')
-expect_string+=('i;mpidr_el1')
-expect_string+=('i;afsr0_el1')
-expect_string+=('i;afsr1_el1')
-expect_string+=('i;contextidr_el1')
-expect_string+=('i;vbar_el1')
-expect_string+=('i;cntp_ctl_el0')
-expect_string+=('i;cntp_cval_el0')
-expect_string+=('i;cntv_ctl_el0')
-expect_string+=('i;cntv_cval_el0')
-expect_string+=('i;cntkctl_el1')
-expect_string+=('i;sp_el0')
-expect_string+=('i;isr_el1')
-expect_string+=('i;dacr32_el2')
-expect_string+=('i;ifsr32_el2')
-expect_string+=('i;icc_hppir0_el1')
-expect_string+=('i;icc_hppir1_el1')
-expect_string+=('i;icc_ctlr_el3')
+source $ci_root/expect-lava/exception_regs.inc
diff --git a/expect-lava/unhandled_exception_at_el3.exp b/expect-lava/exception_regs.inc
similarity index 95%
rename from expect-lava/unhandled_exception_at_el3.exp
rename to expect-lava/exception_regs.inc
index 8e896c0..919b30b 100644
--- a/expect-lava/unhandled_exception_at_el3.exp
+++ b/expect-lava/exception_regs.inc
@@ -1,13 +1,10 @@
#
-# Copyright (c) 2021, Arm Limited. All rights reserved.
+# Copyright (c) 2023, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
# Expect script for Trusted Firmware Test Framework
#
-
-expect_string+=("i;Unhandled Exception in EL3.")
-expect_string+=("i;x30")
expect_string+=("i;x0")
expect_string+=("i;x1")
expect_string+=("i;x2")
@@ -38,6 +35,7 @@
expect_string+=("i;x27")
expect_string+=("i;x28")
expect_string+=("i;x29")
+expect_string+=("i;x30")
expect_string+=("i;scr_el3")
expect_string+=("i;sctlr_el3")
expect_string+=("i;cptr_el3")
diff --git a/expect-lava/panic_in_el3.exp b/expect-lava/panic_in_el3.exp
new file mode 100644
index 0000000..25dea3c
--- /dev/null
+++ b/expect-lava/panic_in_el3.exp
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2023, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+# Expect script for Trusted Firmware Test Framework
+#
+
+expect_string+=("i;PANIC in EL3.")
+source $ci_root/expect-lava/exception_regs.inc
diff --git a/expect/crash_roxlattables_unhandled_exception_at_el3.exp b/expect/crash_roxlattables_unhandled_exception_at_el3.exp
index 5c7c61f..4c41eac 100644
--- a/expect/crash_roxlattables_unhandled_exception_at_el3.exp
+++ b/expect/crash_roxlattables_unhandled_exception_at_el3.exp
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2020-2022, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2023, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -10,81 +10,5 @@
expect_string "Translation tables are now read-only at EL3."
expect_string "Unhandled Exception in EL3."
-expect_string "x30"
-expect_string "x0"
-expect_string "x1"
-expect_string "x2"
-expect_string "x3"
-expect_string "x4"
-expect_string "x5"
-expect_string "x6"
-expect_string "x7"
-expect_string "x8"
-expect_string "x9"
-expect_string "x10"
-expect_string "x11"
-expect_string "x12"
-expect_string "x13"
-expect_string "x14"
-expect_string "x15"
-expect_string "x16"
-expect_string "x17"
-expect_string "x18"
-expect_string "x19"
-expect_string "x20"
-expect_string "x21"
-expect_string "x22"
-expect_string "x23"
-expect_string "x24"
-expect_string "x25"
-expect_string "x26"
-expect_string "x27"
-expect_string "x28"
-expect_string "x29"
-expect_string "scr_el3"
-expect_string "sctlr_el3"
-expect_string "cptr_el3"
-expect_string "tcr_el3"
-expect_string "daif"
-expect_string "mair_el3"
-expect_string "spsr_el3"
-expect_string "elr_el3"
-expect_string "ttbr0_el3"
-expect_string "esr_el3"
-expect_string "far_el3"
-expect_string "spsr_el1"
-expect_string "elr_el1"
-expect_string "spsr_abt"
-expect_string "spsr_und"
-expect_string "spsr_irq"
-expect_string "spsr_fiq"
-expect_string "sctlr_el1"
-expect_string "actlr_el1"
-expect_string "cpacr_el1"
-expect_string "csselr_el1"
-expect_string "sp_el1"
-expect_string "esr_el1"
-expect_string "ttbr0_el1"
-expect_string "ttbr1_el1"
-expect_string "mair_el1"
-expect_string "amair_el1"
-expect_string "tcr_el1"
-expect_string "tpidr_el1"
-expect_string "tpidr_el0"
-expect_string "tpidrro_el0"
-expect_string "par_el1"
-expect_string "mpidr_el1"
-expect_string "afsr0_el1"
-expect_string "afsr1_el1"
-expect_string "contextidr_el1"
-expect_string "vbar_el1"
-expect_string "cntp_ctl_el0"
-expect_string "cntp_cval_el0"
-expect_string "cntv_ctl_el0"
-expect_string "cntv_cval_el0"
-expect_string "cntkctl_el1"
-expect_string "sp_el0"
-expect_string "isr_el1"
-expect_string "icc_hppir0_el1"
-expect_string "icc_hppir1_el1"
-expect_string "icc_ctlr_el3"
+
+source [file join [file dirname [info script]] exception_regs.inc]
diff --git a/expect/crash_test.exp b/expect/crash_test.exp
index a8c31be..1efd5a4 100644
--- a/expect/crash_test.exp
+++ b/expect/crash_test.exp
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2019-2022 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2023 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -10,83 +10,5 @@
expect_string "Unhandled External Abort received"
expect_string "Unhandled Exception from EL2"
-expect_string "x0"
-expect_string "x1"
-expect_string "x2"
-expect_string "x3"
-expect_string "x4"
-expect_string "x5"
-expect_string "x6"
-expect_string "x7"
-expect_string "x8"
-expect_string "x9"
-expect_string "x10"
-expect_string "x11"
-expect_string "x12"
-expect_string "x13"
-expect_string "x14"
-expect_string "x15"
-expect_string "x16"
-expect_string "x17"
-expect_string "x18"
-expect_string "x19"
-expect_string "x20"
-expect_string "x21"
-expect_string "x22"
-expect_string "x23"
-expect_string "x24"
-expect_string "x25"
-expect_string "x26"
-expect_string "x27"
-expect_string "x28"
-expect_string "x29"
-expect_string "x30"
-expect_string "scr_el3"
-expect_string "sctlr_el3"
-expect_string "cptr_el3"
-expect_string "tcr_el3"
-expect_string "daif"
-expect_string "mair_el3"
-expect_string "spsr_el3"
-expect_string "elr_el3"
-expect_string "ttbr0_el3"
-expect_string "esr_el3"
-expect_string "far_el3"
-expect_string "spsr_el1"
-expect_string "elr_el1"
-expect_string "spsr_abt"
-expect_string "spsr_und"
-expect_string "spsr_irq"
-expect_string "spsr_fiq"
-expect_string "sctlr_el1"
-expect_string "actlr_el1"
-expect_string "cpacr_el1"
-expect_string "csselr_el1"
-expect_string "sp_el1"
-expect_string "esr_el1"
-expect_string "ttbr0_el1"
-expect_string "ttbr1_el1"
-expect_string "mair_el1"
-expect_string "amair_el1"
-expect_string "tcr_el1"
-expect_string "tpidr_el1"
-expect_string "tpidr_el0"
-expect_string "tpidrro_el0"
-expect_string "par_el1"
-expect_string "mpidr_el1"
-expect_string "afsr0_el1"
-expect_string "afsr1_el1"
-expect_string "contextidr_el1"
-expect_string "vbar_el1"
-expect_string "cntp_ctl_el0"
-expect_string "cntp_cval_el0"
-expect_string "cntv_ctl_el0"
-expect_string "cntv_cval_el0"
-expect_string "cntkctl_el1"
-expect_string "sp_el0"
-expect_string "isr_el1"
-expect_string "dacr32_el2"
-expect_string "ifsr32_el2"
-expect_string "icc_hppir0_el1"
-expect_string "icc_hppir1_el1"
-expect_string "icc_ctlr_el3"
+
+source [file join [file dirname [info script]] exception_regs.inc]
diff --git a/expect/unhandled_exception_at_el3.exp b/expect/exception_regs.inc
similarity index 91%
rename from expect/unhandled_exception_at_el3.exp
rename to expect/exception_regs.inc
index 9cad002..c22ed99 100644
--- a/expect/unhandled_exception_at_el3.exp
+++ b/expect/exception_regs.inc
@@ -1,15 +1,11 @@
#
-# Copyright (c) 2021-2022, Arm Limited. All rights reserved.
+# Copyright (c) 2023, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
# Expect script for Trusted Firmware Test Framework
#
-source [file join [file dirname [info script]] handle-arguments.inc]
-
-expect_string "Unhandled Exception in EL3."
-expect_string "x30"
expect_string "x0"
expect_string "x1"
expect_string "x2"
@@ -40,6 +36,7 @@
expect_string "x27"
expect_string "x28"
expect_string "x29"
+expect_string "x30"
expect_string "scr_el3"
expect_string "sctlr_el3"
expect_string "cptr_el3"
diff --git a/expect/panic_in_el3.exp b/expect/panic_in_el3.exp
new file mode 100644
index 0000000..c712e2e
--- /dev/null
+++ b/expect/panic_in_el3.exp
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2023, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+# Expect script for Trusted Firmware Test Framework
+#
+
+source [file join [file dirname [info script]] handle-arguments.inc]
+
+expect_string "PANIC in EL3."
+
+source [file join [file dirname [info script]] exception_regs.inc]
diff --git a/run_config/fvp-aemva.ete_trace_ext.bl31_panic b/run_config/fvp-aemva.ete_trace_ext.bl31_panic
index c6c3abf..e2f0eec 100644
--- a/run_config/fvp-aemva.ete_trace_ext.bl31_panic
+++ b/run_config/fvp-aemva.ete_trace_ext.bl31_panic
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2021-2022, Arm Limited. All rights reserved.
+# Copyright (c) 2021-2023, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -9,7 +9,7 @@
local model="base-aemva"
uart="0" timeout="60" file="timeout_test.exp" track_expect
- uart="1" timeout="60" file="unhandled_exception_at_el3.exp" \
+ uart="1" timeout="60" file="panic_in_el3.exp" \
set_primary="1" track_expect
model="$model" \
diff --git a/run_config/fvp-aemva.feat_brbe.bl31_panic b/run_config/fvp-aemva.feat_brbe.bl31_panic
index 7367aa2..91954b8 100644
--- a/run_config/fvp-aemva.feat_brbe.bl31_panic
+++ b/run_config/fvp-aemva.feat_brbe.bl31_panic
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2022, Arm Limited. All rights reserved.
+# Copyright (c) 2022-2023, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -9,7 +9,7 @@
local model="base-aemva"
uart="0" timeout="60" file="timeout_test.exp" track_expect
- uart="1" timeout="60" file="unhandled_exception_at_el3.exp" \
+ uart="1" timeout="60" file="panic_in_el3.exp" \
set_primary="1" track_expect
model="$model" \