summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCurtis Dunham <Curtis.Dunham@arm.com>2017-01-20 20:55:03 +0000
committerAndreas Sandberg <andreas.sandberg@arm.com>2017-03-21 10:47:15 +0000
commit7d6f2c5050f9c20b5882179f93c651c4f837fcf4 (patch)
treec71a19c12b6bf9f2e0341d4a3ae95352431c11e5
parent7110d2313e44bf4b611534bbc921ec9808476a37 (diff)
downloadgem5-7d6f2c5050f9c20b5882179f93c651c4f837fcf4.tar.xz
arm: correct register read bug in Pl390 GIC
Change-Id: I4c0de7c2a5b40c1a9f009ca12062cb108b450b04 Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
-rw-r--r--src/dev/arm/gic_pl390.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dev/arm/gic_pl390.cc b/src/dev/arm/gic_pl390.cc
index 04c394941..22788b375 100644
--- a/src/dev/arm/gic_pl390.cc
+++ b/src/dev/arm/gic_pl390.cc
@@ -160,14 +160,14 @@ Pl390::readDistributor(PacketPtr pkt)
if (GICD_ISACTIVER.contains(daddr)) {
uint32_t ix = (daddr - GICD_ISACTIVER.start()) >> 2;
assert(ix < 32);
- pkt->set<uint32_t>(getPendingInt(ctx, ix));
+ pkt->set<uint32_t>(getActiveInt(ctx, ix));
goto done;
}
if (GICD_ICACTIVER.contains(daddr)) {
uint32_t ix = (daddr - GICD_ICACTIVER.start()) >> 2;
assert(ix < 32);
- pkt->set<uint32_t>(getPendingInt(ctx, ix));
+ pkt->set<uint32_t>(getActiveInt(ctx, ix));
goto done;
}