ci(rng-trap): removed expect and modified run config
Since the trap triggered by RNDR and RNDRRS reads is not unhandled
anymore, the run config was changed in order not to expect a panic
but to allow the test to finish returning test result value.
In addition, FEAT_RNG option has been added to the model so it can
now process RNDR and RNDRRS reads from EL3 and therefore random
numbers can be obtained upon those reads.
Signed-off-by: Juan Pablo Conde <juanpablo.conde@arm.com>
Change-Id: I6d78889c45af73391359d09a34c52bd013c7316d
diff --git a/expect/crash_rng_trap_unhandled_exception_at_el3.exp b/expect/crash_rng_trap_unhandled_exception_at_el3.exp
deleted file mode 100644
index eff27f8..0000000
--- a/expect/crash_rng_trap_unhandled_exception_at_el3.exp
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-# Copyright (c) 2022, 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"
-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"
diff --git a/group/tf-l2-boot-tests-misc/fvp-default-rng-trap,fvp-rndrrs-trap:fvp-tftf-fip.tftf-aemv8a.rng_trap.bl31_panic-debug b/group/tf-l2-boot-tests-misc/fvp-default-rng-trap,fvp-rndrrs-trap:fvp-tftf-fip.tftf-aemv8a.rng_trap.bl31_panic-debug
deleted file mode 100644
index b8939c8..0000000
--- a/group/tf-l2-boot-tests-misc/fvp-default-rng-trap,fvp-rndrrs-trap:fvp-tftf-fip.tftf-aemv8a.rng_trap.bl31_panic-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l2-boot-tests-misc/fvp-default-rng-trap,fvp-rndr-trap:fvp-tftf-fip.tftf-aemv8a.rng_trap.bl31_panic-debug b/group/tf-l2-boot-tests-misc/fvp-default-rng-trap,fvp-rng-trap:fvp-tftf-fip.tftf-aemv8a.rng_trap-debug
similarity index 100%
rename from group/tf-l2-boot-tests-misc/fvp-default-rng-trap,fvp-rndr-trap:fvp-tftf-fip.tftf-aemv8a.rng_trap.bl31_panic-debug
rename to group/tf-l2-boot-tests-misc/fvp-default-rng-trap,fvp-rng-trap:fvp-tftf-fip.tftf-aemv8a.rng_trap-debug
diff --git a/run_config/fvp-aemv8a.rng_trap.bl31_panic b/run_config/fvp-aemv8a.rng_trap
similarity index 68%
rename from run_config/fvp-aemv8a.rng_trap.bl31_panic
rename to run_config/fvp-aemv8a.rng_trap
index 2e31b34..0ae4540 100644
--- a/run_config/fvp-aemv8a.rng_trap.bl31_panic
+++ b/run_config/fvp-aemv8a.rng_trap
@@ -8,15 +8,14 @@
generate_lava_job() {
local model="base-aemv8a"
- uart="0" timeout="60" file="timeout.exp" track_expect
- uart="1" timeout="60" file="crash_rng_trap_unhandled_exception_at_el3.exp" \
- set_primary="1" track_expect
-
# Due to a bug in the model, the FEAT_RNG_TRAP feature is not available
# in models that implement versions lower than 8.8, even though this is
# a v8.5 feature. Therefore, version 8.8 will be used while the FVP
# team fixes this problem. Once ready, the parameter arch_version will
# be changed to 8.5.
- model="$model" arch_version="8.8" has_rng_trap="1" gen_model_params
+ arch_version="8.8" \
+ has_rng_trap="1" \
+ has_rng="1" \
+ gen_model_params
model="$model" gen_fvp_yaml
}
diff --git a/tftf_config/fvp-rndrrs-trap b/tftf_config/fvp-rndrrs-trap
deleted file mode 100644
index 35ef6ee..0000000
--- a/tftf_config/fvp-rndrrs-trap
+++ /dev/null
@@ -1,6 +0,0 @@
-ARM_ARCH_FEATURE=rng
-ARM_ARCH_MAJOR=8
-ARM_ARCH_MINOR=5
-CROSS_COMPILE=aarch64-none-elf-
-PLAT=fvp
-TESTS=rndrrs_trap
diff --git a/tftf_config/fvp-rndr-trap b/tftf_config/fvp-rng-trap
similarity index 85%
rename from tftf_config/fvp-rndr-trap
rename to tftf_config/fvp-rng-trap
index 0f666ab..34a97a7 100644
--- a/tftf_config/fvp-rndr-trap
+++ b/tftf_config/fvp-rng-trap
@@ -3,4 +3,4 @@
ARM_ARCH_MINOR=5
CROSS_COMPILE=aarch64-none-elf-
PLAT=fvp
-TESTS=rndr_trap
+TESTS=rng_trap