[patch 0/4] score: Final irq bits for .39

[patch 0/4] score: Final irq bits for .39

[Thomas Gleixner]

Chen,

the following series contains:

    - irq_chip conversion (Resend)
    - Conversion to new irq function names
    - Use generic show_interrupts()

Can you please ack or send them to Linus yourself?

Thanks,

	tglx

[patch 1/4] score: Convert irq_chip to new functions

[Thomas Gleixner]

[-- Attachment #1: score-convert-irq_chip-to-new-functions.patch --]
[-- Type: text/plain, Size: 2282 bytes --]

Use the proper accessor functions in show_interrupts() while at it.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Chen Liqin <liqin.chen@sunplusct.com>

---
 arch/score/kernel/irq.c |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

Index: linux-2.6/arch/score/kernel/irq.c
===================================================================
--- linux-2.6.orig/arch/score/kernel/irq.c
+++ linux-2.6/arch/score/kernel/irq.c
@@ -52,9 +52,9 @@ asmlinkage void do_IRQ(int irq)
 	irq_exit();
 }
 
-static void score_mask(unsigned int irq_nr)
+static void score_mask(struct irq_data *d)
 {
-	unsigned int irq_source = 63 - irq_nr;
+	unsigned int irq_source = 63 - d->irq;
 
 	if (irq_source < 32)
 		__raw_writel((__raw_readl(SCORE_PIC + INT_MASKL) | \
@@ -64,9 +64,9 @@ static void score_mask(unsigned int irq_
 			(1 << (irq_source - 32))), SCORE_PIC + INT_MASKH);
 }
 
-static void score_unmask(unsigned int irq_nr)
+static void score_unmask(struct irq_data *d)
 {
-	unsigned int irq_source = 63 - irq_nr;
+	unsigned int irq_source = 63 - d->irq;
 
 	if (irq_source < 32)
 		__raw_writel((__raw_readl(SCORE_PIC + INT_MASKL) & \
@@ -78,9 +78,9 @@ static void score_unmask(unsigned int ir
 
 struct irq_chip score_irq_chip = {
 	.name		= "Score7-level",
-	.mask		= score_mask,
-	.mask_ack	= score_mask,
-	.unmask		= score_unmask,
+	.irq_mask	= score_mask,
+	.irq_mask_ack	= score_mask,
+	.irq_unmask	= score_unmask,
 };
 
 /*
@@ -127,21 +127,23 @@ int show_interrupts(struct seq_file *p, 
 	}
 
 	if (i < NR_IRQS) {
-		spin_lock_irqsave(&irq_desc[i].lock, flags);
-		action = irq_desc[i].action;
+		struct irq_desc *desc = irq_to_desc(i);
+
+		raw_spin_lock_irqsave(&desc->lock, flags);
+		action = desc->action;
 		if (!action)
 			goto unlock;
 
 		seq_printf(p, "%3d: ", i);
 		seq_printf(p, "%10u ", kstat_irqs(i));
-		seq_printf(p, " %8s", irq_desc[i].chip->name ? : "-");
+		seq_printf(p, " %8s", get_irq_desc_chip(desc)->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');
 unlock:
-		spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+		raw_spin_unlock_irqrestore(&desc->lock, flags);
 	}
 
 	return 0;

[patch 3/4] score: Convert to new irq function names

[Thomas Gleixner]

[-- Attachment #1: score-namespace.patch --]
[-- Type: text/plain, Size: 1119 bytes --]

Scripted with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Chen Liqin <liqin.chen@sunplusct.com>
---
 arch/score/kernel/irq.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6-tip/arch/score/kernel/irq.c
===================================================================
--- linux-2.6-tip.orig/arch/score/kernel/irq.c
+++ linux-2.6-tip/arch/score/kernel/irq.c
@@ -92,7 +92,7 @@ void __init init_IRQ(void)
 	unsigned long target_addr;
 
 	for (index = 0; index < NR_IRQS; ++index)
-		set_irq_chip_and_handler(index, &score_irq_chip,
+		irq_set_chip_and_handler(index, &score_irq_chip,
 					 handle_level_irq);
 
 	for (target_addr = IRQ_VECTOR_BASE_ADDR;
@@ -136,7 +136,7 @@ int show_interrupts(struct seq_file *p, 
 
 		seq_printf(p, "%3d: ", i);
 		seq_printf(p, "%10u ", kstat_irqs(i));
-		seq_printf(p, " %8s", get_irq_desc_chip(desc)->name ? : "-");
+		seq_printf(p, " %8s", irq_desc_get_chip(desc)->name ? : "-");
 		seq_printf(p, "  %s", action->name);
 		for (action = action->next; action; action = action->next)
 			seq_printf(p, ", %s", action->name);

[patch 2/4] score: Select GENERIC_HARDIRQS_NO_DEPRECATED

[Thomas Gleixner]

[-- Attachment #1: score-select-generic_hardirqs_no_deprecated.patch --]
[-- Type: text/plain, Size: 584 bytes --]

All chips converted and proper accessor functions used.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Chen Liqin <liqin.chen@sunplusct.com>
---
 arch/score/Kconfig |    1 +
 1 file changed, 1 insertion(+)

Index: linux-2.6/arch/score/Kconfig
===================================================================
--- linux-2.6.orig/arch/score/Kconfig
+++ linux-2.6/arch/score/Kconfig
@@ -3,6 +3,7 @@ menu "Machine selection"
 config SCORE
        def_bool y
        select HAVE_GENERIC_HARDIRQS
+       select GENERIC_HARDIRQS_NO_DEPRECATED
 
 choice
 	prompt "System type"

[patch 4/4] score: Use generic show_interrupts()

[Thomas Gleixner]

[-- Attachment #1: score-use-show.patch --]
[-- Type: text/plain, Size: 1866 bytes --]

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Chen Liqin <liqin.chen@sunplusct.com>
---
 arch/score/Kconfig      |    1 +
 arch/score/kernel/irq.c |   39 ---------------------------------------
 2 files changed, 1 insertion(+), 39 deletions(-)

Index: linux-2.6-tip/arch/score/Kconfig
===================================================================
--- linux-2.6-tip.orig/arch/score/Kconfig
+++ linux-2.6-tip/arch/score/Kconfig
@@ -4,6 +4,7 @@ config SCORE
        def_bool y
        select HAVE_GENERIC_HARDIRQS
        select GENERIC_HARDIRQS_NO_DEPRECATED
+       select GENERIC_IRQ_SHOW
 
 choice
 	prompt "System type"
Index: linux-2.6-tip/arch/score/kernel/irq.c
===================================================================
--- linux-2.6-tip.orig/arch/score/kernel/irq.c
+++ linux-2.6-tip/arch/score/kernel/irq.c
@@ -109,42 +109,3 @@ void __init init_IRQ(void)
 		: : "r" (EXCEPTION_VECTOR_BASE_ADDR | \
 			VECTOR_ADDRESS_OFFSET_MODE16));
 }
-
-/*
- * Generic, controller-independent functions:
- */
-int show_interrupts(struct seq_file *p, void *v)
-{
-	int i = *(loff_t *)v, cpu;
-	struct irqaction *action;
-	unsigned long flags;
-
-	if (i == 0) {
-		seq_puts(p, "           ");
-		for_each_online_cpu(cpu)
-			seq_printf(p, "CPU%d       ", cpu);
-		seq_putc(p, '\n');
-	}
-
-	if (i < NR_IRQS) {
-		struct irq_desc *desc = irq_to_desc(i);
-
-		raw_spin_lock_irqsave(&desc->lock, flags);
-		action = desc->action;
-		if (!action)
-			goto unlock;
-
-		seq_printf(p, "%3d: ", i);
-		seq_printf(p, "%10u ", kstat_irqs(i));
-		seq_printf(p, " %8s", irq_desc_get_chip(desc)->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');
-unlock:
-		raw_spin_unlock_irqrestore(&desc->lock, flags);
-	}
-
-	return 0;
-}

[GIT PULL] score arch fixes for 2.6.39

[liqin.chen]

Hi Linus,

Please pull score arch fixes for Linux 2.6.39.
It's include some fixed for score irq files.

Thanks
--liqin

------

The following changes since commit 
16c29dafcc86024048f1dbb8349d31cb22c7c55a:
  Linus Torvalds (1):
        Merge branch 'syscore' of 
git://git.kernel.org/.../rafael/suspend-2.6

are available in the git repository at:

  git://gitserver.sunplusct.com/linux-2.6-score.git for-linus

Chen Liqin (1):
      score: lost a semicolon in asm/irqflags.h

Thomas Gleixner (4):
      score: Convert irq_chip to new functions
      score: Select GENERIC_HARDIRQS_NO_DEPRECATED
      score: Convert to new irq function names
      score: Use generic show_interrupts()

 arch/score/Kconfig                |    2 +
 arch/score/include/asm/irqflags.h |    2 +-
 arch/score/kernel/irq.c           |   53 
+++++-------------------------------
 3 files changed, 11 insertions(+), 46 deletions(-)