From: Curtis Dunham <Curtis.Dunham@arm.com>
Date: Fri, 20 Jan 2017 20:55:03 +0000 (+0000)
Subject: arm: correct register read bug in Pl390 GIC
X-Git-Tag: v19.0.0.0~2895
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7d6f2c5050f9c20b5882179f93c651c4f837fcf4;p=gem5.git

arm: correct register read bug in Pl390 GIC

Change-Id: I4c0de7c2a5b40c1a9f009ca12062cb108b450b04
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
---

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;
     }