commit 983f667dc38e2d14896712b39932c349f00ed1ec
author Giacomo Travaglini <giacomo.travaglini@arm.com> Fri Aug 23 12:18:59 2019 +0100
committer Giacomo Travaglini <giacomo.travaglini@arm.com> Fri Sep 06 11:53:49 2019 +0000
tree ec7f9baffb3b5e8dcd76b11c8e911cc0520d1b69
parent cad88af5bd731386201c9548ae0264640e17f3b0

dev-arm: Check if INTID group is enabled when reading HPPIRx

If it is not enabled, it should return INTID_SPOURIOUS

Change-Id: I4dfa8b9fcea874b4d281cd154dd38752b05e1d59
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/20616
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>

src/dev/arm/gic_v3_cpu_interface.cc

diff --git a/src/dev/arm/gic_v3_cpu_interface.cc b/src/dev/arm/gic_v3_cpu_interface.cc
index b4c271d..d2b397a 100644
--- a/src/dev/arm/gic_v3_cpu_interface.cc
+++ b/src/dev/arm/gic_v3_cpu_interface.cc
@@ -1653,7 +1653,7 @@
 uint32_t
 Gicv3CPUInterface::getHPPIR0() const
 {
-    if (hppi.prio == 0xff) {
+    if (hppi.prio == 0xff || !groupEnabled(hppi.group)) {
         return Gicv3::INTID_SPURIOUS;
     }
 
@@ -1679,7 +1679,7 @@
 uint32_t
 Gicv3CPUInterface::getHPPIR1() const
 {
-    if (hppi.prio == 0xff) {
+    if (hppi.prio == 0xff || !groupEnabled(hppi.group)) {
         return Gicv3::INTID_SPURIOUS;
     }