From 25d2a8366a2ae4de200cb61a57bce3334c58fb63 Mon Sep 17 00:00:00 2001 From: Giacomo Travaglini Date: Wed, 10 Aug 2022 14:03:25 +0100 Subject: [PATCH] configs: Enable EL3 in the arm-ubuntu-boot-exit example EL3 (SECURITY) had been temporarily disabled to address the FEAT_PAuth trapping issue. This was caused by the EL3 bootloader not disabling pointer authentication traps. Now that this has been implemented [1], we should re-enable EL3 in this example platform [1]: https://gem5-review.googlesource.com/c/public/gem5/+/61736 Change-Id: I62ee1dddc9b5d2d531f2603da7b2bccb23b3c9f0 Signed-off-by: Giacomo Travaglini Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/62271 Tested-by: kokoro Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Reviewed-by: Kaustav Goswami --- configs/example/gem5_library/arm-ubuntu-boot-exit.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/configs/example/gem5_library/arm-ubuntu-boot-exit.py b/configs/example/gem5_library/arm-ubuntu-boot-exit.py index bc8d3d5ec7..798fae44cc 100644 --- a/configs/example/gem5_library/arm-ubuntu-boot-exit.py +++ b/configs/example/gem5_library/arm-ubuntu-boot-exit.py @@ -80,15 +80,9 @@ processor = SimpleProcessor(cpu_type=CPUTypes.TIMING, num_cores=2) # The ArmBoard requires a `release` to be specified. This adds all the # extensions or features to the system. We are setting this to Armv8 -# (ArmDefaultRelease) in this example config script. However, the ArmBoard -# currently does not support SECURITY extension. - +# (ArmDefaultRelease) in this example config script. release = ArmDefaultRelease() -# Removing the SECURITY extension. - -release.extensions.remove(release.extensions[2]) - # The platform sets up the memory ranges of all the on-chip and off-chip # devices present on the ARM system.