[patch 0/2] microblaze: Final irq bits for .39

[patch 0/2] microblaze: Final irq bits for .39

[Thomas Gleixner]

Michal,

the following patches convert to the new irq function names and make
use of the generic show_interrupts().

Thanks,

	tglx

[patch 1/2] microblaze: Convert to new irq function names

[Thomas Gleixner]

[-- Attachment #1: microblaz.patch --]
[-- Type: text/plain, Size: 1901 bytes --]

Namespace conversion scripted with coccinelle.

Also retrieve the irq type from irq_data in intc_enable_or_unmask()

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/microblaze/kernel/intc.c    |    6 +++---
 arch/microblaze/pci/pci-common.c |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: linux-2.6-tip/arch/microblaze/kernel/intc.c
===================================================================
--- linux-2.6-tip.orig/arch/microblaze/kernel/intc.c
+++ linux-2.6-tip/arch/microblaze/kernel/intc.c
@@ -50,7 +50,7 @@ static void intc_enable_or_unmask(struct
 	 * ack function since the handle_level_irq function
 	 * acks the irq before calling the interrupt handler
 	 */
-	if (irq_to_desc(d->irq)->status & IRQ_LEVEL)
+	if (irqd_is_level_type(d))
 		out_be32(INTC_BASE + IAR, mask);
 }
 
@@ -157,11 +157,11 @@ void __init init_IRQ(void)
 
 	for (i = 0; i < nr_irq; ++i) {
 		if (intr_type & (0x00000001 << i)) {
-			set_irq_chip_and_handler_name(i, &intc_dev,
+			irq_set_chip_and_handler_name(i, &intc_dev,
 				handle_edge_irq, intc_dev.name);
 			irq_clear_status_flags(i, IRQ_LEVEL);
 		} else {
-			set_irq_chip_and_handler_name(i, &intc_dev,
+			irq_set_chip_and_handler_name(i, &intc_dev,
 				handle_level_irq, intc_dev.name);
 			irq_set_status_flags(i, IRQ_LEVEL);
 		}
Index: linux-2.6-tip/arch/microblaze/pci/pci-common.c
===================================================================
--- linux-2.6-tip.orig/arch/microblaze/pci/pci-common.c
+++ linux-2.6-tip/arch/microblaze/pci/pci-common.c
@@ -237,7 +237,7 @@ int pci_read_irq_line(struct pci_dev *pc
 
 		virq = irq_create_mapping(NULL, line);
 		if (virq != NO_IRQ)
-			set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);
+			irq_set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);
 	} else {
 		pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n",
 			 oirq.size, oirq.specifier[0], oirq.specifier[1],

[patch 2/2] microblaze: Use generic show_interrupts()

[Thomas Gleixner]

[-- Attachment #1: microblze-show-int.patch --]
[-- Type: text/plain, Size: 2120 bytes --]

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/microblaze/Kconfig      |    1 +
 arch/microblaze/kernel/irq.c |   42 ------------------------------------------
 2 files changed, 1 insertion(+), 42 deletions(-)

Index: linux-2.6-tip/arch/microblaze/Kconfig
===================================================================
--- linux-2.6-tip.orig/arch/microblaze/Kconfig
+++ linux-2.6-tip/arch/microblaze/Kconfig
@@ -18,6 +18,7 @@ config MICROBLAZE
 	select HAVE_GENERIC_HARDIRQS
 	select GENERIC_IRQ_PROBE
 	select GENERIC_HARDIRQS_NO_DEPRECATED
+	select GENERIC_IRQ_SHOW
 
 config SWAP
 	def_bool n
Index: linux-2.6-tip/arch/microblaze/kernel/irq.c
===================================================================
--- linux-2.6-tip.orig/arch/microblaze/kernel/irq.c
+++ linux-2.6-tip/arch/microblaze/kernel/irq.c
@@ -47,48 +47,6 @@ next_irq:
 	trace_hardirqs_on();
 }
 
-int show_interrupts(struct seq_file *p, void *v)
-{
-	int i = *(loff_t *) v, j;
-	struct irq_desc *desc;
-	struct irqaction *action;
-	unsigned long flags;
-
-	if (i == 0) {
-		seq_printf(p, "		");
-		for_each_online_cpu(j)
-			seq_printf(p, "CPU%-8d", j);
-		seq_putc(p, '\n');
-	}
-
-	if (i < nr_irq) {
-		desc = irq_to_desc(i);
-		raw_spin_lock_irqsave(&desc->lock, flags);
-		action = desc->action;
-		if (!action)
-			goto skip;
-		seq_printf(p, "%3d: ", i);
-#ifndef CONFIG_SMP
-		seq_printf(p, "%10u ", kstat_irqs(i));
-#else
-		for_each_online_cpu(j)
-			seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
-#endif
-		seq_printf(p, " %8s", desc->status &
-					IRQ_LEVEL ? "level" : "edge");
-		seq_printf(p, " %8s", desc->irq_data.chip->name);
-		seq_printf(p, "  %s", action->name);
-
-		for (action = action->next; action; action = action->next)
-			seq_printf(p, ", %s", action->name);
-
-		seq_putc(p, '\n');
-skip:
-		raw_spin_unlock_irqrestore(&desc->lock, flags);
-	}
-	return 0;
-}
-
 /* MS: There is no any advance mapping mechanism. We are using simple 32bit
   intc without any cascades or any connection that's why mapping is 1:1 */
 unsigned int irq_create_mapping(struct irq_host *host, irq_hw_number_t hwirq)

Re: [patch 0/2] microblaze: Final irq bits for .39

[Michal Simek]

Hi Thomas,

Thomas Gleixner wrote:
> Michal,
> 
> the following patches convert to the new irq function names and make
> use of the generic show_interrupts().

I will test them next week and let you know.

Thanks,
Michal



-- 
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian