alpha pt_regs cleanups: device_interrupt
PATCH 1/4 alpha pt_regs cleanups: device_interrupt
callers of ->device_interrupt() do set_irq_regs() now; pt_regs argument removed, remaining uses of regs in instances of ->device_interrupt() are switched to get_irq_regs() and will be gone in the next patch.
Signed-off-by Al Viro <[email protected]>
--- arch/alpha/kernel/irq_alpha.c | 5 ++++- arch/alpha/kernel/irq_i8259.c | 4 ++-- arch/alpha/kernel/irq_impl.h | 6 +++--- arch/alpha/kernel/irq_pyxis.c | 6 +++--- arch/alpha/kernel/irq_srm.c | 4 ++-- arch/alpha/kernel/sys_alcor.c | 6 +++--- arch/alpha/kernel/sys_cabriolet.c | 16 ++++++++-------- arch/alpha/kernel/sys_dp264.c | 14 +++++++------- arch/alpha/kernel/sys_eb64p.c | 6 +++--- arch/alpha/kernel/sys_eiger.c | 16 ++++++++-------- arch/alpha/kernel/sys_jensen.c | 6 +++--- arch/alpha/kernel/sys_marvel.c | 4 ++-- arch/alpha/kernel/sys_miata.c | 4 ++-- arch/alpha/kernel/sys_mikasa.c | 6 +++--- arch/alpha/kernel/sys_noritake.c | 10 +++++----- arch/alpha/kernel/sys_rawhide.c | 4 ++-- arch/alpha/kernel/sys_rx164.c | 6 +++--- arch/alpha/kernel/sys_sable.c | 4 ++-- arch/alpha/kernel/sys_takara.c | 16 ++++++++-------- arch/alpha/kernel/sys_titan.c | 11 +++++++---- arch/alpha/kernel/sys_wildfire.c | 4 ++-- include/asm-alpha/machvec.h | 2 +- 22 files changed, 83 insertions(+), 77 deletions(-)
arch/alpha/kernel/irq_alpha.c +4 -1
@@ -39,6 +39,7 @@ asmlinkage void do_entInt(unsigned long type, unsigned long vector, unsigned long la_ptr, struct pt_regs *regs) { +struct pt_regs *old_regs;switch (type) {case 0 :#ifdef CONFIG_SMP
@@ -72,7 +73,9 @@ #endif alpha_mv.machine_check (vector, la_ptr, regs);return ;case 3 : - alpha_mv.device_interrupt (vector, regs); + old_regs =set_irq_regs (regs); + alpha_mv.device_interrupt (vector); +set_irq_regs (old_regs);return ;case 4 :perf_irq (la_ptr, regs);
arch/alpha/kernel/irq_i8259.c +2 -2
@@ -137,7 +137,7 @@ #endif#if defined(IACK_SC )void -isa_device_interrupt (unsigned long vector,struct pt_regs *regs) +isa_device_interrupt (unsigned long vector) {/* * Generate a PCI interrupt acknowledge cycle. The PIC will
@@ -147,7 +147,7 @@ isa_device_interrupt(unsigned long vecto*/ int j = *(vuip )IACK_SC ; j &=0xff ; - handle_irq(j, regs); + handle_irq(j, get_irq_regs()); }#endif
arch/alpha/kernel/irq_impl.h +3 -3
@@ -15,10 +15,10 @@ #include <linux/profile.h>#define RTC_IRQ 8 -extern void isa_device_interrupt (unsigned long ,struct pt_regs *); +extern void isa_device_interrupt (unsigned long );extern void isa_no_iack_sc_device_interrupt (unsigned long ,struct pt_regs *); -extern void srm_device_interrupt (unsigned long ,struct pt_regs *); -extern void pyxis_device_interrupt (unsigned long ,struct pt_regs *); +extern void srm_device_interrupt (unsigned long ); +extern void pyxis_device_interrupt (unsigned long );extern struct irqaction timer_irqaction;extern struct irqaction isa_cascade_irqaction;
arch/alpha/kernel/irq_pyxis.c +3 -3
@@ -81,7 +81,7 @@ static struct hw_interrupt_type pyxis_ir };void -pyxis_device_interrupt (unsigned long vector,struct pt_regs *regs) +pyxis_device_interrupt (unsigned long vector) {unsigned long pld;unsigned int i;
@@ -98,9 +98,9 @@ pyxis_device_interrupt(unsigned long vec i =ffz (~pld); pld &= pld -1 ;/* clear least bit set */ if (i ==7 ) -isa_device_interrupt (vector, regs); +isa_device_interrupt (vector);else -handle_irq (16 +i, regs); +handle_irq (16 +i,get_irq_regs ()); } }
arch/alpha/kernel/irq_srm.c +2 -2
@@ -72,8 +72,8 @@ init_srm_irqs(long max, unsigned long ig }void -srm_device_interrupt (unsigned long vector,struct pt_regs * regs) +srm_device_interrupt (unsigned long vector) {int irq = (vector -0x800 ) >>4 ; -handle_irq (irq, regs); +handle_irq (irq,get_irq_regs ()); }
arch/alpha/kernel/sys_alcor.c +3 -3
@@ -100,7 +100,7 @@ static struct hw_interrupt_type alcor_ir };static void -alcor_device_interrupt (unsigned long vector,struct pt_regs *regs) +alcor_device_interrupt (unsigned long vector) {unsigned long pld;unsigned int i;
@@ -116,9 +116,9 @@ alcor_device_interrupt(unsigned long vec i =ffz (~pld); pld &= pld -1 ;/* clear least bit set */ if (i ==31 ) { -isa_device_interrupt (vector, regs); +isa_device_interrupt (vector); }else { -handle_irq (16 + i, regs); +handle_irq (16 + i,get_irq_regs ()); } } }
arch/alpha/kernel/sys_cabriolet.c +8 -8
@@ -82,7 +82,7 @@ static struct hw_interrupt_type cabriole };static void -cabriolet_device_interrupt (unsigned long v,struct pt_regs *r) +cabriolet_device_interrupt (unsigned long v) {unsigned long pld;unsigned int i;
@@ -98,15 +98,15 @@ cabriolet_device_interrupt(unsigned long i =ffz (~pld); pld &= pld -1 ;/* clear least bit set */ if (i ==4 ) { -isa_device_interrupt (v, r); +isa_device_interrupt (v); }else { -handle_irq (16 + i, r); +handle_irq (16 + i,get_irq_regs ()); } } }static void __init -common_init_irq (void (*srm_dev_int)(unsigned long v,struct pt_regs *r)) +common_init_irq (void (*srm_dev_int)(unsigned long v)) {init_i8259a_irqs ();
@@ -154,18 +154,18 @@ #if defined(CONFIG_ALPHA_GENERIC) || deftoo invasive though. */ static void -pc164_srm_device_interrupt (unsigned long v,struct pt_regs *r) +pc164_srm_device_interrupt (unsigned long v) { __min_ipl =getipl (); -srm_device_interrupt (v, r); +srm_device_interrupt (v); __min_ipl =0 ; }static void -pc164_device_interrupt (unsigned long v,struct pt_regs *r) +pc164_device_interrupt (unsigned long v) { __min_ipl =getipl (); -cabriolet_device_interrupt (v, r); +cabriolet_device_interrupt (v); __min_ipl =0 ; }
arch/alpha/kernel/sys_dp264.c +7 -7
@@ -217,7 +217,7 @@ static struct hw_interrupt_type clipper_ };static void -dp264_device_interrupt (unsigned long vector,struct pt_regs * regs) +dp264_device_interrupt (unsigned long vector) {#if 1 printk ("dp264_device_interrupt: NOT IMPLEMENTED YET!! \n" );
@@ -236,9 +236,9 @@ #else i =ffz (~pld); pld &= pld -1 ;/* clear least bit set */ if (i ==55 ) -isa_device_interrupt (vector, regs); +isa_device_interrupt (vector);else -handle_irq (16 + i,16 + i, regs); +handle_irq (16 + i,get_irq_regs ());#if 0 TSUNAMI_cchip->dir0.csr =1UL << i;mb (); tmp = TSUNAMI_cchip->dir0.csr;
@@ -248,7 +248,7 @@ #endif }static void -dp264_srm_device_interrupt (unsigned long vector,struct pt_regs * regs) +dp264_srm_device_interrupt (unsigned long vector) {int irq;
@@ -268,11 +268,11 @@ dp264_srm_device_interrupt(unsigned longif (irq >=32 ) irq -=16 ; -handle_irq (irq, regs); +handle_irq (irq,get_irq_regs ()); }static void -clipper_srm_device_interrupt (unsigned long vector,struct pt_regs * regs) +clipper_srm_device_interrupt (unsigned long vector) {int irq;
@@ -290,7 +290,7 @@ clipper_srm_device_interrupt(unsigned lo* * Eg IRQ 24 is DRIR bit 8, etc, etc */ -handle_irq (irq, regs); +handle_irq (irq,get_irq_regs ()); } static void __init
arch/alpha/kernel/sys_eb64p.c +3 -3
@@ -80,7 +80,7 @@ static struct hw_interrupt_type eb64p_ir };static void -eb64p_device_interrupt (unsigned long vector,struct pt_regs *regs) +eb64p_device_interrupt (unsigned long vector) {unsigned long pld;unsigned int i;
@@ -97,9 +97,9 @@ eb64p_device_interrupt(unsigned long vec pld &= pld -1 ;/* clear least bit set */ if (i ==5 ) { -isa_device_interrupt (vector, regs); +isa_device_interrupt (vector); }else { -handle_irq (16 + i, regs); +handle_irq (16 + i,get_irq_regs ()); } } }
arch/alpha/kernel/sys_eiger.c +8 -8
@@ -91,7 +91,7 @@ static struct hw_interrupt_type eiger_ir };static void -eiger_device_interrupt (unsigned long vector,struct pt_regs * regs) +eiger_device_interrupt (unsigned long vector) {unsigned intstatus;
@@ -118,20 +118,20 @@ eiger_device_interrupt(unsigned long vec* despatch an interrupt if it's set. */ -if (intstatus &8 )handle_irq (16 +3 , regs); -if (intstatus &4 )handle_irq (16 +2 , regs); -if (intstatus &2 )handle_irq (16 +1 , regs); -if (intstatus &1 )handle_irq (16 +0 , regs); +if (intstatus &8 )handle_irq (16 +3 ,get_irq_regs ()); +if (intstatus &4 )handle_irq (16 +2 ,get_irq_regs ()); +if (intstatus &2 )handle_irq (16 +1 ,get_irq_regs ()); +if (intstatus &1 )handle_irq (16 +0 ,get_irq_regs ()); }else { -isa_device_interrupt (vector, regs); +isa_device_interrupt (vector); } }static void -eiger_srm_device_interrupt (unsigned long vector,struct pt_regs * regs) +eiger_srm_device_interrupt (unsigned long vector) {int irq = (vector -0x800 ) >>4 ; -handle_irq (irq, regs); +handle_irq (irq,get_irq_regs ()); } static void __init
arch/alpha/kernel/sys_jensen.c +3 -3
@@ -129,7 +129,7 @@ static struct hw_interrupt_type jensen_l };static void -jensen_device_interrupt (unsigned long vector,struct pt_regs * regs) +jensen_device_interrupt (unsigned long vector) {int irq;
@@ -189,7 +189,7 @@ #define JENSEN_CYCLES_PER_SEC (150000000if (cc - last_msg > ((JENSEN_CYCLES_PER_SEC ) *3 ) || irq != last_irq) {printk (KERN_CRIT " irq %d count %d cc %u @ %lx\n" , - irq, count, cc-last_cc, regs->pc); + irq, count, cc-last_cc,get_irq_regs ()->pc); count =0 ; last_msg = cc; last_irq = irq;
@@ -198,7 +198,7 @@ #define JENSEN_CYCLES_PER_SEC (150000000 }#endif -handle_irq (irq, regs); +handle_irq (irq,get_irq_regs ()); } static void __init
arch/alpha/kernel/sys_marvel.c +2 -2
@@ -38,7 +38,7 @@ #endif* Interrupt handling. */ static void -io7_device_interrupt (unsigned long vector,struct pt_regs * regs) +io7_device_interrupt (unsigned long vector) {unsigned int pid;unsigned int irq;
@@ -64,7 +64,7 @@ io7_device_interrupt(unsigned long vecto irq &=MARVEL_IRQ_VEC_IRQ_MASK ;/* not too many bits */ irq |= pid <<MARVEL_IRQ_VEC_PE_SHIFT ;/* merge the pid */ -handle_irq (irq, regs); +handle_irq (irq,get_irq_regs ()); } static volatile unsigned long *
arch/alpha/kernel/sys_miata.c +2 -2
@@ -33,7 +33,7 @@ #include "machvec_impl.h"static void -miata_srm_device_interrupt (unsigned long vector,struct pt_regs * regs) +miata_srm_device_interrupt (unsigned long vector) {int irq;
@@ -56,7 +56,7 @@ miata_srm_device_interrupt(unsigned longif (irq >=16 ) irq = irq +8 ; -handle_irq (irq, regs); +handle_irq (irq,get_irq_regs ()); } static void __init
arch/alpha/kernel/sys_mikasa.c +3 -3
@@ -79,7 +79,7 @@ static struct hw_interrupt_type mikasa_i };static void -mikasa_device_interrupt (unsigned long vector,struct pt_regs *regs) +mikasa_device_interrupt (unsigned long vector) {unsigned long pld;unsigned int i;
@@ -97,9 +97,9 @@ mikasa_device_interrupt(unsigned long ve i =ffz (~pld); pld &= pld -1 ;/* clear least bit set */ if (i <16 ) { -isa_device_interrupt (vector, regs); +isa_device_interrupt (vector); }else { -handle_irq (i, regs); +handle_irq (i,get_irq_regs ()); } } }
arch/alpha/kernel/sys_noritake.c +5 -5
@@ -77,7 +77,7 @@ static struct hw_interrupt_type noritake };static void -noritake_device_interrupt (unsigned long vector,struct pt_regs *regs) +noritake_device_interrupt (unsigned long vector) {unsigned long pld;unsigned int i;
@@ -96,15 +96,15 @@ noritake_device_interrupt(unsigned long i =ffz (~pld); pld &= pld -1 ;/* clear least bit set */ if (i <16 ) { -isa_device_interrupt (vector, regs); +isa_device_interrupt (vector); }else { -handle_irq (i, regs); +handle_irq (i,get_irq_regs ()); } } }static void -noritake_srm_device_interrupt (unsigned long vector,struct pt_regs * regs) +noritake_srm_device_interrupt (unsigned long vector) {int irq;
@@ -122,7 +122,7 @@ noritake_srm_device_interrupt(unsigned lif (irq >=16 ) irq = irq +1 ; -handle_irq (irq, regs); +handle_irq (irq,get_irq_regs ()); } static void __init
arch/alpha/kernel/sys_rawhide.c +2 -2
@@ -134,7 +134,7 @@ static struct hw_interrupt_type rawhide_ };static void -rawhide_srm_device_interrupt (unsigned long vector,struct pt_regs * regs) +rawhide_srm_device_interrupt (unsigned long vector) {int irq;
@@ -158,7 +158,7 @@ rawhide_srm_device_interrupt(unsigned lo/* Adjust by which hose it is from. */ irq -= ((irq +16 ) >>2 ) &0x38 ; -handle_irq (irq, regs); +handle_irq (irq,get_irq_regs ()); } static void __init
arch/alpha/kernel/sys_rx164.c +3 -3
@@ -83,7 +83,7 @@ static struct hw_interrupt_type rx164_ir };static void -rx164_device_interrupt (unsigned long vector,struct pt_regs *regs) +rx164_device_interrupt (unsigned long vector) {unsigned long pld;volatile unsigned int *dirr;
@@ -102,9 +102,9 @@ rx164_device_interrupt(unsigned long vec i =ffz (~pld); pld &= pld -1 ;/* clear least bit set */ if (i ==20 ) { -isa_no_iack_sc_device_interrupt (vector, regs); +isa_no_iack_sc_device_interrupt (vector,get_irq_regs ()); }else { -handle_irq (16 +i, regs); +handle_irq (16 +i,get_irq_regs ()); } } }
arch/alpha/kernel/sys_sable.c +2 -2
@@ -512,7 +512,7 @@ static struct hw_interrupt_type sable_ly };static void -sable_lynx_srm_device_interrupt (unsigned long vector,struct pt_regs * regs) +sable_lynx_srm_device_interrupt (unsigned long vector) {/* Note that the vector reported by the SRM PALcode corresponds to the interrupt mask bits, but we have to manage via the
@@ -526,7 +526,7 @@ #if 0printk ("%s: vector 0x%lx bit 0x%x irq 0x%x\n" , __FUNCTION__, vector, bit, irq);#endif -handle_irq (irq, regs); +handle_irq (irq,get_irq_regs ()); } static void __init
arch/alpha/kernel/sys_takara.c +8 -8
@@ -85,7 +85,7 @@ static struct hw_interrupt_type takara_i };static void -takara_device_interrupt (unsigned long vector,struct pt_regs *regs) +takara_device_interrupt (unsigned long vector) {unsigned intstatus;
@@ -112,20 +112,20 @@ takara_device_interrupt(unsigned long ve* despatch an interrupt if it's set. */ -if (intstatus &8 )handle_irq (16 +3 , regs); -if (intstatus &4 )handle_irq (16 +2 , regs); -if (intstatus &2 )handle_irq (16 +1 , regs); -if (intstatus &1 )handle_irq (16 +0 , regs); +if (intstatus &8 )handle_irq (16 +3 ,get_irq_regs ()); +if (intstatus &4 )handle_irq (16 +2 ,get_irq_regs ()); +if (intstatus &2 )handle_irq (16 +1 ,get_irq_regs ()); +if (intstatus &1 )handle_irq (16 +0 ,get_irq_regs ()); }else { -isa_device_interrupt (vector, regs); +isa_device_interrupt (vector); } }static void -takara_srm_device_interrupt (unsigned long vector,struct pt_regs * regs) +takara_srm_device_interrupt (unsigned long vector) {int irq = (vector -0x800 ) >>4 ; -handle_irq (irq, regs); +handle_irq (irq,get_irq_regs ()); } static void __init
arch/alpha/kernel/sys_titan.c +7 -4
@@ -167,18 +167,18 @@ titan_set_irq_affinity(unsigned int irq, }static void -titan_device_interrupt (unsigned long vector,struct pt_regs * regs) +titan_device_interrupt (unsigned long vector) {printk ("titan_device_interrupt: NOT IMPLEMENTED YET!! \n" ); }static void -titan_srm_device_interrupt (unsigned long vector,struct pt_regs * regs) +titan_srm_device_interrupt (unsigned long vector) {int irq; irq = (vector -0x800 ) >>4 ; -handle_irq (irq, regs); +handle_irq (irq,get_irq_regs ()); }
@@ -245,6 +245,7 @@ titan_legacy_init_irq(void)void titan_dispatch_irqs (u64 mask,struct pt_regs *regs) { +struct pt_regs *old_regs;unsigned long vector;/*
@@ -252,6 +253,7 @@ titan_dispatch_irqs(u64 mask, struct pt_*/ mask &= titan_cpu_irq_affinity[smp_processor_id ()]; + old_regs =set_irq_regs (regs);/* * Dispatch all requested interrupts */
@@ -263,8 +265,9 @@ titan_dispatch_irqs(u64 mask, struct pt_ vector =0x900 + (vector <<4 );/* convert to SRM vector */ /* dispatch it */ - alpha_mv.device_interrupt (vector, regs); + alpha_mv.device_interrupt (vector); } +set_irq_regs (old_regs); }
arch/alpha/kernel/sys_wildfire.c +2 -2
@@ -234,7 +234,7 @@ #endif }static void -wildfire_device_interrupt (unsigned long vector,struct pt_regs * regs) +wildfire_device_interrupt (unsigned long vector) {int irq;
@@ -246,7 +246,7 @@ wildfire_device_interrupt(unsigned long* bits 5-0: irq in PCA */ -handle_irq (irq, regs); +handle_irq (irq,get_irq_regs ());return ; }
include/asm-alpha/machvec.h +1 -1
@@ -79,7 +79,7 @@ struct alpha_machine_vectorvoid (*update_irq_hw)(unsigned long ,unsigned long ,int );void (*ack_irq)(unsigned long ); -void (*device_interrupt)(unsigned long vector,struct pt_regs *regs); +void (*device_interrupt)(unsigned long vector);void (*machine_check)(u64 vector,u64 la,struct pt_regs *regs);void (*smp_callin)(void );
Signature · 1 line
1.4.2.GIT