aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/m32r_sio.c
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 /drivers/serial/m32r_sio.c
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 'drivers/serial/m32r_sio.c')
-rw-r--r--drivers/serial/m32r_sio.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c
index 28c9ce6f0bdc..c85ac1a77608 100644
--- a/drivers/serial/m32r_sio.c
+++ b/drivers/serial/m32r_sio.c
@@ -323,8 +323,7 @@ static void m32r_sio_enable_ms(struct uart_port *port)
323 serial_out(up, UART_IER, up->ier); 323 serial_out(up, UART_IER, up->ier);
324} 324}
325 325
326static void receive_chars(struct uart_sio_port *up, int *status, 326static void receive_chars(struct uart_sio_port *up, int *status)
327 struct pt_regs *regs)
328{ 327{
329 struct tty_struct *tty = up->port.info->tty; 328 struct tty_struct *tty = up->port.info->tty;
330 unsigned char ch; 329 unsigned char ch;
@@ -378,7 +377,7 @@ static void receive_chars(struct uart_sio_port *up, int *status,
378 else if (*status & UART_LSR_FE) 377 else if (*status & UART_LSR_FE)
379 flag = TTY_FRAME; 378 flag = TTY_FRAME;
380 } 379 }
381 if (uart_handle_sysrq_char(&up->port, ch, regs)) 380 if (uart_handle_sysrq_char(&up->port, ch))
382 goto ignore_char; 381 goto ignore_char;
383 if ((*status & up->port.ignore_status_mask) == 0) 382 if ((*status & up->port.ignore_status_mask) == 0)
384 tty_insert_flip_char(tty, ch, flag); 383 tty_insert_flip_char(tty, ch, flag);
@@ -439,12 +438,12 @@ static void transmit_chars(struct uart_sio_port *up)
439 * This handles the interrupt from one port. 438 * This handles the interrupt from one port.
440 */ 439 */
441static inline void m32r_sio_handle_port(struct uart_sio_port *up, 440static inline void m32r_sio_handle_port(struct uart_sio_port *up,
442 unsigned int status, struct pt_regs *regs) 441 unsigned int status)
443{ 442{
444 DEBUG_INTR("status = %x...", status); 443 DEBUG_INTR("status = %x...", status);
445 444
446 if (status & 0x04) 445 if (status & 0x04)
447 receive_chars(up, &status, regs); 446 receive_chars(up, &status);
448 if (status & 0x01) 447 if (status & 0x01)
449 transmit_chars(up); 448 transmit_chars(up);
450} 449}
@@ -463,8 +462,7 @@ static inline void m32r_sio_handle_port(struct uart_sio_port *up,
463 * This means we need to loop through all ports. checking that they 462 * This means we need to loop through all ports. checking that they
464 * don't have an interrupt pending. 463 * don't have an interrupt pending.
465 */ 464 */
466static irqreturn_t m32r_sio_interrupt(int irq, void *dev_id, 465static irqreturn_t m32r_sio_interrupt(int irq, void *dev_id)
467 struct pt_regs *regs)
468{ 466{
469 struct irq_info *i = dev_id; 467 struct irq_info *i = dev_id;
470 struct list_head *l, *end = NULL; 468 struct list_head *l, *end = NULL;
@@ -492,7 +490,7 @@ static irqreturn_t m32r_sio_interrupt(int irq, void *dev_id,
492 sts = sio_in(up, SIOSTS); 490 sts = sio_in(up, SIOSTS);
493 if (sts & 0x5) { 491 if (sts & 0x5) {
494 spin_lock(&up->port.lock); 492 spin_lock(&up->port.lock);
495 m32r_sio_handle_port(up, sts, regs); 493 m32r_sio_handle_port(up, sts);
496 spin_unlock(&up->port.lock); 494 spin_unlock(&up->port.lock);
497 495
498 end = NULL; 496 end = NULL;