diff options
author | David Howells <dhowells@redhat.com> | 2006-10-05 09:55:46 -0400 |
---|---|---|
committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-10-05 10:10:12 -0400 |
commit | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (patch) | |
tree | 6748550400445c11a306b132009f3001e3525df8 /drivers/usb/serial/keyspan.c | |
parent | da482792a6d1a3fbaaa25fae867b343fb4db3246 (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/usb/serial/keyspan.c')
-rw-r--r-- | drivers/usb/serial/keyspan.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c index 015ad6cc1bbb..53be824eb1bf 100644 --- a/drivers/usb/serial/keyspan.c +++ b/drivers/usb/serial/keyspan.c | |||
@@ -412,7 +412,7 @@ static int keyspan_write(struct usb_serial_port *port, | |||
412 | return count - left; | 412 | return count - left; |
413 | } | 413 | } |
414 | 414 | ||
415 | static void usa26_indat_callback(struct urb *urb, struct pt_regs *regs) | 415 | static void usa26_indat_callback(struct urb *urb) |
416 | { | 416 | { |
417 | int i, err; | 417 | int i, err; |
418 | int endpoint; | 418 | int endpoint; |
@@ -470,7 +470,7 @@ static void usa26_indat_callback(struct urb *urb, struct pt_regs *regs) | |||
470 | } | 470 | } |
471 | 471 | ||
472 | /* Outdat handling is common for all devices */ | 472 | /* Outdat handling is common for all devices */ |
473 | static void usa2x_outdat_callback(struct urb *urb, struct pt_regs *regs) | 473 | static void usa2x_outdat_callback(struct urb *urb) |
474 | { | 474 | { |
475 | struct usb_serial_port *port; | 475 | struct usb_serial_port *port; |
476 | struct keyspan_port_private *p_priv; | 476 | struct keyspan_port_private *p_priv; |
@@ -483,13 +483,13 @@ static void usa2x_outdat_callback(struct urb *urb, struct pt_regs *regs) | |||
483 | usb_serial_port_softint(port); | 483 | usb_serial_port_softint(port); |
484 | } | 484 | } |
485 | 485 | ||
486 | static void usa26_inack_callback(struct urb *urb, struct pt_regs *regs) | 486 | static void usa26_inack_callback(struct urb *urb) |
487 | { | 487 | { |
488 | dbg ("%s", __FUNCTION__); | 488 | dbg ("%s", __FUNCTION__); |
489 | 489 | ||
490 | } | 490 | } |
491 | 491 | ||
492 | static void usa26_outcont_callback(struct urb *urb, struct pt_regs *regs) | 492 | static void usa26_outcont_callback(struct urb *urb) |
493 | { | 493 | { |
494 | struct usb_serial_port *port; | 494 | struct usb_serial_port *port; |
495 | struct keyspan_port_private *p_priv; | 495 | struct keyspan_port_private *p_priv; |
@@ -503,7 +503,7 @@ static void usa26_outcont_callback(struct urb *urb, struct pt_regs *regs) | |||
503 | } | 503 | } |
504 | } | 504 | } |
505 | 505 | ||
506 | static void usa26_instat_callback(struct urb *urb, struct pt_regs *regs) | 506 | static void usa26_instat_callback(struct urb *urb) |
507 | { | 507 | { |
508 | unsigned char *data = urb->transfer_buffer; | 508 | unsigned char *data = urb->transfer_buffer; |
509 | struct keyspan_usa26_portStatusMessage *msg; | 509 | struct keyspan_usa26_portStatusMessage *msg; |
@@ -565,14 +565,14 @@ static void usa26_instat_callback(struct urb *urb, struct pt_regs *regs) | |||
565 | exit: ; | 565 | exit: ; |
566 | } | 566 | } |
567 | 567 | ||
568 | static void usa26_glocont_callback(struct urb *urb, struct pt_regs *regs) | 568 | static void usa26_glocont_callback(struct urb *urb) |
569 | { | 569 | { |
570 | dbg ("%s", __FUNCTION__); | 570 | dbg ("%s", __FUNCTION__); |
571 | 571 | ||
572 | } | 572 | } |
573 | 573 | ||
574 | 574 | ||
575 | static void usa28_indat_callback(struct urb *urb, struct pt_regs *regs) | 575 | static void usa28_indat_callback(struct urb *urb) |
576 | { | 576 | { |
577 | int i, err; | 577 | int i, err; |
578 | struct usb_serial_port *port; | 578 | struct usb_serial_port *port; |
@@ -620,12 +620,12 @@ static void usa28_indat_callback(struct urb *urb, struct pt_regs *regs) | |||
620 | } while (urb->status != -EINPROGRESS); | 620 | } while (urb->status != -EINPROGRESS); |
621 | } | 621 | } |
622 | 622 | ||
623 | static void usa28_inack_callback(struct urb *urb, struct pt_regs *regs) | 623 | static void usa28_inack_callback(struct urb *urb) |
624 | { | 624 | { |
625 | dbg ("%s", __FUNCTION__); | 625 | dbg ("%s", __FUNCTION__); |
626 | } | 626 | } |
627 | 627 | ||
628 | static void usa28_outcont_callback(struct urb *urb, struct pt_regs *regs) | 628 | static void usa28_outcont_callback(struct urb *urb) |
629 | { | 629 | { |
630 | struct usb_serial_port *port; | 630 | struct usb_serial_port *port; |
631 | struct keyspan_port_private *p_priv; | 631 | struct keyspan_port_private *p_priv; |
@@ -639,7 +639,7 @@ static void usa28_outcont_callback(struct urb *urb, struct pt_regs *regs) | |||
639 | } | 639 | } |
640 | } | 640 | } |
641 | 641 | ||
642 | static void usa28_instat_callback(struct urb *urb, struct pt_regs *regs) | 642 | static void usa28_instat_callback(struct urb *urb) |
643 | { | 643 | { |
644 | int err; | 644 | int err; |
645 | unsigned char *data = urb->transfer_buffer; | 645 | unsigned char *data = urb->transfer_buffer; |
@@ -700,13 +700,13 @@ static void usa28_instat_callback(struct urb *urb, struct pt_regs *regs) | |||
700 | exit: ; | 700 | exit: ; |
701 | } | 701 | } |
702 | 702 | ||
703 | static void usa28_glocont_callback(struct urb *urb, struct pt_regs *regs) | 703 | static void usa28_glocont_callback(struct urb *urb) |
704 | { | 704 | { |
705 | dbg ("%s", __FUNCTION__); | 705 | dbg ("%s", __FUNCTION__); |
706 | } | 706 | } |
707 | 707 | ||
708 | 708 | ||
709 | static void usa49_glocont_callback(struct urb *urb, struct pt_regs *regs) | 709 | static void usa49_glocont_callback(struct urb *urb) |
710 | { | 710 | { |
711 | struct usb_serial *serial; | 711 | struct usb_serial *serial; |
712 | struct usb_serial_port *port; | 712 | struct usb_serial_port *port; |
@@ -730,7 +730,7 @@ static void usa49_glocont_callback(struct urb *urb, struct pt_regs *regs) | |||
730 | 730 | ||
731 | /* This is actually called glostat in the Keyspan | 731 | /* This is actually called glostat in the Keyspan |
732 | doco */ | 732 | doco */ |
733 | static void usa49_instat_callback(struct urb *urb, struct pt_regs *regs) | 733 | static void usa49_instat_callback(struct urb *urb) |
734 | { | 734 | { |
735 | int err; | 735 | int err; |
736 | unsigned char *data = urb->transfer_buffer; | 736 | unsigned char *data = urb->transfer_buffer; |
@@ -793,12 +793,12 @@ static void usa49_instat_callback(struct urb *urb, struct pt_regs *regs) | |||
793 | exit: ; | 793 | exit: ; |
794 | } | 794 | } |
795 | 795 | ||
796 | static void usa49_inack_callback(struct urb *urb, struct pt_regs *regs) | 796 | static void usa49_inack_callback(struct urb *urb) |
797 | { | 797 | { |
798 | dbg ("%s", __FUNCTION__); | 798 | dbg ("%s", __FUNCTION__); |
799 | } | 799 | } |
800 | 800 | ||
801 | static void usa49_indat_callback(struct urb *urb, struct pt_regs *regs) | 801 | static void usa49_indat_callback(struct urb *urb) |
802 | { | 802 | { |
803 | int i, err; | 803 | int i, err; |
804 | int endpoint; | 804 | int endpoint; |
@@ -851,12 +851,12 @@ static void usa49_indat_callback(struct urb *urb, struct pt_regs *regs) | |||
851 | } | 851 | } |
852 | 852 | ||
853 | /* not used, usa-49 doesn't have per-port control endpoints */ | 853 | /* not used, usa-49 doesn't have per-port control endpoints */ |
854 | static void usa49_outcont_callback(struct urb *urb, struct pt_regs *regs) | 854 | static void usa49_outcont_callback(struct urb *urb) |
855 | { | 855 | { |
856 | dbg ("%s", __FUNCTION__); | 856 | dbg ("%s", __FUNCTION__); |
857 | } | 857 | } |
858 | 858 | ||
859 | static void usa90_indat_callback(struct urb *urb, struct pt_regs *regs) | 859 | static void usa90_indat_callback(struct urb *urb) |
860 | { | 860 | { |
861 | int i, err; | 861 | int i, err; |
862 | int endpoint; | 862 | int endpoint; |
@@ -930,7 +930,7 @@ static void usa90_indat_callback(struct urb *urb, struct pt_regs *regs) | |||
930 | } | 930 | } |
931 | 931 | ||
932 | 932 | ||
933 | static void usa90_instat_callback(struct urb *urb, struct pt_regs *regs) | 933 | static void usa90_instat_callback(struct urb *urb) |
934 | { | 934 | { |
935 | unsigned char *data = urb->transfer_buffer; | 935 | unsigned char *data = urb->transfer_buffer; |
936 | struct keyspan_usa90_portStatusMessage *msg; | 936 | struct keyspan_usa90_portStatusMessage *msg; |
@@ -981,7 +981,7 @@ exit: | |||
981 | ; | 981 | ; |
982 | } | 982 | } |
983 | 983 | ||
984 | static void usa90_outcont_callback(struct urb *urb, struct pt_regs *regs) | 984 | static void usa90_outcont_callback(struct urb *urb) |
985 | { | 985 | { |
986 | struct usb_serial_port *port; | 986 | struct usb_serial_port *port; |
987 | struct keyspan_port_private *p_priv; | 987 | struct keyspan_port_private *p_priv; |
@@ -1277,7 +1277,7 @@ static int keyspan_fake_startup (struct usb_serial *serial) | |||
1277 | /* Helper functions used by keyspan_setup_urbs */ | 1277 | /* Helper functions used by keyspan_setup_urbs */ |
1278 | static struct urb *keyspan_setup_urb (struct usb_serial *serial, int endpoint, | 1278 | static struct urb *keyspan_setup_urb (struct usb_serial *serial, int endpoint, |
1279 | int dir, void *ctx, char *buf, int len, | 1279 | int dir, void *ctx, char *buf, int len, |
1280 | void (*callback)(struct urb *, struct pt_regs *regs)) | 1280 | void (*callback)(struct urb *)) |
1281 | { | 1281 | { |
1282 | struct urb *urb; | 1282 | struct urb *urb; |
1283 | 1283 | ||
@@ -1300,12 +1300,12 @@ static struct urb *keyspan_setup_urb (struct usb_serial *serial, int endpoint, | |||
1300 | } | 1300 | } |
1301 | 1301 | ||
1302 | static struct callbacks { | 1302 | static struct callbacks { |
1303 | void (*instat_callback)(struct urb *, struct pt_regs *regs); | 1303 | void (*instat_callback)(struct urb *); |
1304 | void (*glocont_callback)(struct urb *, struct pt_regs *regs); | 1304 | void (*glocont_callback)(struct urb *); |
1305 | void (*indat_callback)(struct urb *, struct pt_regs *regs); | 1305 | void (*indat_callback)(struct urb *); |
1306 | void (*outdat_callback)(struct urb *, struct pt_regs *regs); | 1306 | void (*outdat_callback)(struct urb *); |
1307 | void (*inack_callback)(struct urb *, struct pt_regs *regs); | 1307 | void (*inack_callback)(struct urb *); |
1308 | void (*outcont_callback)(struct urb *, struct pt_regs *regs); | 1308 | void (*outcont_callback)(struct urb *); |
1309 | } keyspan_callbacks[] = { | 1309 | } keyspan_callbacks[] = { |
1310 | { | 1310 | { |
1311 | /* msg_usa26 callbacks */ | 1311 | /* msg_usa26 callbacks */ |