microblaze: Convert irq chip to new functions
cover microblaze: Convert irq chip to new functions
Michal,
that series converts the irq_chip to the new functions. I've included the .end removal patch as well, as the following patches depend on it.
Can you please test ? Will you push this to Linus for .39 or do you want it to go through my tree ?
Thanks,
tglx
PATCH 1/3 microblaze: Remove stale irq_chip.end
irq_chip.end got obsolete with the removal of __do_IRQ().
Signed-off-by Thomas Gleixner <[email protected]>
Cc Peter Zijlstra <[email protected]>
Tested-by Michal Simek <[email protected]>
LKML-Reference: <[email protected]>
--- arch/microblaze/kernel/intc.c | 13 ------------- 1 file changed, 13 deletions(-)
arch/microblaze/kernel/intc.c +0 -13
@@ -74,25 +74,12 @@ static void intc_mask_ack(unsigned int iout_be32 (INTC_BASE +IAR , mask); } -static void intc_end (unsigned int irq) -{ -unsigned long mask =1 << irq; -pr_debug ("end: %d\n" , irq); -if (!(irq_desc[irq].status & (IRQ_DISABLED |IRQ_INPROGRESS ))) { -out_be32 (INTC_BASE +SIE , mask); -/* ack level sensitive intr */ -if (irq_desc[irq].status &IRQ_LEVEL ) -out_be32 (INTC_BASE +IAR , mask); - } -} -static struct irq_chip intc_dev = { .name ="Xilinx INTC" , .unmask = intc_enable_or_unmask, .mask = intc_disable_or_mask, .ack = intc_ack, .mask_ack = intc_mask_ack, - .end = intc_end, };unsigned int get_irq (struct pt_regs *regs)
PATCH 2/3 microblaze: Convert irq_chip to new functions
In reply to Thomas GleixnerUse proper irq_desc wrappers while at it.
Signed-off-by Thomas Gleixner <[email protected]>
--- arch/microblaze/kernel/intc.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-)
arch/microblaze/kernel/intc.c +19 -19
@@ -40,46 +40,46 @@ unsigned int nr_irq;#define MER_ME (1<<0)#define MER_HIE (1<<1) -static void intc_enable_or_unmask (unsigned int irq) +static void intc_enable_or_unmask (struct irq_chip *d) { -unsigned long mask =1 << irq; -pr_debug ("enable_or_unmask: %d\n" , irq); +unsigned long mask =1 << d->irq; +pr_debug ("enable_or_unmask: %d\n" , d->irq);out_be32 (INTC_BASE +SIE , mask);/* ack level irqs because they can't be acked during * ack function since the handle_level_irq function * acks the irq before calling the interrupt handler */ -if (irq_desc[irq].status &IRQ_LEVEL ) +if (irq_to_desc (d->irq)->status &IRQ_LEVEL )out_be32 (INTC_BASE +IAR , mask); } -static void intc_disable_or_mask (unsigned int irq) +static void intc_disable_or_mask (struct irq_chip *d) { -pr_debug ("disable: %d\n" , irq); -out_be32 (INTC_BASE +CIE ,1 << irq); +pr_debug ("disable: %d\n" , d->irq); +out_be32 (INTC_BASE +CIE ,1 << d->irq); } -static void intc_ack (unsigned int irq) +static void intc_ack (struct irq_chip *d) { -pr_debug ("ack: %d\n" , irq); -out_be32 (INTC_BASE +IAR ,1 << irq); +pr_debug ("ack: %d\n" , d->irq); +out_be32 (INTC_BASE +IAR ,1 << d->irq); } -static void intc_mask_ack (unsigned int irq) +static void intc_mask_ack (struct irq_chip *d) { -unsigned long mask =1 << irq; -pr_debug ("disable_and_ack: %d\n" , irq); +unsigned long mask =1 << d->irq; +pr_debug ("disable_and_ack: %d\n" , d->irq);out_be32 (INTC_BASE +CIE , mask);out_be32 (INTC_BASE +IAR , mask); }static struct irq_chip intc_dev = { .name ="Xilinx INTC" , - .unmask = intc_enable_or_unmask, - .mask = intc_disable_or_mask, - .ack = intc_ack, - .mask_ack = intc_mask_ack, + .irq_unmask = intc_enable_or_unmask, + .irq_mask = intc_disable_or_mask, + .irq_ack = intc_ack, + .irq_mask_ack = intc_mask_ack, };unsigned int get_irq (struct pt_regs *regs)
@@ -159,11 +159,11 @@ void __init init_IRQ(void)if (intr_type & (0x00000001 << i)) {set_irq_chip_and_handler_name (i, &intc_dev, handle_edge_irq, intc_dev.name); - irq_desc[i].status &= ~IRQ_LEVEL ; +irq_clear_status_flags (i,IRQ_LEVEL ); }else {set_irq_chip_and_handler_name (i, &intc_dev, handle_level_irq, intc_dev.name); - irq_desc[i].status |=IRQ_LEVEL ; +irq_set_status_flags (i,IRQ_LEVEL ); } } }
PATCH 3/3 microblaze: Select GENERIC_HARDIRQS_NO_DEPRECATED
In reply to Thomas GleixnerAll irq_chips converted.
Signed-off-by Thomas Gleixner <[email protected]>
--- arch/microblaze/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/microblaze/Kconfig +1 -0
@@ -17,6 +17,7 @@ config MICROBLAZE select OF_EARLY_FLATTREE select HAVE_GENERIC_HARDIRQS select GENERIC_IRQ_PROBE + select GENERIC_HARDIRQS_NO_DEPRECATED config SWAP def_bool n