aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/cpm_uart
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/cpm_uart
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/cpm_uart')
-rw-r--r--drivers/serial/cpm_uart/cpm_uart_core.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c
index a0d6136deb9b..0abb544ae63d 100644
--- a/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -248,7 +248,7 @@ static void cpm_uart_break_ctl(struct uart_port *port, int break_state)
248/* 248/*
249 * Transmit characters, refill buffer descriptor, if possible 249 * Transmit characters, refill buffer descriptor, if possible
250 */ 250 */
251static void cpm_uart_int_tx(struct uart_port *port, struct pt_regs *regs) 251static void cpm_uart_int_tx(struct uart_port *port)
252{ 252{
253 pr_debug("CPM uart[%d]:TX INT\n", port->line); 253 pr_debug("CPM uart[%d]:TX INT\n", port->line);
254 254
@@ -258,7 +258,7 @@ static void cpm_uart_int_tx(struct uart_port *port, struct pt_regs *regs)
258/* 258/*
259 * Receive characters 259 * Receive characters
260 */ 260 */
261static void cpm_uart_int_rx(struct uart_port *port, struct pt_regs *regs) 261static void cpm_uart_int_rx(struct uart_port *port)
262{ 262{
263 int i; 263 int i;
264 unsigned char ch, *cp; 264 unsigned char ch, *cp;
@@ -304,7 +304,7 @@ static void cpm_uart_int_rx(struct uart_port *port, struct pt_regs *regs)
304 if (status & 304 if (status &
305 (BD_SC_BR | BD_SC_FR | BD_SC_PR | BD_SC_OV)) 305 (BD_SC_BR | BD_SC_FR | BD_SC_PR | BD_SC_OV))
306 goto handle_error; 306 goto handle_error;
307 if (uart_handle_sysrq_char(port, ch, regs)) 307 if (uart_handle_sysrq_char(port, ch))
308 continue; 308 continue;
309 309
310 error_return: 310 error_return:
@@ -373,7 +373,7 @@ static void cpm_uart_int_rx(struct uart_port *port, struct pt_regs *regs)
373/* 373/*
374 * Asynchron mode interrupt handler 374 * Asynchron mode interrupt handler
375 */ 375 */
376static irqreturn_t cpm_uart_int(int irq, void *data, struct pt_regs *regs) 376static irqreturn_t cpm_uart_int(int irq, void *data)
377{ 377{
378 u8 events; 378 u8 events;
379 struct uart_port *port = (struct uart_port *)data; 379 struct uart_port *port = (struct uart_port *)data;
@@ -389,18 +389,18 @@ static irqreturn_t cpm_uart_int(int irq, void *data, struct pt_regs *regs)
389 if (events & SMCM_BRKE) 389 if (events & SMCM_BRKE)
390 uart_handle_break(port); 390 uart_handle_break(port);
391 if (events & SMCM_RX) 391 if (events & SMCM_RX)
392 cpm_uart_int_rx(port, regs); 392 cpm_uart_int_rx(port);
393 if (events & SMCM_TX) 393 if (events & SMCM_TX)
394 cpm_uart_int_tx(port, regs); 394 cpm_uart_int_tx(port);
395 } else { 395 } else {
396 events = sccp->scc_scce; 396 events = sccp->scc_scce;
397 sccp->scc_scce = events; 397 sccp->scc_scce = events;
398 if (events & UART_SCCM_BRKE) 398 if (events & UART_SCCM_BRKE)
399 uart_handle_break(port); 399 uart_handle_break(port);
400 if (events & UART_SCCM_RX) 400 if (events & UART_SCCM_RX)
401 cpm_uart_int_rx(port, regs); 401 cpm_uart_int_rx(port);
402 if (events & UART_SCCM_TX) 402 if (events & UART_SCCM_TX)
403 cpm_uart_int_tx(port, regs); 403 cpm_uart_int_tx(port);
404 } 404 }
405 return (events) ? IRQ_HANDLED : IRQ_NONE; 405 return (events) ? IRQ_HANDLED : IRQ_NONE;
406} 406}