aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/ioc3_serial.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/ioc3_serial.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/ioc3_serial.c')
-rw-r--r--drivers/serial/ioc3_serial.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/serial/ioc3_serial.c b/drivers/serial/ioc3_serial.c
index 8097cd91f16b..2308d26c8629 100644
--- a/drivers/serial/ioc3_serial.c
+++ b/drivers/serial/ioc3_serial.c
@@ -1428,13 +1428,12 @@ static int receive_chars(struct uart_port *the_port)
1428 * @is : submodule 1428 * @is : submodule
1429 * @idd: driver data 1429 * @idd: driver data
1430 * @pending: interrupts to handle 1430 * @pending: interrupts to handle
1431 * @regs: pt_regs
1432 */ 1431 */
1433 1432
1434static int inline 1433static int inline
1435ioc3uart_intr_one(struct ioc3_submodule *is, 1434ioc3uart_intr_one(struct ioc3_submodule *is,
1436 struct ioc3_driver_data *idd, 1435 struct ioc3_driver_data *idd,
1437 unsigned int pending, struct pt_regs *regs) 1436 unsigned int pending)
1438{ 1437{
1439 int port_num = GET_PORT_FROM_SIO_IR(pending); 1438 int port_num = GET_PORT_FROM_SIO_IR(pending);
1440 struct port_hooks *hooks; 1439 struct port_hooks *hooks;
@@ -1628,13 +1627,12 @@ ioc3uart_intr_one(struct ioc3_submodule *is,
1628 * @is : submodule 1627 * @is : submodule
1629 * @idd: driver data 1628 * @idd: driver data
1630 * @pending: interrupts to handle 1629 * @pending: interrupts to handle
1631 * @regs: pt_regs
1632 * 1630 *
1633 */ 1631 */
1634 1632
1635static int ioc3uart_intr(struct ioc3_submodule *is, 1633static int ioc3uart_intr(struct ioc3_submodule *is,
1636 struct ioc3_driver_data *idd, 1634 struct ioc3_driver_data *idd,
1637 unsigned int pending, struct pt_regs *regs) 1635 unsigned int pending)
1638{ 1636{
1639 int ret = 0; 1637 int ret = 0;
1640 1638
@@ -1644,9 +1642,9 @@ static int ioc3uart_intr(struct ioc3_submodule *is,
1644 */ 1642 */
1645 1643
1646 if (pending & SIO_IR_SA) 1644 if (pending & SIO_IR_SA)
1647 ret |= ioc3uart_intr_one(is, idd, pending & SIO_IR_SA, regs); 1645 ret |= ioc3uart_intr_one(is, idd, pending & SIO_IR_SA);
1648 if (pending & SIO_IR_SB) 1646 if (pending & SIO_IR_SB)
1649 ret |= ioc3uart_intr_one(is, idd, pending & SIO_IR_SB, regs); 1647 ret |= ioc3uart_intr_one(is, idd, pending & SIO_IR_SB);
1650 1648
1651 return ret; 1649 return ret;
1652} 1650}