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/rtc | |
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/rtc')
-rw-r--r-- | drivers/rtc/rtc-at91.c | 3 | ||||
-rw-r--r-- | drivers/rtc/rtc-ds1553.c | 3 | ||||
-rw-r--r-- | drivers/rtc/rtc-pl031.c | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-s3c.c | 4 | ||||
-rw-r--r-- | drivers/rtc/rtc-sa1100.c | 6 | ||||
-rw-r--r-- | drivers/rtc/rtc-sh.c | 4 | ||||
-rw-r--r-- | drivers/rtc/rtc-vr41xx.c | 4 |
7 files changed, 11 insertions, 15 deletions
diff --git a/drivers/rtc/rtc-at91.c b/drivers/rtc/rtc-at91.c index c0714da44920..bd61e99540a3 100644 --- a/drivers/rtc/rtc-at91.c +++ b/drivers/rtc/rtc-at91.c | |||
@@ -238,8 +238,7 @@ static int at91_rtc_proc(struct device *dev, struct seq_file *seq) | |||
238 | /* | 238 | /* |
239 | * IRQ handler for the RTC | 239 | * IRQ handler for the RTC |
240 | */ | 240 | */ |
241 | static irqreturn_t at91_rtc_interrupt(int irq, void *dev_id, | 241 | static irqreturn_t at91_rtc_interrupt(int irq, void *dev_id) |
242 | struct pt_regs *regs) | ||
243 | { | 242 | { |
244 | struct platform_device *pdev = dev_id; | 243 | struct platform_device *pdev = dev_id; |
245 | struct rtc_device *rtc = platform_get_drvdata(pdev); | 244 | struct rtc_device *rtc = platform_get_drvdata(pdev); |
diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c index 9647188fee2c..78552e6e76aa 100644 --- a/drivers/rtc/rtc-ds1553.c +++ b/drivers/rtc/rtc-ds1553.c | |||
@@ -189,8 +189,7 @@ static int ds1553_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) | |||
189 | return 0; | 189 | return 0; |
190 | } | 190 | } |
191 | 191 | ||
192 | static irqreturn_t ds1553_rtc_interrupt(int irq, void *dev_id, | 192 | static irqreturn_t ds1553_rtc_interrupt(int irq, void *dev_id) |
193 | struct pt_regs *regs) | ||
194 | { | 193 | { |
195 | struct platform_device *pdev = dev_id; | 194 | struct platform_device *pdev = dev_id; |
196 | struct rtc_plat_data *pdata = platform_get_drvdata(pdev); | 195 | struct rtc_plat_data *pdata = platform_get_drvdata(pdev); |
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c index 739d1a6e14eb..f13daa9fecaa 100644 --- a/drivers/rtc/rtc-pl031.c +++ b/drivers/rtc/rtc-pl031.c | |||
@@ -47,7 +47,7 @@ struct pl031_local { | |||
47 | void __iomem *base; | 47 | void __iomem *base; |
48 | }; | 48 | }; |
49 | 49 | ||
50 | static irqreturn_t pl031_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 50 | static irqreturn_t pl031_interrupt(int irq, void *dev_id) |
51 | { | 51 | { |
52 | struct rtc_device *rtc = dev_id; | 52 | struct rtc_device *rtc = dev_id; |
53 | 53 | ||
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index 625dad2eeb4f..e301dea57bb3 100644 --- a/drivers/rtc/rtc-s3c.c +++ b/drivers/rtc/rtc-s3c.c | |||
@@ -46,7 +46,7 @@ static unsigned int tick_count; | |||
46 | 46 | ||
47 | /* IRQ Handlers */ | 47 | /* IRQ Handlers */ |
48 | 48 | ||
49 | static irqreturn_t s3c_rtc_alarmirq(int irq, void *id, struct pt_regs *r) | 49 | static irqreturn_t s3c_rtc_alarmirq(int irq, void *id) |
50 | { | 50 | { |
51 | struct rtc_device *rdev = id; | 51 | struct rtc_device *rdev = id; |
52 | 52 | ||
@@ -54,7 +54,7 @@ static irqreturn_t s3c_rtc_alarmirq(int irq, void *id, struct pt_regs *r) | |||
54 | return IRQ_HANDLED; | 54 | return IRQ_HANDLED; |
55 | } | 55 | } |
56 | 56 | ||
57 | static irqreturn_t s3c_rtc_tickirq(int irq, void *id, struct pt_regs *r) | 57 | static irqreturn_t s3c_rtc_tickirq(int irq, void *id) |
58 | { | 58 | { |
59 | struct rtc_device *rdev = id; | 59 | struct rtc_device *rdev = id; |
60 | 60 | ||
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index 439c41aea31c..bd4d7d174ef4 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c | |||
@@ -68,8 +68,7 @@ static int rtc_update_alarm(struct rtc_time *alrm) | |||
68 | return ret; | 68 | return ret; |
69 | } | 69 | } |
70 | 70 | ||
71 | static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id, | 71 | static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id) |
72 | struct pt_regs *regs) | ||
73 | { | 72 | { |
74 | struct platform_device *pdev = to_platform_device(dev_id); | 73 | struct platform_device *pdev = to_platform_device(dev_id); |
75 | struct rtc_device *rtc = platform_get_drvdata(pdev); | 74 | struct rtc_device *rtc = platform_get_drvdata(pdev); |
@@ -106,8 +105,7 @@ static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id, | |||
106 | 105 | ||
107 | static int rtc_timer1_count; | 106 | static int rtc_timer1_count; |
108 | 107 | ||
109 | static irqreturn_t timer1_interrupt(int irq, void *dev_id, | 108 | static irqreturn_t timer1_interrupt(int irq, void *dev_id) |
110 | struct pt_regs *regs) | ||
111 | { | 109 | { |
112 | struct platform_device *pdev = to_platform_device(dev_id); | 110 | struct platform_device *pdev = to_platform_device(dev_id); |
113 | struct rtc_device *rtc = platform_get_drvdata(pdev); | 111 | struct rtc_device *rtc = platform_get_drvdata(pdev); |
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c index d2ce0c8bb8f3..8b6efcc05058 100644 --- a/drivers/rtc/rtc-sh.c +++ b/drivers/rtc/rtc-sh.c | |||
@@ -73,7 +73,7 @@ struct sh_rtc { | |||
73 | spinlock_t lock; | 73 | spinlock_t lock; |
74 | }; | 74 | }; |
75 | 75 | ||
76 | static irqreturn_t sh_rtc_interrupt(int irq, void *id, struct pt_regs *regs) | 76 | static irqreturn_t sh_rtc_interrupt(int irq, void *id) |
77 | { | 77 | { |
78 | struct platform_device *pdev = id; | 78 | struct platform_device *pdev = id; |
79 | struct sh_rtc *rtc = platform_get_drvdata(pdev); | 79 | struct sh_rtc *rtc = platform_get_drvdata(pdev); |
@@ -97,7 +97,7 @@ static irqreturn_t sh_rtc_interrupt(int irq, void *id, struct pt_regs *regs) | |||
97 | return IRQ_HANDLED; | 97 | return IRQ_HANDLED; |
98 | } | 98 | } |
99 | 99 | ||
100 | static irqreturn_t sh_rtc_periodic(int irq, void *id, struct pt_regs *regs) | 100 | static irqreturn_t sh_rtc_periodic(int irq, void *id) |
101 | { | 101 | { |
102 | struct sh_rtc *rtc = dev_get_drvdata(id); | 102 | struct sh_rtc *rtc = dev_get_drvdata(id); |
103 | 103 | ||
diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c index 58e5ed0aa127..e40322b71938 100644 --- a/drivers/rtc/rtc-vr41xx.c +++ b/drivers/rtc/rtc-vr41xx.c | |||
@@ -268,7 +268,7 @@ static int vr41xx_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long | |||
268 | return 0; | 268 | return 0; |
269 | } | 269 | } |
270 | 270 | ||
271 | static irqreturn_t elapsedtime_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 271 | static irqreturn_t elapsedtime_interrupt(int irq, void *dev_id) |
272 | { | 272 | { |
273 | struct platform_device *pdev = (struct platform_device *)dev_id; | 273 | struct platform_device *pdev = (struct platform_device *)dev_id; |
274 | struct rtc_device *rtc = platform_get_drvdata(pdev); | 274 | struct rtc_device *rtc = platform_get_drvdata(pdev); |
@@ -280,7 +280,7 @@ static irqreturn_t elapsedtime_interrupt(int irq, void *dev_id, struct pt_regs * | |||
280 | return IRQ_HANDLED; | 280 | return IRQ_HANDLED; |
281 | } | 281 | } |
282 | 282 | ||
283 | static irqreturn_t rtclong1_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 283 | static irqreturn_t rtclong1_interrupt(int irq, void *dev_id) |
284 | { | 284 | { |
285 | struct platform_device *pdev = (struct platform_device *)dev_id; | 285 | struct platform_device *pdev = (struct platform_device *)dev_id; |
286 | struct rtc_device *rtc = platform_get_drvdata(pdev); | 286 | struct rtc_device *rtc = platform_get_drvdata(pdev); |