aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
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/bluetooth
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/bluetooth')
-rw-r--r--drivers/bluetooth/bcm203x.c2
-rw-r--r--drivers/bluetooth/bfusb.c8
-rw-r--r--drivers/bluetooth/bluecard_cs.c2
-rw-r--r--drivers/bluetooth/bpa10x.c2
-rw-r--r--drivers/bluetooth/bt3c_cs.c2
-rw-r--r--drivers/bluetooth/btuart_cs.c2
-rw-r--r--drivers/bluetooth/dtl1_cs.c2
-rw-r--r--drivers/bluetooth/hci_usb.c8
8 files changed, 14 insertions, 14 deletions
diff --git a/drivers/bluetooth/bcm203x.c b/drivers/bluetooth/bcm203x.c
index 13ba729cdd57..67cdda43f229 100644
--- a/drivers/bluetooth/bcm203x.c
+++ b/drivers/bluetooth/bcm203x.c
@@ -82,7 +82,7 @@ struct bcm203x_data {
82 unsigned int fw_sent; 82 unsigned int fw_sent;
83}; 83};
84 84
85static void bcm203x_complete(struct urb *urb, struct pt_regs *regs) 85static void bcm203x_complete(struct urb *urb)
86{ 86{
87 struct bcm203x_data *data = urb->context; 87 struct bcm203x_data *data = urb->context;
88 struct usb_device *udev = urb->dev; 88 struct usb_device *udev = urb->dev;
diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c
index efcc28ec9d9a..31ade991aa91 100644
--- a/drivers/bluetooth/bfusb.c
+++ b/drivers/bluetooth/bfusb.c
@@ -95,8 +95,8 @@ struct bfusb_data_scb {
95 struct urb *urb; 95 struct urb *urb;
96}; 96};
97 97
98static void bfusb_tx_complete(struct urb *urb, struct pt_regs *regs); 98static void bfusb_tx_complete(struct urb *urb);
99static void bfusb_rx_complete(struct urb *urb, struct pt_regs *regs); 99static void bfusb_rx_complete(struct urb *urb);
100 100
101static struct urb *bfusb_get_completed(struct bfusb_data *data) 101static struct urb *bfusb_get_completed(struct bfusb_data *data)
102{ 102{
@@ -190,7 +190,7 @@ static void bfusb_tx_wakeup(struct bfusb_data *data)
190 clear_bit(BFUSB_TX_PROCESS, &data->state); 190 clear_bit(BFUSB_TX_PROCESS, &data->state);
191} 191}
192 192
193static void bfusb_tx_complete(struct urb *urb, struct pt_regs *regs) 193static void bfusb_tx_complete(struct urb *urb)
194{ 194{
195 struct sk_buff *skb = (struct sk_buff *) urb->context; 195 struct sk_buff *skb = (struct sk_buff *) urb->context;
196 struct bfusb_data *data = (struct bfusb_data *) skb->dev; 196 struct bfusb_data *data = (struct bfusb_data *) skb->dev;
@@ -349,7 +349,7 @@ static inline int bfusb_recv_block(struct bfusb_data *data, int hdr, unsigned ch
349 return 0; 349 return 0;
350} 350}
351 351
352static void bfusb_rx_complete(struct urb *urb, struct pt_regs *regs) 352static void bfusb_rx_complete(struct urb *urb)
353{ 353{
354 struct sk_buff *skb = (struct sk_buff *) urb->context; 354 struct sk_buff *skb = (struct sk_buff *) urb->context;
355 struct bfusb_data *data = (struct bfusb_data *) skb->dev; 355 struct bfusb_data *data = (struct bfusb_data *) skb->dev;
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index 8eebf9ca3786..845b8680032a 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -497,7 +497,7 @@ static void bluecard_receive(bluecard_info_t *info, unsigned int offset)
497} 497}
498 498
499 499
500static irqreturn_t bluecard_interrupt(int irq, void *dev_inst, struct pt_regs *regs) 500static irqreturn_t bluecard_interrupt(int irq, void *dev_inst)
501{ 501{
502 bluecard_info_t *info = dev_inst; 502 bluecard_info_t *info = dev_inst;
503 unsigned int iobase; 503 unsigned int iobase;
diff --git a/drivers/bluetooth/bpa10x.c b/drivers/bluetooth/bpa10x.c
index e0231dc2cb1a..9fca6513562d 100644
--- a/drivers/bluetooth/bpa10x.c
+++ b/drivers/bluetooth/bpa10x.c
@@ -263,7 +263,7 @@ static void bpa10x_wakeup(struct bpa10x_data *data)
263 } 263 }
264} 264}
265 265
266static void bpa10x_complete(struct urb *urb, struct pt_regs *regs) 266static void bpa10x_complete(struct urb *urb)
267{ 267{
268 struct bpa10x_data *data = urb->context; 268 struct bpa10x_data *data = urb->context;
269 unsigned char *buf = urb->transfer_buffer; 269 unsigned char *buf = urb->transfer_buffer;
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index df7bb016df49..3a96a0babc6a 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -338,7 +338,7 @@ static void bt3c_receive(bt3c_info_t *info)
338} 338}
339 339
340 340
341static irqreturn_t bt3c_interrupt(int irq, void *dev_inst, struct pt_regs *regs) 341static irqreturn_t bt3c_interrupt(int irq, void *dev_inst)
342{ 342{
343 bt3c_info_t *info = dev_inst; 343 bt3c_info_t *info = dev_inst;
344 unsigned int iobase; 344 unsigned int iobase;
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index 746ccca97f6f..3b29086b7c3f 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -288,7 +288,7 @@ static void btuart_receive(btuart_info_t *info)
288} 288}
289 289
290 290
291static irqreturn_t btuart_interrupt(int irq, void *dev_inst, struct pt_regs *regs) 291static irqreturn_t btuart_interrupt(int irq, void *dev_inst)
292{ 292{
293 btuart_info_t *info = dev_inst; 293 btuart_info_t *info = dev_inst;
294 unsigned int iobase; 294 unsigned int iobase;
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index 0e99def8a1e3..e7c800f4c3ad 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -291,7 +291,7 @@ static void dtl1_receive(dtl1_info_t *info)
291} 291}
292 292
293 293
294static irqreturn_t dtl1_interrupt(int irq, void *dev_inst, struct pt_regs *regs) 294static irqreturn_t dtl1_interrupt(int irq, void *dev_inst)
295{ 295{
296 dtl1_info_t *info = dev_inst; 296 dtl1_info_t *info = dev_inst;
297 unsigned int iobase; 297 unsigned int iobase;
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
index 0801af4ad2b9..7565642a007a 100644
--- a/drivers/bluetooth/hci_usb.c
+++ b/drivers/bluetooth/hci_usb.c
@@ -176,8 +176,8 @@ static struct _urb *_urb_dequeue(struct _urb_queue *q)
176 return _urb; 176 return _urb;
177} 177}
178 178
179static void hci_usb_rx_complete(struct urb *urb, struct pt_regs *regs); 179static void hci_usb_rx_complete(struct urb *urb);
180static void hci_usb_tx_complete(struct urb *urb, struct pt_regs *regs); 180static void hci_usb_tx_complete(struct urb *urb);
181 181
182#define __pending_tx(husb, type) (&husb->pending_tx[type-1]) 182#define __pending_tx(husb, type) (&husb->pending_tx[type-1])
183#define __pending_q(husb, type) (&husb->pending_q[type-1]) 183#define __pending_q(husb, type) (&husb->pending_q[type-1])
@@ -732,7 +732,7 @@ static inline int __recv_frame(struct hci_usb *husb, int type, void *data, int c
732 return 0; 732 return 0;
733} 733}
734 734
735static void hci_usb_rx_complete(struct urb *urb, struct pt_regs *regs) 735static void hci_usb_rx_complete(struct urb *urb)
736{ 736{
737 struct _urb *_urb = container_of(urb, struct _urb, urb); 737 struct _urb *_urb = container_of(urb, struct _urb, urb);
738 struct hci_usb *husb = (void *) urb->context; 738 struct hci_usb *husb = (void *) urb->context;
@@ -786,7 +786,7 @@ unlock:
786 read_unlock(&husb->completion_lock); 786 read_unlock(&husb->completion_lock);
787} 787}
788 788
789static void hci_usb_tx_complete(struct urb *urb, struct pt_regs *regs) 789static void hci_usb_tx_complete(struct urb *urb)
790{ 790{
791 struct _urb *_urb = container_of(urb, struct _urb, urb); 791 struct _urb *_urb = container_of(urb, struct _urb, urb);
792 struct hci_usb *husb = (void *) urb->context; 792 struct hci_usb *husb = (void *) urb->context;