You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
99 lines
3.6 KiB
99 lines
3.6 KiB
12 years ago
|
From 0e692ab15a69ac4534c18e67ed3cb7685f728037 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jonas Gorski <jogo@openwrt.org>
|
||
|
|
Date: Tue, 30 Apr 2013 11:26:53 +0200
|
||
|
|
Subject: [PATCH 13/14] MIPS: BCM63XX: use irq_desc as argument for (un)mask
|
||
|
|
|
||
|
|
In preparation for applying affinity, use the irq descriptor as the
|
||
|
|
argument for (un)mask.
|
||
|
|
|
||
|
|
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||
|
|
---
|
||
|
|
arch/mips/bcm63xx/irq.c | 26 ++++++++++++++------------
|
||
|
|
1 file changed, 14 insertions(+), 12 deletions(-)
|
||
|
|
|
||
|
|
--- a/arch/mips/bcm63xx/irq.c
|
||
|
|
+++ b/arch/mips/bcm63xx/irq.c
|
||
|
|
@@ -22,10 +22,10 @@
|
||
|
|
|
||
|
|
static void __dispatch_internal_32(int cpu) __maybe_unused;
|
||
|
|
static void __dispatch_internal_64(int cpu) __maybe_unused;
|
||
|
|
-static void __internal_irq_mask_32(unsigned int irq) __maybe_unused;
|
||
|
|
-static void __internal_irq_mask_64(unsigned int irq) __maybe_unused;
|
||
|
|
-static void __internal_irq_unmask_32(unsigned int irq) __maybe_unused;
|
||
|
|
-static void __internal_irq_unmask_64(unsigned int irq) __maybe_unused;
|
||
|
|
+static void __internal_irq_mask_32(struct irq_data *d) __maybe_unused;
|
||
|
|
+static void __internal_irq_mask_64(struct irq_data *d) __maybe_unused;
|
||
|
|
+static void __internal_irq_unmask_32(struct irq_data *d) __maybe_unused;
|
||
|
|
+static void __internal_irq_unmask_64(struct irq_data *d) __maybe_unused;
|
||
|
|
|
||
|
|
static DEFINE_SPINLOCK(ipic_lock);
|
||
|
|
static DEFINE_SPINLOCK(epic_lock);
|
||
|
|
@@ -167,8 +167,8 @@ static int is_ext_irq_cascaded;
|
||
|
|
static unsigned int ext_irq_count;
|
||
|
|
static unsigned int ext_irq_start, ext_irq_end;
|
||
|
|
static unsigned int ext_irq_cfg_reg1, ext_irq_cfg_reg2;
|
||
|
|
-static void (*internal_irq_mask)(unsigned int irq);
|
||
|
|
-static void (*internal_irq_unmask)(unsigned int irq);
|
||
|
|
+static void (*internal_irq_mask)(struct irq_data *d);
|
||
|
|
+static void (*internal_irq_unmask)(struct irq_data *d);
|
||
|
|
|
||
|
|
static void bcm63xx_init_irq(void)
|
||
|
|
{
|
||
|
|
@@ -358,9 +358,10 @@ void __dispatch_internal_##width(int cpu
|
||
|
|
} \
|
||
|
|
} \
|
||
|
|
\
|
||
|
|
-static void __internal_irq_mask_##width(unsigned int irq) \
|
||
|
|
+static void __internal_irq_mask_##width(struct irq_data *d) \
|
||
|
|
{ \
|
||
|
|
u32 val; \
|
||
|
|
+ unsigned irq = d->irq - IRQ_INTERNAL_BASE; \
|
||
|
|
unsigned reg = (irq / 32) ^ (width/32 - 1); \
|
||
|
|
unsigned bit = irq & 0x1f; \
|
||
|
|
unsigned long flags; \
|
||
|
|
@@ -380,9 +381,10 @@ static void __internal_irq_mask_##width(
|
||
|
|
spin_unlock_irqrestore(&ipic_lock, flags); \
|
||
|
|
} \
|
||
|
|
\
|
||
|
|
-static void __internal_irq_unmask_##width(unsigned int irq) \
|
||
|
|
+static void __internal_irq_unmask_##width(struct irq_data *d) \
|
||
|
|
{ \
|
||
|
|
u32 val; \
|
||
|
|
+ unsigned irq = d->irq - IRQ_INTERNAL_BASE; \
|
||
|
|
unsigned reg = (irq / 32) ^ (width/32 - 1); \
|
||
|
|
unsigned bit = irq & 0x1f; \
|
||
|
|
unsigned long flags; \
|
||
|
|
@@ -448,12 +450,12 @@ asmlinkage void plat_irq_dispatch(void)
|
||
|
|
*/
|
||
|
|
static void bcm63xx_internal_irq_mask(struct irq_data *d)
|
||
|
|
{
|
||
|
|
- internal_irq_mask(d->irq - IRQ_INTERNAL_BASE);
|
||
|
|
+ internal_irq_mask(d);
|
||
|
|
}
|
||
|
|
|
||
|
|
static void bcm63xx_internal_irq_unmask(struct irq_data *d)
|
||
|
|
{
|
||
|
|
- internal_irq_unmask(d->irq - IRQ_INTERNAL_BASE);
|
||
|
|
+ internal_irq_unmask(d);
|
||
|
|
}
|
||
|
|
|
||
|
|
/*
|
||
|
|
@@ -479,7 +481,7 @@ static void bcm63xx_external_irq_mask(st
|
||
|
|
spin_unlock_irqrestore(&epic_lock, flags);
|
||
|
|
|
||
|
|
if (is_ext_irq_cascaded)
|
||
|
|
- internal_irq_mask(irq + ext_irq_start);
|
||
|
|
+ internal_irq_mask(irq_get_irq_data(irq + ext_irq_start));
|
||
|
|
}
|
||
|
|
|
||
|
|
static void bcm63xx_external_irq_unmask(struct irq_data *d)
|
||
|
|
@@ -501,7 +503,7 @@ static void bcm63xx_external_irq_unmask(
|
||
|
|
spin_unlock_irqrestore(&epic_lock, flags);
|
||
|
|
|
||
|
|
if (is_ext_irq_cascaded)
|
||
|
|
- internal_irq_unmask(irq + ext_irq_start);
|
||
|
|
+ internal_irq_unmask(irq_get_irq_data(irq + ext_irq_start));
|
||
|
|
}
|
||
|
|
|
||
|
|
static void bcm63xx_external_irq_clear(struct irq_data *d)
|