aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/sunhv.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/sunhv.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/sunhv.c')
-rw-r--r--drivers/serial/sunhv.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c
index f851f0f44f9b..03941d27d15d 100644
--- a/drivers/serial/sunhv.c
+++ b/drivers/serial/sunhv.c
@@ -73,7 +73,7 @@ static inline long hypervisor_con_putchar(long ch)
73 73
74static int hung_up = 0; 74static int hung_up = 0;
75 75
76static struct tty_struct *receive_chars(struct uart_port *port, struct pt_regs *regs) 76static struct tty_struct *receive_chars(struct uart_port *port)
77{ 77{
78 struct tty_struct *tty = NULL; 78 struct tty_struct *tty = NULL;
79 int saw_console_brk = 0; 79 int saw_console_brk = 0;
@@ -106,7 +106,7 @@ static struct tty_struct *receive_chars(struct uart_port *port, struct pt_regs *
106 } 106 }
107 107
108 if (tty == NULL) { 108 if (tty == NULL) {
109 uart_handle_sysrq_char(port, c, regs); 109 uart_handle_sysrq_char(port, c);
110 continue; 110 continue;
111 } 111 }
112 112
@@ -119,7 +119,7 @@ static struct tty_struct *receive_chars(struct uart_port *port, struct pt_regs *
119 flag = TTY_BREAK; 119 flag = TTY_BREAK;
120 } 120 }
121 121
122 if (uart_handle_sysrq_char(port, c, regs)) 122 if (uart_handle_sysrq_char(port, c))
123 continue; 123 continue;
124 124
125 if ((port->ignore_status_mask & IGNORE_ALL) || 125 if ((port->ignore_status_mask & IGNORE_ALL) ||
@@ -161,14 +161,14 @@ static void transmit_chars(struct uart_port *port)
161 uart_write_wakeup(port); 161 uart_write_wakeup(port);
162} 162}
163 163
164static irqreturn_t sunhv_interrupt(int irq, void *dev_id, struct pt_regs *regs) 164static irqreturn_t sunhv_interrupt(int irq, void *dev_id)
165{ 165{
166 struct uart_port *port = dev_id; 166 struct uart_port *port = dev_id;
167 struct tty_struct *tty; 167 struct tty_struct *tty;
168 unsigned long flags; 168 unsigned long flags;
169 169
170 spin_lock_irqsave(&port->lock, flags); 170 spin_lock_irqsave(&port->lock, flags);
171 tty = receive_chars(port, regs); 171 tty = receive_chars(port);
172 transmit_chars(port); 172 transmit_chars(port);
173 spin_unlock_irqrestore(&port->lock, flags); 173 spin_unlock_irqrestore(&port->lock, flags);
174 174