kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

MIPS: GIC: Convert to new irq_chip functions

Browse source 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2186/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Thomas Gleixner 2011-03-23 21:08:58 +00:00 committed by Ralf Baechle
parent 7c8d948f16
commit 161d049e8c
1 changed files with 18 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
arch/mips/kernel/irq-gic.c
View file

@ -87,17 +87,10 @@ unsigned int gic_get_int(void)
return i; return i;
} }
static unsigned int gic_irq_startup(unsigned int irq) static void gic_irq_ack(struct irq_data *d)
{ {
irq -= _irqbase; unsigned int irq = d->irq - _irqbase;
pr_debug("CPU%d: %s: irq%d\n", smp_processor_id(), __func__, irq);
GIC_SET_INTR_MASK(irq);
return 0;
}
static void gic_irq_ack(unsigned int irq)
{
irq -= _irqbase;
pr_debug("CPU%d: %s: irq%d\n", smp_processor_id(), __func__, irq); pr_debug("CPU%d: %s: irq%d\n", smp_processor_id(), __func__, irq);
GIC_CLR_INTR_MASK(irq); GIC_CLR_INTR_MASK(irq);
@ -105,16 +98,16 @@ static void gic_irq_ack(unsigned int irq)
GICWRITE(GIC_REG(SHARED, GIC_SH_WEDGE), irq); GICWRITE(GIC_REG(SHARED, GIC_SH_WEDGE), irq);
} }
static void gic_mask_irq(unsigned int irq) static void gic_mask_irq(struct irq_data *d)
{ {
irq -= _irqbase; unsigned int irq = d->irq - _irqbase;
pr_debug("CPU%d: %s: irq%d\n", smp_processor_id(), __func__, irq); pr_debug("CPU%d: %s: irq%d\n", smp_processor_id(), __func__, irq);
GIC_CLR_INTR_MASK(irq); GIC_CLR_INTR_MASK(irq);
} }
static void gic_unmask_irq(unsigned int irq) static void gic_unmask_irq(struct irq_data *d)
{ {
irq -= _irqbase; unsigned int irq = d->irq - _irqbase;
pr_debug("CPU%d: %s: irq%d\n", smp_processor_id(), __func__, irq); pr_debug("CPU%d: %s: irq%d\n", smp_processor_id(), __func__, irq);
GIC_SET_INTR_MASK(irq); GIC_SET_INTR_MASK(irq);
} }
@ -123,13 +116,14 @@ static void gic_unmask_irq(unsigned int irq)
static DEFINE_SPINLOCK(gic_lock); static DEFINE_SPINLOCK(gic_lock);
static int gic_set_affinity(unsigned int irq, const struct cpumask *cpumask) static int gic_set_affinity(struct irq_data *d, const struct cpumask *cpumask,
bool force)
{ {
unsigned int irq = d->irq - _irqbase;
cpumask_t tmp = CPU_MASK_NONE; cpumask_t tmp = CPU_MASK_NONE;
unsigned long flags; unsigned long flags;
int i; int i;
irq -= _irqbase;
pr_debug("%s(%d) called\n", __func__, irq); pr_debug("%s(%d) called\n", __func__, irq);
cpumask_and(&tmp, cpumask, cpu_online_mask); cpumask_and(&tmp, cpumask, cpu_online_mask);
if (cpus_empty(tmp)) if (cpus_empty(tmp))
@ -147,23 +141,22 @@ static int gic_set_affinity(unsigned int irq, const struct cpumask *cpumask)
set_bit(irq, pcpu_masks[first_cpu(tmp)].pcpu_mask); set_bit(irq, pcpu_masks[first_cpu(tmp)].pcpu_mask);
} }
cpumask_copy(irq_desc[irq].affinity, cpumask); cpumask_copy(d->affinity, cpumask);
spin_unlock_irqrestore(&gic_lock, flags); spin_unlock_irqrestore(&gic_lock, flags);
return 0; return IRQ_SET_MASK_OK_NOCOPY;
} }
#endif #endif
static struct irq_chip gic_irq_controller = { static struct irq_chip gic_irq_controller = {
.name = "MIPS GIC", .name = "MIPS GIC",
.startup = gic_irq_startup, .irq_ack = gic_irq_ack,
.ack = gic_irq_ack, .irq_mask = gic_mask_irq,
.mask = gic_mask_irq, .irq_mask_ack = gic_mask_irq,
.mask_ack = gic_mask_irq, .irq_unmask = gic_unmask_irq,
.unmask = gic_unmask_irq, .irq_eoi = gic_unmask_irq,
.eoi = gic_unmask_irq,
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
.set_affinity = gic_set_affinity, .irq_set_affinity = gic_set_affinity,
#endif #endif
}; };