diff options
author | Adrian Herrera <adrian.herrera@arm.com> | 2019-11-07 12:30:08 +0000 |
---|---|---|
committer | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2020-02-04 13:39:54 +0000 |
commit | 98b2d7acc57b664996de528e6d32ae8abaee2b99 (patch) | |
tree | 21d2559d24dd6506bbfd29819115d1500f9b0b6a /src/arch/arm/isa.hh | |
parent | 465f7d0f56fe47ad5070cc7fcc69bf69cb7d3d82 (diff) | |
download | gem5-98b2d7acc57b664996de528e6d32ae8abaee2b99.tar.xz |
arch-arm: AArch64 reg access HCR_EL2.E2H filter
Some AArch64 system registers report UNDEFINED behaviours if accessed
from EL2 or EL3 in a non-EL2 Host enabled (HCR_EL2.E2H == 0) environment.
Examples of these are seen in the Generic Timer system registers,
namely CNTP_CTL_EL02 or CNTKCTL_EL12.
This patch provides an ISA filter for specifying the above condition.
Change-Id: I240f9afdb000faf5d3c9274ba12bd4cc41fe8604
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/24664
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Diffstat (limited to 'src/arch/arm/isa.hh')
-rw-r--r-- | src/arch/arm/isa.hh | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/src/arch/arm/isa.hh b/src/arch/arm/isa.hh index 7ffa682ef..23f05ccaf 100644 --- a/src/arch/arm/isa.hh +++ b/src/arch/arm/isa.hh @@ -250,11 +250,26 @@ namespace ArmISA privNonSecureRead(v); return *this; } + chain hypE2HRead(bool v = true) const { + info[MISCREG_HYP_E2H_RD] = v; + return *this; + } + chain hypE2HWrite(bool v = true) const { + info[MISCREG_HYP_E2H_WR] = v; + return *this; + } + chain hypE2H(bool v = true) const { + hypE2HRead(v); + hypE2HWrite(v); + return *this; + } chain hypRead(bool v = true) const { + hypE2HRead(v); info[MISCREG_HYP_RD] = v; return *this; } chain hypWrite(bool v = true) const { + hypE2HWrite(v); info[MISCREG_HYP_WR] = v; return *this; } @@ -263,19 +278,36 @@ namespace ArmISA hypWrite(v); return *this; } + chain monE2HRead(bool v = true) const { + info[MISCREG_MON_E2H_RD] = v; + return *this; + } + chain monE2HWrite(bool v = true) const { + info[MISCREG_MON_E2H_WR] = v; + return *this; + } + chain monE2H(bool v = true) const { + monE2HRead(v); + monE2HWrite(v); + return *this; + } chain monSecureRead(bool v = true) const { + monE2HRead(v); info[MISCREG_MON_NS0_RD] = v; return *this; } chain monSecureWrite(bool v = true) const { + monE2HWrite(v); info[MISCREG_MON_NS0_WR] = v; return *this; } chain monNonSecureRead(bool v = true) const { + monE2HRead(v); info[MISCREG_MON_NS1_RD] = v; return *this; } chain monNonSecureWrite(bool v = true) const { + monE2HWrite(v); info[MISCREG_MON_NS1_WR] = v; return *this; } |