: [SPARC64]: Unify timer interrupt handler.
PATCH 2/4 : [SPARC64]: Unify timer interrupt handler.
From 6f7ea1d2d56aa7c6cc0e1ae98d8e40eb9de27d16 Mon Sep 17 00:00:00 2001
From: David S. Miller <[email protected]>
Date: Thu, 22 Feb 2007 06:24:10 -0800
Subject: [PATCH] [SPARC64]: Unify timer interrupt handler.
Things were scattered all over the place, split between SMP and non-SMP.
Unify it all so that dyntick support is easier to add.
Signed-off-by David S. Miller <[email protected]>
--- arch/sparc64/kernel/irq.c | 26 ------------ arch/sparc64/kernel/smp.c | 87 +---------------------------------------- arch/sparc64/kernel/time.c | 43 ++++++++------------ arch/sparc64/kernel/ttable.S | 6 +-- include/asm-sparc64/cpudata.h | 4 +- include/asm-sparc64/smp.h | 4 +- include/asm-sparc64/ttable.h | 27 ------------- 7 files changed, 25 insertions(+), 172 deletions(-)
arch/sparc64/kernel/irq.c +0 -26
@@ -589,32 +589,6 @@ void ack_bad_irq(unsigned int virt_irq) ino, virt_irq); } -#ifndef CONFIG_SMP -extern irqreturn_t timer_interrupt (int ,void *); - -void timer_irq (int irq,struct pt_regs *regs) -{ -unsigned long clr_mask =1 << irq; -unsigned long tick_mask = tick_ops->softint_mask; -struct pt_regs *old_regs; - -if (get_softint () & tick_mask) { - irq =0 ; - clr_mask = tick_mask; - } -clear_softint (clr_mask); - - old_regs =set_irq_regs (regs); -irq_enter (); - - kstat_this_cpu.irqs[0 ]++; -timer_interrupt (irq,NULL ); - -irq_exit (); -set_irq_regs (old_regs); -} -#endif -void handler_irq (int irq,struct pt_regs *regs) {struct ino_bucket *bucket;
arch/sparc64/kernel/smp.c +2 -85
120 lines not on this page · raw message
arch/sparc64/kernel/time.c +18 -25
78 lines not on this page · raw message
arch/sparc64/kernel/ttable.S +1 -5
@@ -60,11 +60,7 @@ tl0_irq4: BTRAP(0x44) tl0_irq5: TRAP_IRQ(handler_irq, 5) tl0_irq6: BTRAP(0x46) BTRAP(0x47) BTRAP(0x48) BTRAP(0x49) tl0_irq10: BTRAP(0x4a) BTRAP(0x4b) BTRAP(0x4c) BTRAP(0x4d) -#ifndef CONFIG_SMP -tl0_irq14: TRAP_IRQ(timer_irq, 14) -#else -tl0_irq14: TICK_SMP_IRQ -#endif +tl0_irq14: TRAP_IRQ(timer_interrupt, 14) tl0_irq15: TRAP_IRQ(handler_irq, 15) tl0_resv050: BTRAP(0x50) BTRAP(0x51) BTRAP(0x52) BTRAP(0x53) BTRAP(0x54) BTRAP(0x55) tl0_resv056: BTRAP(0x56) BTRAP(0x57) BTRAP(0x58) BTRAP(0x59) BTRAP(0x5a) BTRAP(0x5b)
include/asm-sparc64/cpudata.h +2 -2
@@ -17,8 +17,8 @@ typedef struct { /* Dcache line 1 */ unsigned int __softirq_pending; /* must be 1st, see rtrap.S */ - unsigned int multiplier; - unsigned int counter; + unsigned int __pad0_1; + unsigned int __pad0_2; unsigned int __pad1; unsigned long clock_tick; /* %tick's per second */ unsigned long udelay_val;
include/asm-sparc64/smp.h +2 -2
@@ -42,15 +42,15 @@ extern int hard_smp_processor_id(void);#define raw_smp_processor_id () (current_thread_info()->cpu)extern void smp_setup_cpu_possible_map (void ); +extern unsigned char boot_cpu_id;#endif /* !(__ASSEMBLY__) */ #else #define smp_setup_cpu_possible_map () do { } while (0) +#define boot_cpu_id (0)#endif /* !(CONFIG_SMP) */ -#define NO_PROC_ID 0xFF -#endif /* !(_SPARC64_SMP_H) */
include/asm-sparc64/ttable.h +0 -27
@@ -157,23 +157,6 @@ ba,a,pt %xcc, rtrap_irq; \ .previous; -#define TICK_SMP_IRQ \ - rdpr %pil, %g2; \ - wrpr %g0, 15, %pil; \ - sethi %hi(1f-4), %g7; \ - ba,pt %xcc, etrap_irq; \ - or %g7, %lo(1f-4), %g7; \ - nop; \ - nop; \ - nop; \ - .subsection 2; \ -1: call trace_hardirqs_off; \ - nop; \ - call smp_percpu_timer_interrupt; \ - add %sp, PTREGS_OFF, %o0; \ - ba,a,pt %xcc, rtrap_irq; \ - .previous; -#else #define TRAP_IRQ (routine, level) \
@@ -186,16 +169,6 @@ add %sp, PTREGS_OFF, %o1; \ ba,a,pt %xcc, rtrap_irq; -#define TICK_SMP_IRQ \ - rdpr %pil, %g2; \ - wrpr %g0, 15, %pil; \ - sethi %hi(109f), %g7; \ - ba,pt %xcc, etrap_irq; \ -109: or %g7, %lo(109b), %g7; \ - call smp_percpu_timer_interrupt; \ - add %sp, PTREGS_OFF, %o0; \ - ba,a,pt %xcc, rtrap_irq; -#endif #define TRAP_IVEC TRAP_NOSAVE(do_ivec)
Signature · 1 line
1.5.0