Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

irqchip: mips-gic: Implement irq_set_type callback

Browse source 
Implement an irq_set_type callback for the GIC which is used to set
the polarity and trigger type of GIC interrupts.

Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Reviewed-by: Qais Yousef <qais.yousef@imgtec.com>
Tested-by: Qais Yousef <qais.yousef@imgtec.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jeffrey Deans <jeffrey.deans@imgtec.com>
Cc: Markos Chandras <markos.chandras@imgtec.com>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Jonas Gorski <jogo@openwrt.org>
Cc: John Crispin <blogic@openwrt.org>
Cc: David Daney <ddaney.cavm@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/7810/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Andrew Bresticker 2014-09-18 14:47:21 -07:00 committed by Ralf Baechle
parent 5561c9e467
commit 95150ae8b3
2 changed files with 64 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/mips/include/asm/gic.h
View file

@ -23,6 +23,8 @@
#define GIC_POL_NEG 0
#define GIC_TRIG_EDGE 1
#define GIC_TRIG_LEVEL 0
#define GIC_TRIG_DUAL_ENABLE 1
#define GIC_TRIG_DUAL_DISABLE 0
#define MSK(n) ((1 << (n)) - 1)
#define REG32(addr) (*(volatile unsigned int *) (addr))
@ -179,6 +181,13 @@
GIC_INTR_OFS(intr)), (1 << GIC_INTR_BIT(intr)), \
(trig) << GIC_INTR_BIT(intr))
/* Dual edge triggering : Reset Value is always 0 */
#define GIC_SH_SET_DUAL_OFS 0x0200
#define GIC_SET_DUAL(intr, dual) \
GICBIS(GIC_REG_ADDR(SHARED, GIC_SH_SET_DUAL_OFS + \
GIC_INTR_OFS(intr)), (1 << GIC_INTR_BIT(intr)), \
(dual) << GIC_INTR_BIT(intr))
/* Mask manipulation */
#define GIC_SH_SMASK_OFS 0x0380
#define GIC_SET_INTR_MASK(intr) \

57
drivers/irqchip/irq-mips-gic.c
View file

@ -43,6 +43,7 @@ struct gic_intrmask_regs {
static struct gic_pcpu_mask pcpu_masks[NR_CPUS];
static struct gic_pending_regs pending_regs[NR_CPUS];
static struct gic_intrmask_regs intrmask_regs[NR_CPUS];
static DEFINE_SPINLOCK(gic_lock);
#if defined(CONFIG_CSRC_GIC) || defined(CONFIG_CEVT_GIC)
cycle_t gic_read_count(void)
@ -244,9 +245,60 @@ static void gic_ack_irq(struct irq_data *d)
GICWRITE(GIC_REG(SHARED, GIC_SH_WEDGE), d->irq - gic_irq_base);
}
#ifdef CONFIG_SMP
static DEFINE_SPINLOCK(gic_lock);
static int gic_set_type(struct irq_data *d, unsigned int type)
{
unsigned int irq = d->irq - gic_irq_base;
unsigned long flags;
bool is_edge;
spin_lock_irqsave(&gic_lock, flags);
switch (type & IRQ_TYPE_SENSE_MASK) {
case IRQ_TYPE_EDGE_FALLING:
GIC_SET_POLARITY(irq, GIC_POL_NEG);
GIC_SET_TRIGGER(irq, GIC_TRIG_EDGE);
GIC_SET_DUAL(irq, GIC_TRIG_DUAL_DISABLE);
is_edge = true;
break;
case IRQ_TYPE_EDGE_RISING:
GIC_SET_POLARITY(irq, GIC_POL_POS);
GIC_SET_TRIGGER(irq, GIC_TRIG_EDGE);
GIC_SET_DUAL(irq, GIC_TRIG_DUAL_DISABLE);
is_edge = true;
break;
case IRQ_TYPE_EDGE_BOTH:
/* polarity is irrelevant in this case */
GIC_SET_TRIGGER(irq, GIC_TRIG_EDGE);
GIC_SET_DUAL(irq, GIC_TRIG_DUAL_ENABLE);
is_edge = true;
break;
case IRQ_TYPE_LEVEL_LOW:
GIC_SET_POLARITY(irq, GIC_POL_NEG);
GIC_SET_TRIGGER(irq, GIC_TRIG_LEVEL);
GIC_SET_DUAL(irq, GIC_TRIG_DUAL_DISABLE);
is_edge = false;
break;
case IRQ_TYPE_LEVEL_HIGH:
default:
GIC_SET_POLARITY(irq, GIC_POL_POS);
GIC_SET_TRIGGER(irq, GIC_TRIG_LEVEL);
GIC_SET_DUAL(irq, GIC_TRIG_DUAL_DISABLE);
is_edge = false;
break;
}
if (is_edge) {
gic_irq_flags[irq] |= GIC_TRIG_EDGE;
__irq_set_handler_locked(d->irq, handle_edge_irq);
} else {
gic_irq_flags[irq] &= ~GIC_TRIG_EDGE;
__irq_set_handler_locked(d->irq, handle_level_irq);
}
spin_unlock_irqrestore(&gic_lock, flags);
return 0;
}
#ifdef CONFIG_SMP
static int gic_set_affinity(struct irq_data *d, const struct cpumask *cpumask,
bool force)
{
@ -282,6 +334,7 @@ static struct irq_chip gic_irq_controller = {
.irq_ack = gic_ack_irq,
.irq_mask = gic_mask_irq,
.irq_unmask = gic_unmask_irq,
.irq_set_type = gic_set_type,
#ifdef CONFIG_SMP
.irq_set_affinity = gic_set_affinity,
#endif