diff options
| author | Jonas Bonn <jonas@southpole.se> | 2012-09-21 09:17:32 +0200 |
|---|---|---|
| committer | Jonas Bonn <jonas@southpole.se> | 2012-10-11 11:27:25 +0200 |
| commit | f248ef1cd39dc9900cca5bf0a51b1e80081ecc67 (patch) | |
| tree | 84a29108741526d556d37d5140f9bfa401e0633b /arch/openrisc/kernel/irq.c | |
| parent | 9b76beb071be6fbfd0743feedfdd844f57d4f345 (diff) | |
| download | talos-obmc-linux-f248ef1cd39dc9900cca5bf0a51b1e80081ecc67.tar.gz talos-obmc-linux-f248ef1cd39dc9900cca5bf0a51b1e80081ecc67.zip | |
openrisc: PIC should act on domain-local irqs
Now that IRQ domains are in use, we should be acting on domain-local
IRQ numbers (hwirq) instead of 'global' ones.
Signed-off-by: Jonas Bonn <jonas@southpole.se>
Diffstat (limited to 'arch/openrisc/kernel/irq.c')
| -rw-r--r-- | arch/openrisc/kernel/irq.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/openrisc/kernel/irq.c b/arch/openrisc/kernel/irq.c index e935b9d8eee1..094c394eee5b 100644 --- a/arch/openrisc/kernel/irq.c +++ b/arch/openrisc/kernel/irq.c @@ -46,12 +46,12 @@ EXPORT_SYMBOL(arch_local_irq_restore); static void or1k_pic_mask(struct irq_data *data) { - mtspr(SPR_PICMR, mfspr(SPR_PICMR) & ~(1UL << data->irq)); + mtspr(SPR_PICMR, mfspr(SPR_PICMR) & ~(1UL << data->hwirq)); } static void or1k_pic_unmask(struct irq_data *data) { - mtspr(SPR_PICMR, mfspr(SPR_PICMR) | (1UL << data->irq)); + mtspr(SPR_PICMR, mfspr(SPR_PICMR) | (1UL << data->hwirq)); } static void or1k_pic_ack(struct irq_data *data) @@ -75,10 +75,10 @@ static void or1k_pic_ack(struct irq_data *data) * as opposed to a 1 as mandated by the spec */ - mtspr(SPR_PICSR, mfspr(SPR_PICSR) & ~(1UL << data->irq)); + mtspr(SPR_PICSR, mfspr(SPR_PICSR) & ~(1UL << data->hwirq)); #else WARN(1, "Interrupt handling possibily broken\n"); - mtspr(SPR_PICSR, (1UL << irq)); + mtspr(SPR_PICSR, (1UL << data->hwirq)); #endif } @@ -87,10 +87,10 @@ static void or1k_pic_mask_ack(struct irq_data *data) /* Comments for pic_ack apply here, too */ #ifdef CONFIG_OR1K_1200 - mtspr(SPR_PICSR, mfspr(SPR_PICSR) & ~(1UL << data->irq)); + mtspr(SPR_PICSR, mfspr(SPR_PICSR) & ~(1UL << data->hwirq)); #else WARN(1, "Interrupt handling possibily broken\n"); - mtspr(SPR_PICSR, (1UL << irq)); + mtspr(SPR_PICSR, (1UL << data->hwirq)); #endif } |
