Skip to contentSkip to conversation

powerpc-genirq: Use generic_handle_irq()

PATCH In review Benjamin Herrenschmidt 3 participants 7 messages Jun 13, 2006 – Jun 14, 2006 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc-genirq: Use generic_handle_irq()

This patch updates the ppc and powerpc architectures to use the new generic_handle_irq() so that interrupt controllers can be ported to the new genirq layer.

---

Patch depends on Ingo/Thomas genirq patchset.

arch/powerpc/kernel/irq.c +6 -2
Index: linux-work/arch/powerpc/kernel/irq.c
===================================================================
@@ -219,15 +219,19 @@ void do_IRQ(struct pt_regs *regs)
 		curtp = current_thread_info();
 		irqtp = hardirq_ctx[smp_processor_id()];
 		if (curtp != irqtp) {
+			struct irq_desc *desc = irq_desc + irq;
+			void *handler = desc->handle_irq;
+			if (handler == NULL)
+				handler = &__do_IRQ;
 			irqtp->task = curtp->task;
 			irqtp->flags = 0;
-			call___do_IRQ(irq, regs, irqtp);
+			call_handle_irq(irq, desc, regs, irqtp, handler);
 			irqtp->task = NULL;
 			if (irqtp->flags)
 				set_bits(irqtp->flags, &curtp->flags);
 		} else
 #endif
-			__do_IRQ(irq, regs);
+			generic_handle_irq(irq, regs);
 	} else if (irq != -2)
 		/* That's not SMP safe ... but who cares ? */
 		ppc_spurious_interrupts++;
arch/powerpc/kernel/misc_64.S +6 -4
Index: linux-work/arch/powerpc/kernel/misc_64.S
===================================================================
@@ -89,12 +89,14 @@ _GLOBAL(call_do_softirq)
 	mtlr	r0
 	blr
 
-_GLOBAL(call___do_IRQ)
+_GLOBAL(call_handle_irq)
+	ld	r8,0(r7)
 	mflr	r0
 	std	r0,16(r1)
-	stdu	r1,THREAD_SIZE-112(r5)
-	mr	r1,r5
-	bl	.__do_IRQ
+	mtctr	r8
+	stdu	r1,THREAD_SIZE-112(r6)
+	mr	r1,r6
+	bctrl
 	ld	r1,0(r1)
 	ld	r0,16(r1)
 	mtlr	r0
include/asm-powerpc/irq.h +2 -2
Index: linux-work/include/asm-powerpc/irq.h
===================================================================
@@ -494,8 +494,8 @@ extern struct thread_info *softirq_ctx[N
 
 extern void irq_ctx_init(void);
 extern void call_do_softirq(struct thread_info *tp);
-extern int call___do_IRQ(int irq, struct pt_regs *regs,
-		struct thread_info *tp);
+extern int call_handle_irq(int irq, void *p1, void *p2,
+			   struct thread_info *tp, void *func);
 
 #else
 #define irq_ctx_init()
#1 lore raw
Quoted 3 lines · Benjamin Herrenschmidt

This patch updates the ppc and powerpc architectures to use the new generic_handle_irq() so that interrupt controllers can be ported to the new genirq layer.

It does? I only see arch/powerpc in the patch. Is arch/ppc hiding somewhere else?

And yes, arch/ppc still exists. We can debate that later ;).

josh

#2 lore raw
Quoted 4 lines · Josh Boyer

It does? I only see arch/powerpc in the patch. Is arch/ppc hiding somewhere else?

And yes, arch/ppc still exists. We can debate that later ;).

Did a maintainer step forward for it yet?

Signature · 1 line
dwmw2
#3 lore raw
Quoted 7 lines · David Woodhouse
Quoted 4 lines · Josh Boyer

It does? I only see arch/powerpc in the patch. Is arch/ppc hiding somewhere else?

And yes, arch/ppc still exists. We can debate that later ;).

Did a maintainer step forward for it yet?

For arch/ppc? Not that I'm aware of. But that wasn't particularly my point. The email says "This patch updates the ppc and powerpc architectures..." when it doesn't.

I think most agree that arch/ppc needs to die via a complete migration to arch/powerpc. But patches shouldn't claim to do something they don't :).

josh

#4 lore raw
Quoted 5 lines · Josh Boyer
Quoted 4 lines · David Woodhouse
Quoted 3 lines · Josh Boyer

It does? I only see arch/powerpc in the patch. Is arch/ppc hiding somewhere else?

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

And yes, arch/ppc still exists. We can debate that later ;).

Did a maintainer step forward for it yet?

For arch/ppc? Not that I'm aware of. But that wasn't particularly my point. The email says "This patch updates the ppc and powerpc architectures..." when it doesn't.

It does, check again :)

Ben.

#5 lore raw
Quoted 8 lines · Benjamin Herrenschmidt
Quoted 7 lines · Josh Boyer
Quoted 6 lines · David Woodhouse
Quoted 4 lines · Josh Boyer

It does? I only see arch/powerpc in the patch. Is arch/ppc hiding somewhere else?

And yes, arch/ppc still exists. We can debate that later ;).

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

Did a maintainer step forward for it yet?

For arch/ppc? Not that I'm aware of. But that wasn't particularly my point. The email says "This patch updates the ppc and powerpc architectures..." when it doesn't.

It does, check again :)

Ugh. Today is not my day apparently. Sorry for the noise.

josh

#6 lore raw
In reply to Josh Boyer
Quoted 9 lines · Josh Boyer
Quoted 3 lines · Benjamin Herrenschmidt

This patch updates the ppc and powerpc architectures to use the new generic_handle_irq() so that interrupt controllers can be ported to the new genirq layer.

It does? I only see arch/powerpc in the patch. Is arch/ppc hiding somewhere else?

And yes, arch/ppc still exists. We can debate that later ;).

arch/ppc uses arch/powerpc/kernel/irq.c

Ben.