derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

system-arm: Do not trap SVE instructions to EL3

Browse Source 
While other CPTR_EL3 bitfields disable trapping by setting
them to zero, SVE trapping works in the opposite way round:

we need to set CPTR_EL3.EZ to 1 if we don't want an EL3 trap

Change-Id: I97d396c402a6d7ebda40d6787ee2f41499f2d1c5
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/59389
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
This commit is contained in:
Giacomo Travaglini
2022-04-29 17:23:26 +01:00
parent 6209641d33
commit 36c4778c7d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
system/arm/bootloader/arm64/boot.S
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, 2020 ARM Limited * Copyright (c) 2012, 2020, 2022 Arm Limited
* All rights reserved * All rights reserved
* *
* The license below extends only to copyright in the software and shall * The license below extends only to copyright in the software and shall
@@ -61,7 +61,8 @@ _start:
orr x0, x0, #(1 << 10) // 64-bit EL2 orr x0, x0, #(1 << 10) // 64-bit EL2
msr scr_el3, x0 msr scr_el3, x0
msr cptr_el3, xzr // Disable copro. traps to EL3 mov x0, #(1 << 8) // Disable SVE trap to EL3
msr cptr_el3, x0 // Disable copro. traps to EL3
/* /*
* Check for the primary CPU to avoid a race on the distributor * Check for the primary CPU to avoid a race on the distributor