arm: correct register read bug in Pl390 GIC
authorCurtis Dunham <Curtis.Dunham@arm.com>
Fri, 20 Jan 2017 20:55:03 +0000 (20:55 +0000)
committerAndreas Sandberg <andreas.sandberg@arm.com>
Tue, 21 Mar 2017 10:47:15 +0000 (10:47 +0000)
Change-Id: I4c0de7c2a5b40c1a9f009ca12062cb108b450b04
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
src/dev/arm/gic_pl390.cc

index 04c3949412b884a5b11124b5761c83c548ddc20a..22788b3758e68d5053d0d4d03e3ee1def1c62c63 100644 (file)
@@ -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;
     }