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

arch-arm: ELIsInHost, check VHE and SecEL2

Browse Source 
This patch modifies ELIsInHost to correctly check for VHE
and Secure EL2 implementation.

Change-Id: I947dddfc6761794493fef3d59b3b35754d07ed6b
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/24046
Reviewed-by: Ciro Santilli <ciro.santilli@arm.com>
Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Adrian Herrera
2019-11-29 17:49:07 +00:00
committed by Giacomo Travaglini
parent 251cbd34b8
commit 5698c2b52d
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/arch/arm/utility.cc
View File

@@ -342,11 +342,9 @@ ELIs32(ThreadContext *tc, ExceptionLevel el)
bool
ELIsInHost(ThreadContext *tc, ExceptionLevel el)
{
if (!ArmSystem::haveVirtualization(tc)) {
return false;
}
HCR hcr = tc->readMiscReg(MISCREG_HCR_EL2);
return (!isSecureBelowEL3(tc) && !ELIs32(tc, EL2) && hcr.e2h == 1 &&
const HCR hcr = tc->readMiscReg(MISCREG_HCR_EL2);
return ((IsSecureEL2Enabled(tc) || !isSecureBelowEL3(tc)) &&
HaveVirtHostExt(tc) && !ELIs32(tc, EL2) && hcr.e2h == 1 &&
(el == EL2 || (el == EL0 && hcr.tge == 1)));
}