aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/gus
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2006-10-05 09:55:46 -0400
committerDavid Howells <dhowells@warthog.cambridge.redhat.com>2006-10-05 10:10:12 -0400
commit7d12e780e003f93433d49ce78cfedf4b4c52adc5 (patch)
tree6748550400445c11a306b132009f3001e3525df8 /sound/isa/gus
parentda482792a6d1a3fbaaa25fae867b343fb4db3246 (diff)
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead of passing regs around manually through all ~1800 interrupt handlers in the Linux kernel. The regs pointer is used in few places, but it potentially costs both stack space and code to pass it around. On the FRV arch, removing the regs parameter from all the genirq function results in a 20% speed up of the IRQ exit path (ie: from leaving timer_interrupt() to leaving do_IRQ()). Where appropriate, an arch may override the generic storage facility and do something different with the variable. On FRV, for instance, the address is maintained in GR28 at all times inside the kernel as part of general exception handling. Having looked over the code, it appears that the parameter may be handed down through up to twenty or so layers of functions. Consider a USB character device attached to a USB hub, attached to a USB controller that posts its interrupts through a cascaded auxiliary interrupt controller. A character device driver may want to pass regs to the sysrq handler through the input layer which adds another few layers of parameter passing. I've build this code with allyesconfig for x86_64 and i386. I've runtested the main part of the code on FRV and i386, though I can't test most of the drivers. I've also done partial conversion for powerpc and MIPS - these at least compile with minimal configurations. This will affect all archs. Mostly the changes should be relatively easy. Take do_IRQ(), store the regs pointer at the beginning, saving the old one: struct pt_regs *old_regs = set_irq_regs(regs); And put the old one back at the end: set_irq_regs(old_regs); Don't pass regs through to generic_handle_irq() or __do_IRQ(). In timer_interrupt(), this sort of change will be necessary: - update_process_times(user_mode(regs)); - profile_tick(CPU_PROFILING, regs); + update_process_times(user_mode(get_irq_regs())); + profile_tick(CPU_PROFILING); I'd like to move update_process_times()'s use of get_irq_regs() into itself, except that i386, alone of the archs, uses something other than user_mode(). Some notes on the interrupt handling in the drivers: (*) input_dev() is now gone entirely. The regs pointer is no longer stored in the input_dev struct. (*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does something different depending on whether it's been supplied with a regs pointer or not. (*) Various IRQ handler function pointers have been moved to type irq_handler_t. Signed-Off-By: David Howells <dhowells@redhat.com> (cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
Diffstat (limited to 'sound/isa/gus')
-rw-r--r--sound/isa/gus/gus_irq.c2
-rw-r--r--sound/isa/gus/gusmax.c6
-rw-r--r--sound/isa/gus/interwave.c6
3 files changed, 7 insertions, 7 deletions
diff --git a/sound/isa/gus/gus_irq.c b/sound/isa/gus/gus_irq.c
index 42db37552efb..537d3cfe41f3 100644
--- a/sound/isa/gus/gus_irq.c
+++ b/sound/isa/gus/gus_irq.c
@@ -30,7 +30,7 @@
30#define STAT_ADD(x) while (0) { ; } 30#define STAT_ADD(x) while (0) { ; }
31#endif 31#endif
32 32
33irqreturn_t snd_gus_interrupt(int irq, void *dev_id, struct pt_regs *regs) 33irqreturn_t snd_gus_interrupt(int irq, void *dev_id)
34{ 34{
35 struct snd_gus_card * gus = dev_id; 35 struct snd_gus_card * gus = dev_id;
36 unsigned char status; 36 unsigned char status;
diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c
index ac11cae8589a..52498c9d411e 100644
--- a/sound/isa/gus/gusmax.c
+++ b/sound/isa/gus/gusmax.c
@@ -105,7 +105,7 @@ static int __init snd_gusmax_detect(struct snd_gus_card * gus)
105 return 0; 105 return 0;
106} 106}
107 107
108static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id, struct pt_regs *regs) 108static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id)
109{ 109{
110 struct snd_gusmax *maxcard = (struct snd_gusmax *) dev_id; 110 struct snd_gusmax *maxcard = (struct snd_gusmax *) dev_id;
111 int loop, max = 5; 111 int loop, max = 5;
@@ -115,12 +115,12 @@ static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id, struct pt_regs *r
115 loop = 0; 115 loop = 0;
116 if (inb(maxcard->gus_status_reg)) { 116 if (inb(maxcard->gus_status_reg)) {
117 handled = 1; 117 handled = 1;
118 snd_gus_interrupt(irq, maxcard->gus, regs); 118 snd_gus_interrupt(irq, maxcard->gus);
119 loop++; 119 loop++;
120 } 120 }
121 if (inb(maxcard->pcm_status_reg) & 0x01) { /* IRQ bit is set? */ 121 if (inb(maxcard->pcm_status_reg) & 0x01) { /* IRQ bit is set? */
122 handled = 1; 122 handled = 1;
123 snd_cs4231_interrupt(irq, maxcard->cs4231, regs); 123 snd_cs4231_interrupt(irq, maxcard->cs4231);
124 loop++; 124 loop++;
125 } 125 }
126 } while (loop && --max > 0); 126 } while (loop && --max > 0);
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c
index ea69f25506fb..5c474b831edc 100644
--- a/sound/isa/gus/interwave.c
+++ b/sound/isa/gus/interwave.c
@@ -299,7 +299,7 @@ static int __devinit snd_interwave_detect(struct snd_interwave *iwcard,
299 return -ENODEV; 299 return -ENODEV;
300} 300}
301 301
302static irqreturn_t snd_interwave_interrupt(int irq, void *dev_id, struct pt_regs *regs) 302static irqreturn_t snd_interwave_interrupt(int irq, void *dev_id)
303{ 303{
304 struct snd_interwave *iwcard = (struct snd_interwave *) dev_id; 304 struct snd_interwave *iwcard = (struct snd_interwave *) dev_id;
305 int loop, max = 5; 305 int loop, max = 5;
@@ -309,12 +309,12 @@ static irqreturn_t snd_interwave_interrupt(int irq, void *dev_id, struct pt_regs
309 loop = 0; 309 loop = 0;
310 if (inb(iwcard->gus_status_reg)) { 310 if (inb(iwcard->gus_status_reg)) {
311 handled = 1; 311 handled = 1;
312 snd_gus_interrupt(irq, iwcard->gus, regs); 312 snd_gus_interrupt(irq, iwcard->gus);
313 loop++; 313 loop++;
314 } 314 }
315 if (inb(iwcard->pcm_status_reg) & 0x01) { /* IRQ bit is set? */ 315 if (inb(iwcard->pcm_status_reg) & 0x01) { /* IRQ bit is set? */
316 handled = 1; 316 handled = 1;
317 snd_cs4231_interrupt(irq, iwcard->cs4231, regs); 317 snd_cs4231_interrupt(irq, iwcard->cs4231);
318 loop++; 318 loop++;
319 } 319 }
320 } while (loop && --max > 0); 320 } while (loop && --max > 0);