aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/joystick/iforce
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/input/joystick/iforce
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/input/joystick/iforce')
-rw-r--r--drivers/input/joystick/iforce/iforce-packets.c6
-rw-r--r--drivers/input/joystick/iforce/iforce-serio.c4
-rw-r--r--drivers/input/joystick/iforce/iforce-usb.c8
-rw-r--r--drivers/input/joystick/iforce/iforce.h2
4 files changed, 8 insertions, 12 deletions
diff --git a/drivers/input/joystick/iforce/iforce-packets.c b/drivers/input/joystick/iforce/iforce-packets.c
index 8632d47a7fbe..808f05932a6f 100644
--- a/drivers/input/joystick/iforce/iforce-packets.c
+++ b/drivers/input/joystick/iforce/iforce-packets.c
@@ -155,7 +155,7 @@ static int mark_core_as_ready(struct iforce *iforce, unsigned short addr)
155 return -1; 155 return -1;
156} 156}
157 157
158void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data, struct pt_regs *regs) 158void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data)
159{ 159{
160 struct input_dev *dev = iforce->dev; 160 struct input_dev *dev = iforce->dev;
161 int i; 161 int i;
@@ -183,9 +183,6 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data,
183 183
184 case 0x01: /* joystick position data */ 184 case 0x01: /* joystick position data */
185 case 0x03: /* wheel position data */ 185 case 0x03: /* wheel position data */
186
187 input_regs(dev, regs);
188
189 if (HI(cmd) == 1) { 186 if (HI(cmd) == 1) {
190 input_report_abs(dev, ABS_X, (__s16) (((__s16)data[1] << 8) | data[0])); 187 input_report_abs(dev, ABS_X, (__s16) (((__s16)data[1] << 8) | data[0]));
191 input_report_abs(dev, ABS_Y, (__s16) (((__s16)data[3] << 8) | data[2])); 188 input_report_abs(dev, ABS_Y, (__s16) (((__s16)data[3] << 8) | data[2]));
@@ -224,7 +221,6 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data,
224 break; 221 break;
225 222
226 case 0x02: /* status report */ 223 case 0x02: /* status report */
227 input_regs(dev, regs);
228 input_report_key(dev, BTN_DEAD, data[0] & 0x02); 224 input_report_key(dev, BTN_DEAD, data[0] & 0x02);
229 input_sync(dev); 225 input_sync(dev);
230 226
diff --git a/drivers/input/joystick/iforce/iforce-serio.c b/drivers/input/joystick/iforce/iforce-serio.c
index 64a78c515484..ca08f45c2040 100644
--- a/drivers/input/joystick/iforce/iforce-serio.c
+++ b/drivers/input/joystick/iforce/iforce-serio.c
@@ -81,7 +81,7 @@ static void iforce_serio_write_wakeup(struct serio *serio)
81} 81}
82 82
83static irqreturn_t iforce_serio_irq(struct serio *serio, 83static irqreturn_t iforce_serio_irq(struct serio *serio,
84 unsigned char data, unsigned int flags, struct pt_regs *regs) 84 unsigned char data, unsigned int flags)
85{ 85{
86 struct iforce *iforce = serio_get_drvdata(serio); 86 struct iforce *iforce = serio_get_drvdata(serio);
87 87
@@ -115,7 +115,7 @@ static irqreturn_t iforce_serio_irq(struct serio *serio,
115 } 115 }
116 116
117 if (iforce->idx == iforce->len) { 117 if (iforce->idx == iforce->len) {
118 iforce_process_packet(iforce, (iforce->id << 8) | iforce->idx, iforce->data, regs); 118 iforce_process_packet(iforce, (iforce->id << 8) | iforce->idx, iforce->data);
119 iforce->pkt = 0; 119 iforce->pkt = 0;
120 iforce->id = 0; 120 iforce->id = 0;
121 iforce->len = 0; 121 iforce->len = 0;
diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c
index fe79d158456d..105112fb7b57 100644
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
@@ -74,7 +74,7 @@ void iforce_usb_xmit(struct iforce *iforce)
74 spin_unlock_irqrestore(&iforce->xmit_lock, flags); 74 spin_unlock_irqrestore(&iforce->xmit_lock, flags);
75} 75}
76 76
77static void iforce_usb_irq(struct urb *urb, struct pt_regs *regs) 77static void iforce_usb_irq(struct urb *urb)
78{ 78{
79 struct iforce *iforce = urb->context; 79 struct iforce *iforce = urb->context;
80 int status; 80 int status;
@@ -96,7 +96,7 @@ static void iforce_usb_irq(struct urb *urb, struct pt_regs *regs)
96 } 96 }
97 97
98 iforce_process_packet(iforce, 98 iforce_process_packet(iforce,
99 (iforce->data[0] << 8) | (urb->actual_length - 1), iforce->data + 1, regs); 99 (iforce->data[0] << 8) | (urb->actual_length - 1), iforce->data + 1);
100 100
101exit: 101exit:
102 status = usb_submit_urb (urb, GFP_ATOMIC); 102 status = usb_submit_urb (urb, GFP_ATOMIC);
@@ -105,7 +105,7 @@ exit:
105 __FUNCTION__, status); 105 __FUNCTION__, status);
106} 106}
107 107
108static void iforce_usb_out(struct urb *urb, struct pt_regs *regs) 108static void iforce_usb_out(struct urb *urb)
109{ 109{
110 struct iforce *iforce = urb->context; 110 struct iforce *iforce = urb->context;
111 111
@@ -119,7 +119,7 @@ static void iforce_usb_out(struct urb *urb, struct pt_regs *regs)
119 wake_up(&iforce->wait); 119 wake_up(&iforce->wait);
120} 120}
121 121
122static void iforce_usb_ctrl(struct urb *urb, struct pt_regs *regs) 122static void iforce_usb_ctrl(struct urb *urb)
123{ 123{
124 struct iforce *iforce = urb->context; 124 struct iforce *iforce = urb->context;
125 if (urb->status) return; 125 if (urb->status) return;
diff --git a/drivers/input/joystick/iforce/iforce.h b/drivers/input/joystick/iforce/iforce.h
index 947df2739843..ffaeaefa1a42 100644
--- a/drivers/input/joystick/iforce/iforce.h
+++ b/drivers/input/joystick/iforce/iforce.h
@@ -160,7 +160,7 @@ void iforce_delete_device(struct iforce *iforce);
160 160
161/* iforce-packets.c */ 161/* iforce-packets.c */
162int iforce_control_playback(struct iforce*, u16 id, unsigned int); 162int iforce_control_playback(struct iforce*, u16 id, unsigned int);
163void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data, struct pt_regs *regs); 163void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data);
164int iforce_send_packet(struct iforce *iforce, u16 cmd, unsigned char* data); 164int iforce_send_packet(struct iforce *iforce, u16 cmd, unsigned char* data);
165void iforce_dump_packet(char *msg, u16 cmd, unsigned char *data) ; 165void iforce_dump_packet(char *msg, u16 cmd, unsigned char *data) ;
166int iforce_get_id_packet(struct iforce *iforce, char *packet); 166int iforce_get_id_packet(struct iforce *iforce, char *packet);