Skip to content
Snippets Groups Projects
Commit ba63cf47 authored by Ralf-Philipp Weinmann's avatar Ralf-Philipp Weinmann Committed by Peter Maydell
Browse files

target-arm: Only trap SRS from S-EL1 if specified mode is MON


Commit cbc0326b caused SRS instructions executed from Secure
EL1 to trap to EL3 even if the specified mode was not monitor mode.

According to the ARMv8 Architecture reference manual [F6.1.203], ALL
of the following conditions need to be met for SRS to trap to EL3:
* It is executed at Secure PL1.
* The specified mode is monitor mode.
* EL3 is using AArch64.

Correct the condition governing the trap to EL3 to check the
specified mode.

Signed-off-by: default avatarRalf-Philipp Weinmann <ralf+devel@comsecuris.com>
Message-id: 20160222224251.GA11654@beta.comsecuris.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
[PMM: tweaked comment text to read 'specified mode'; edited
 commit message]
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent a55c910e
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment