aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/i82365.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/pcmcia/i82365.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/pcmcia/i82365.c')
-rw-r--r--drivers/pcmcia/i82365.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c
index 1cc2682394b1..ea74f98a7350 100644
--- a/drivers/pcmcia/i82365.c
+++ b/drivers/pcmcia/i82365.c
@@ -80,7 +80,7 @@ module_param(pc_debug, int, 0644);
80#define debug(lvl, fmt, arg...) do { } while (0) 80#define debug(lvl, fmt, arg...) do { } while (0)
81#endif 81#endif
82 82
83static irqreturn_t i365_count_irq(int, void *, struct pt_regs *); 83static irqreturn_t i365_count_irq(int, void *);
84static inline int _check_irq(int irq, int flags) 84static inline int _check_irq(int irq, int flags)
85{ 85{
86 if (request_irq(irq, i365_count_irq, flags, "x", i365_count_irq) != 0) 86 if (request_irq(irq, i365_count_irq, flags, "x", i365_count_irq) != 0)
@@ -498,7 +498,7 @@ static u_int __init set_bridge_opts(u_short s, u_short ns)
498static volatile u_int irq_hits; 498static volatile u_int irq_hits;
499static u_short irq_sock; 499static u_short irq_sock;
500 500
501static irqreturn_t i365_count_irq(int irq, void *dev, struct pt_regs *regs) 501static irqreturn_t i365_count_irq(int irq, void *dev)
502{ 502{
503 i365_get(irq_sock, I365_CSC); 503 i365_get(irq_sock, I365_CSC);
504 irq_hits++; 504 irq_hits++;
@@ -848,8 +848,7 @@ static void __init isa_probe(void)
848 848
849/*====================================================================*/ 849/*====================================================================*/
850 850
851static irqreturn_t pcic_interrupt(int irq, void *dev, 851static irqreturn_t pcic_interrupt(int irq, void *dev)
852 struct pt_regs *regs)
853{ 852{
854 int i, j, csc; 853 int i, j, csc;
855 u_int events, active; 854 u_int events, active;
@@ -898,7 +897,7 @@ static irqreturn_t pcic_interrupt(int irq, void *dev,
898 897
899static void pcic_interrupt_wrapper(u_long data) 898static void pcic_interrupt_wrapper(u_long data)
900{ 899{
901 pcic_interrupt(0, NULL, NULL); 900 pcic_interrupt(0, NULL);
902 poll_timer.expires = jiffies + poll_interval; 901 poll_timer.expires = jiffies + poll_interval;
903 add_timer(&poll_timer); 902 add_timer(&poll_timer);
904} 903}