From 7d6f2c5050f9c20b5882179f93c651c4f837fcf4 Mon Sep 17 00:00:00 2001 From: Curtis Dunham Date: Fri, 20 Jan 2017 20:55:03 +0000 Subject: [PATCH] arm: correct register read bug in Pl390 GIC Change-Id: I4c0de7c2a5b40c1a9f009ca12062cb108b450b04 Reviewed-by: Andreas Sandberg --- src/dev/arm/gic_pl390.cc | 4 ++-- 1 file 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(getPendingInt(ctx, ix)); + pkt->set(getActiveInt(ctx, ix)); goto done; } if (GICD_ICACTIVER.contains(daddr)) { uint32_t ix = (daddr - GICD_ICACTIVER.start()) >> 2; assert(ix < 32); - pkt->set(getPendingInt(ctx, ix)); + pkt->set(getActiveInt(ctx, ix)); goto done; }