diff options
| author | Achin Gupta <achin.gupta@arm.com> | 2015-06-02 15:17:05 +0100 |
|---|---|---|
| committer | Achin Gupta <achin.gupta@arm.com> | 2015-06-02 15:17:05 +0100 |
| commit | de975e85ff4a3712fc8ff8aa5556e0ec0a11e63c (patch) | |
| tree | f1651a5dc15513e1a4c60e2ed9800ff8b31dec92 /drivers | |
| parent | dbc963e2bf931a407916058edeec235798b6a1e4 (diff) | |
| parent | ca0225a5dcdd496e1ed1808ff0925dc911098654 (diff) | |
Merge pull request #305 from achingupta/ag/tf-issues#306
Ag/tf issues#306
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/arm/gic/arm_gic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/arm/gic/arm_gic.c b/drivers/arm/gic/arm_gic.c index 2888e719..52174719 100644 --- a/drivers/arm/gic/arm_gic.c +++ b/drivers/arm/gic/arm_gic.c @@ -401,7 +401,7 @@ uint32_t arm_gic_get_pending_interrupt_type(void) uint32_t id; assert(g_gicc_base); - id = gicc_read_hppir(g_gicc_base); + id = gicc_read_hppir(g_gicc_base) & INT_ID_MASK; /* Assume that all secure interrupts are S-EL1 interrupts */ if (id < 1022) @@ -423,7 +423,7 @@ uint32_t arm_gic_get_pending_interrupt_id(void) uint32_t id; assert(g_gicc_base); - id = gicc_read_hppir(g_gicc_base); + id = gicc_read_hppir(g_gicc_base) & INT_ID_MASK; if (id < 1022) return id; @@ -435,7 +435,7 @@ uint32_t arm_gic_get_pending_interrupt_id(void) * Find out which non-secure interrupt it is under the assumption that * the GICC_CTLR.AckCtl bit is 0. */ - return gicc_read_ahppir(g_gicc_base); + return gicc_read_ahppir(g_gicc_base) & INT_ID_MASK; } /******************************************************************************* |