aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa
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
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')
-rw-r--r--sound/isa/ad1816a/ad1816a_lib.c2
-rw-r--r--sound/isa/ad1848/ad1848_lib.c2
-rw-r--r--sound/isa/cs423x/cs4231_lib.c2
-rw-r--r--sound/isa/es1688/es1688_lib.c2
-rw-r--r--sound/isa/es18xx.c4
-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
-rw-r--r--sound/isa/opl3sa2.c6
-rw-r--r--sound/isa/opti9xx/opti92x-ad1848.c2
-rw-r--r--sound/isa/sb/es968.c3
-rw-r--r--sound/isa/sb/sb16_main.c4
-rw-r--r--sound/isa/sb/sb8.c2
-rw-r--r--sound/isa/sb/sb_common.c2
-rw-r--r--sound/isa/sgalaxy.c2
-rw-r--r--sound/isa/wavefront/wavefront.c4
16 files changed, 24 insertions, 27 deletions
diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c
index fd9b61eda0f3..b524e0d9ee44 100644
--- a/sound/isa/ad1816a/ad1816a_lib.c
+++ b/sound/isa/ad1816a/ad1816a_lib.c
@@ -315,7 +315,7 @@ static snd_pcm_uframes_t snd_ad1816a_capture_pointer(struct snd_pcm_substream *s
315} 315}
316 316
317 317
318static irqreturn_t snd_ad1816a_interrupt(int irq, void *dev_id, struct pt_regs *regs) 318static irqreturn_t snd_ad1816a_interrupt(int irq, void *dev_id)
319{ 319{
320 struct snd_ad1816a *chip = dev_id; 320 struct snd_ad1816a *chip = dev_id;
321 unsigned char status; 321 unsigned char status;
diff --git a/sound/isa/ad1848/ad1848_lib.c b/sound/isa/ad1848/ad1848_lib.c
index a6fbd5d1d62f..666b3bcc19f0 100644
--- a/sound/isa/ad1848/ad1848_lib.c
+++ b/sound/isa/ad1848/ad1848_lib.c
@@ -583,7 +583,7 @@ static int snd_ad1848_capture_prepare(struct snd_pcm_substream *substream)
583 return 0; 583 return 0;
584} 584}
585 585
586static irqreturn_t snd_ad1848_interrupt(int irq, void *dev_id, struct pt_regs *regs) 586static irqreturn_t snd_ad1848_interrupt(int irq, void *dev_id)
587{ 587{
588 struct snd_ad1848 *chip = dev_id; 588 struct snd_ad1848 *chip = dev_id;
589 589
diff --git a/sound/isa/cs423x/cs4231_lib.c b/sound/isa/cs423x/cs4231_lib.c
index fbb20176cca4..75c7c5f01989 100644
--- a/sound/isa/cs423x/cs4231_lib.c
+++ b/sound/isa/cs423x/cs4231_lib.c
@@ -920,7 +920,7 @@ static void snd_cs4231_overrange(struct snd_cs4231 *chip)
920 chip->capture_substream->runtime->overrange++; 920 chip->capture_substream->runtime->overrange++;
921} 921}
922 922
923irqreturn_t snd_cs4231_interrupt(int irq, void *dev_id, struct pt_regs *regs) 923irqreturn_t snd_cs4231_interrupt(int irq, void *dev_id)
924{ 924{
925 struct snd_cs4231 *chip = dev_id; 925 struct snd_cs4231 *chip = dev_id;
926 unsigned char status; 926 unsigned char status;
diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c
index 7e985d3bc510..a2ab99f2ac35 100644
--- a/sound/isa/es1688/es1688_lib.c
+++ b/sound/isa/es1688/es1688_lib.c
@@ -479,7 +479,7 @@ static int snd_es1688_capture_trigger(struct snd_pcm_substream *substream,
479 return snd_es1688_trigger(chip, cmd, 0x0f); 479 return snd_es1688_trigger(chip, cmd, 0x0f);
480} 480}
481 481
482static irqreturn_t snd_es1688_interrupt(int irq, void *dev_id, struct pt_regs *regs) 482static irqreturn_t snd_es1688_interrupt(int irq, void *dev_id)
483{ 483{
484 struct snd_es1688 *chip = dev_id; 484 struct snd_es1688 *chip = dev_id;
485 485
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index 85818200333f..2398d2c55feb 100644
--- a/sound/isa/es18xx.c
+++ b/sound/isa/es18xx.c
@@ -754,7 +754,7 @@ static int snd_es18xx_playback_trigger(struct snd_pcm_substream *substream,
754 return snd_es18xx_playback2_trigger(chip, substream, cmd); 754 return snd_es18xx_playback2_trigger(chip, substream, cmd);
755} 755}
756 756
757static irqreturn_t snd_es18xx_interrupt(int irq, void *dev_id, struct pt_regs *regs) 757static irqreturn_t snd_es18xx_interrupt(int irq, void *dev_id)
758{ 758{
759 struct snd_es18xx *chip = dev_id; 759 struct snd_es18xx *chip = dev_id;
760 unsigned char status; 760 unsigned char status;
@@ -799,7 +799,7 @@ static irqreturn_t snd_es18xx_interrupt(int irq, void *dev_id, struct pt_regs *r
799 799
800 /* MPU */ 800 /* MPU */
801 if ((status & MPU_IRQ) && chip->rmidi) 801 if ((status & MPU_IRQ) && chip->rmidi)
802 snd_mpu401_uart_interrupt(irq, chip->rmidi->private_data, regs); 802 snd_mpu401_uart_interrupt(irq, chip->rmidi->private_data);
803 803
804 /* Hardware volume */ 804 /* Hardware volume */
805 if (status & HWV_IRQ) { 805 if (status & HWV_IRQ) {
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);
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index da92bf6c392b..419b4ebbf00e 100644
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@ -294,7 +294,7 @@ static int __devinit snd_opl3sa2_detect(struct snd_opl3sa2 *chip)
294 return 0; 294 return 0;
295} 295}
296 296
297static irqreturn_t snd_opl3sa2_interrupt(int irq, void *dev_id, struct pt_regs *regs) 297static irqreturn_t snd_opl3sa2_interrupt(int irq, void *dev_id)
298{ 298{
299 unsigned short status; 299 unsigned short status;
300 struct snd_opl3sa2 *chip = dev_id; 300 struct snd_opl3sa2 *chip = dev_id;
@@ -312,12 +312,12 @@ static irqreturn_t snd_opl3sa2_interrupt(int irq, void *dev_id, struct pt_regs *
312 312
313 if ((status & 0x10) && chip->rmidi != NULL) { 313 if ((status & 0x10) && chip->rmidi != NULL) {
314 handled = 1; 314 handled = 1;
315 snd_mpu401_uart_interrupt(irq, chip->rmidi->private_data, regs); 315 snd_mpu401_uart_interrupt(irq, chip->rmidi->private_data);
316 } 316 }
317 317
318 if (status & 0x07) { /* TI,CI,PI */ 318 if (status & 0x07) { /* TI,CI,PI */
319 handled = 1; 319 handled = 1;
320 snd_cs4231_interrupt(irq, chip->cs4231, regs); 320 snd_cs4231_interrupt(irq, chip->cs4231);
321 } 321 }
322 322
323 if (status & 0x40) { /* hardware volume change */ 323 if (status & 0x40) { /* hardware volume change */
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index 9d528ae00bff..a1ad39a8cdce 100644
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -1090,7 +1090,7 @@ static void snd_opti93x_overrange(struct snd_opti93x *chip)
1090 spin_unlock_irqrestore(&chip->lock, flags); 1090 spin_unlock_irqrestore(&chip->lock, flags);
1091} 1091}
1092 1092
1093static irqreturn_t snd_opti93x_interrupt(int irq, void *dev_id, struct pt_regs *regs) 1093static irqreturn_t snd_opti93x_interrupt(int irq, void *dev_id)
1094{ 1094{
1095 struct snd_opti93x *codec = dev_id; 1095 struct snd_opti93x *codec = dev_id;
1096 unsigned char status; 1096 unsigned char status;
diff --git a/sound/isa/sb/es968.c b/sound/isa/sb/es968.c
index d4d65b84265a..d4b218726ce7 100644
--- a/sound/isa/sb/es968.c
+++ b/sound/isa/sb/es968.c
@@ -70,8 +70,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_es968_pnpids);
70 70
71#define DRIVER_NAME "snd-card-es968" 71#define DRIVER_NAME "snd-card-es968"
72 72
73static irqreturn_t snd_card_es968_interrupt(int irq, void *dev_id, 73static irqreturn_t snd_card_es968_interrupt(int irq, void *dev_id)
74 struct pt_regs *regs)
75{ 74{
76 struct snd_sb *chip = dev_id; 75 struct snd_sb *chip = dev_id;
77 76
diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c
index f183f1845a36..383911b9e74d 100644
--- a/sound/isa/sb/sb16_main.c
+++ b/sound/isa/sb/sb16_main.c
@@ -395,7 +395,7 @@ static int snd_sb16_capture_trigger(struct snd_pcm_substream *substream,
395 return result; 395 return result;
396} 396}
397 397
398irqreturn_t snd_sb16dsp_interrupt(int irq, void *dev_id, struct pt_regs *regs) 398irqreturn_t snd_sb16dsp_interrupt(int irq, void *dev_id)
399{ 399{
400 struct snd_sb *chip = dev_id; 400 struct snd_sb *chip = dev_id;
401 unsigned char status; 401 unsigned char status;
@@ -405,7 +405,7 @@ irqreturn_t snd_sb16dsp_interrupt(int irq, void *dev_id, struct pt_regs *regs)
405 status = snd_sbmixer_read(chip, SB_DSP4_IRQSTATUS); 405 status = snd_sbmixer_read(chip, SB_DSP4_IRQSTATUS);
406 spin_unlock(&chip->mixer_lock); 406 spin_unlock(&chip->mixer_lock);
407 if ((status & SB_IRQTYPE_MPUIN) && chip->rmidi_callback) 407 if ((status & SB_IRQTYPE_MPUIN) && chip->rmidi_callback)
408 chip->rmidi_callback(irq, chip->rmidi->private_data, regs); 408 chip->rmidi_callback(irq, chip->rmidi->private_data);
409 if (status & SB_IRQTYPE_8BIT) { 409 if (status & SB_IRQTYPE_8BIT) {
410 ok = 0; 410 ok = 0;
411 if (chip->mode & SB_MODE_PLAYBACK_8) { 411 if (chip->mode & SB_MODE_PLAYBACK_8) {
diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c
index 141400c01426..268ebd34703e 100644
--- a/sound/isa/sb/sb8.c
+++ b/sound/isa/sb/sb8.c
@@ -63,7 +63,7 @@ struct snd_sb8 {
63 struct snd_sb *chip; 63 struct snd_sb *chip;
64}; 64};
65 65
66static irqreturn_t snd_sb8_interrupt(int irq, void *dev_id, struct pt_regs *regs) 66static irqreturn_t snd_sb8_interrupt(int irq, void *dev_id)
67{ 67{
68 struct snd_sb *chip = dev_id; 68 struct snd_sb *chip = dev_id;
69 69
diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c
index f17de2bdd9e0..c62a9e3d2ae4 100644
--- a/sound/isa/sb/sb_common.c
+++ b/sound/isa/sb/sb_common.c
@@ -205,7 +205,7 @@ static int snd_sbdsp_dev_free(struct snd_device *device)
205int snd_sbdsp_create(struct snd_card *card, 205int snd_sbdsp_create(struct snd_card *card,
206 unsigned long port, 206 unsigned long port,
207 int irq, 207 int irq,
208 irqreturn_t (*irq_handler)(int, void *, struct pt_regs *), 208 irq_handler_t irq_handler,
209 int dma8, 209 int dma8,
210 int dma16, 210 int dma16,
211 unsigned short hardware, 211 unsigned short hardware,
diff --git a/sound/isa/sgalaxy.c b/sound/isa/sgalaxy.c
index 8742fa517491..4fcd0f4e868c 100644
--- a/sound/isa/sgalaxy.c
+++ b/sound/isa/sgalaxy.c
@@ -109,7 +109,7 @@ static int __init snd_sgalaxy_sbdsp_command(unsigned long port, unsigned char va
109 return 0; 109 return 0;
110} 110}
111 111
112static irqreturn_t snd_sgalaxy_dummy_interrupt(int irq, void *dev_id, struct pt_regs *regs) 112static irqreturn_t snd_sgalaxy_dummy_interrupt(int irq, void *dev_id)
113{ 113{
114 return IRQ_NONE; 114 return IRQ_NONE;
115} 115}
diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c
index a8f8d2fa9d76..85db535aea9b 100644
--- a/sound/isa/wavefront/wavefront.c
+++ b/sound/isa/wavefront/wavefront.c
@@ -263,9 +263,7 @@ snd_wavefront_pnp (int dev, snd_wavefront_card_t *acard, struct pnp_card_link *c
263 263
264#endif /* CONFIG_PNP */ 264#endif /* CONFIG_PNP */
265 265
266static irqreturn_t snd_wavefront_ics2115_interrupt(int irq, 266static irqreturn_t snd_wavefront_ics2115_interrupt(int irq, void *dev_id)
267 void *dev_id,
268 struct pt_regs *regs)
269{ 267{
270 snd_wavefront_card_t *acard; 268 snd_wavefront_card_t *acard;
271 269