aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
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/ata
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/ata')
-rw-r--r--drivers/ata/ahci.c4
-rw-r--r--drivers/ata/libata-core.c3
-rw-r--r--drivers/ata/pdc_adma.c5
-rw-r--r--drivers/ata/sata_mv.c6
-rw-r--r--drivers/ata/sata_nv.c18
-rw-r--r--drivers/ata/sata_promise.c4
-rw-r--r--drivers/ata/sata_qstor.c4
-rw-r--r--drivers/ata/sata_sil.c6
-rw-r--r--drivers/ata/sata_sil24.c4
-rw-r--r--drivers/ata/sata_sx4.c4
-rw-r--r--drivers/ata/sata_vsc.c3
11 files changed, 24 insertions, 37 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 54e1f38ce301..25929123ffff 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -204,7 +204,7 @@ static u32 ahci_scr_read (struct ata_port *ap, unsigned int sc_reg);
204static void ahci_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val); 204static void ahci_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
205static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent); 205static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
206static unsigned int ahci_qc_issue(struct ata_queued_cmd *qc); 206static unsigned int ahci_qc_issue(struct ata_queued_cmd *qc);
207static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs *regs); 207static irqreturn_t ahci_interrupt (int irq, void *dev_instance);
208static void ahci_irq_clear(struct ata_port *ap); 208static void ahci_irq_clear(struct ata_port *ap);
209static int ahci_port_start(struct ata_port *ap); 209static int ahci_port_start(struct ata_port *ap);
210static void ahci_port_stop(struct ata_port *ap); 210static void ahci_port_stop(struct ata_port *ap);
@@ -1059,7 +1059,7 @@ static void ahci_irq_clear(struct ata_port *ap)
1059 /* TODO */ 1059 /* TODO */
1060} 1060}
1061 1061
1062static irqreturn_t ahci_interrupt(int irq, void *dev_instance, struct pt_regs *regs) 1062static irqreturn_t ahci_interrupt(int irq, void *dev_instance)
1063{ 1063{
1064 struct ata_host *host = dev_instance; 1064 struct ata_host *host = dev_instance;
1065 struct ahci_host_priv *hpriv; 1065 struct ahci_host_priv *hpriv;
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index dce65651d858..77138a39eb04 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -4857,7 +4857,6 @@ idle_irq:
4857 * ata_interrupt - Default ATA host interrupt handler 4857 * ata_interrupt - Default ATA host interrupt handler
4858 * @irq: irq line (unused) 4858 * @irq: irq line (unused)
4859 * @dev_instance: pointer to our ata_host information structure 4859 * @dev_instance: pointer to our ata_host information structure
4860 * @regs: unused
4861 * 4860 *
4862 * Default interrupt handler for PCI IDE devices. Calls 4861 * Default interrupt handler for PCI IDE devices. Calls
4863 * ata_host_intr() for each port that is not disabled. 4862 * ata_host_intr() for each port that is not disabled.
@@ -4869,7 +4868,7 @@ idle_irq:
4869 * IRQ_NONE or IRQ_HANDLED. 4868 * IRQ_NONE or IRQ_HANDLED.
4870 */ 4869 */
4871 4870
4872irqreturn_t ata_interrupt (int irq, void *dev_instance, struct pt_regs *regs) 4871irqreturn_t ata_interrupt (int irq, void *dev_instance)
4873{ 4872{
4874 struct ata_host *host = dev_instance; 4873 struct ata_host *host = dev_instance;
4875 unsigned int i; 4874 unsigned int i;
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index 81f3d219e70e..9021e34d2096 100644
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -124,8 +124,7 @@ struct adma_port_priv {
124 124
125static int adma_ata_init_one (struct pci_dev *pdev, 125static int adma_ata_init_one (struct pci_dev *pdev,
126 const struct pci_device_id *ent); 126 const struct pci_device_id *ent);
127static irqreturn_t adma_intr (int irq, void *dev_instance, 127static irqreturn_t adma_intr (int irq, void *dev_instance);
128 struct pt_regs *regs);
129static int adma_port_start(struct ata_port *ap); 128static int adma_port_start(struct ata_port *ap);
130static void adma_host_stop(struct ata_host *host); 129static void adma_host_stop(struct ata_host *host);
131static void adma_port_stop(struct ata_port *ap); 130static void adma_port_stop(struct ata_port *ap);
@@ -508,7 +507,7 @@ static inline unsigned int adma_intr_mmio(struct ata_host *host)
508 return handled; 507 return handled;
509} 508}
510 509
511static irqreturn_t adma_intr(int irq, void *dev_instance, struct pt_regs *regs) 510static irqreturn_t adma_intr(int irq, void *dev_instance)
512{ 511{
513 struct ata_host *host = dev_instance; 512 struct ata_host *host = dev_instance;
514 unsigned int handled = 0; 513 unsigned int handled = 0;
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index e6aa1a86d5cf..1b8e0eb9e032 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -348,8 +348,7 @@ static void mv_port_stop(struct ata_port *ap);
348static void mv_qc_prep(struct ata_queued_cmd *qc); 348static void mv_qc_prep(struct ata_queued_cmd *qc);
349static void mv_qc_prep_iie(struct ata_queued_cmd *qc); 349static void mv_qc_prep_iie(struct ata_queued_cmd *qc);
350static unsigned int mv_qc_issue(struct ata_queued_cmd *qc); 350static unsigned int mv_qc_issue(struct ata_queued_cmd *qc);
351static irqreturn_t mv_interrupt(int irq, void *dev_instance, 351static irqreturn_t mv_interrupt(int irq, void *dev_instance);
352 struct pt_regs *regs);
353static void mv_eng_timeout(struct ata_port *ap); 352static void mv_eng_timeout(struct ata_port *ap);
354static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); 353static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
355 354
@@ -1448,8 +1447,7 @@ static void mv_host_intr(struct ata_host *host, u32 relevant, unsigned int hc)
1448 * This routine holds the host lock while processing pending 1447 * This routine holds the host lock while processing pending
1449 * interrupts. 1448 * interrupts.
1450 */ 1449 */
1451static irqreturn_t mv_interrupt(int irq, void *dev_instance, 1450static irqreturn_t mv_interrupt(int irq, void *dev_instance)
1452 struct pt_regs *regs)
1453{ 1451{
1454 struct ata_host *host = dev_instance; 1452 struct ata_host *host = dev_instance;
1455 unsigned int hc, handled = 0, n_hcs; 1453 unsigned int hc, handled = 0, n_hcs;
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index d09d20a17790..323b60710806 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -82,12 +82,9 @@ enum {
82 82
83static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent); 83static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
84static void nv_ck804_host_stop(struct ata_host *host); 84static void nv_ck804_host_stop(struct ata_host *host);
85static irqreturn_t nv_generic_interrupt(int irq, void *dev_instance, 85static irqreturn_t nv_generic_interrupt(int irq, void *dev_instance);
86 struct pt_regs *regs); 86static irqreturn_t nv_nf2_interrupt(int irq, void *dev_instance);
87static irqreturn_t nv_nf2_interrupt(int irq, void *dev_instance, 87static irqreturn_t nv_ck804_interrupt(int irq, void *dev_instance);
88 struct pt_regs *regs);
89static irqreturn_t nv_ck804_interrupt(int irq, void *dev_instance,
90 struct pt_regs *regs);
91static u32 nv_scr_read (struct ata_port *ap, unsigned int sc_reg); 88static u32 nv_scr_read (struct ata_port *ap, unsigned int sc_reg);
92static void nv_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val); 89static void nv_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
93 90
@@ -276,8 +273,7 @@ MODULE_LICENSE("GPL");
276MODULE_DEVICE_TABLE(pci, nv_pci_tbl); 273MODULE_DEVICE_TABLE(pci, nv_pci_tbl);
277MODULE_VERSION(DRV_VERSION); 274MODULE_VERSION(DRV_VERSION);
278 275
279static irqreturn_t nv_generic_interrupt(int irq, void *dev_instance, 276static irqreturn_t nv_generic_interrupt(int irq, void *dev_instance)
280 struct pt_regs *regs)
281{ 277{
282 struct ata_host *host = dev_instance; 278 struct ata_host *host = dev_instance;
283 unsigned int i; 279 unsigned int i;
@@ -357,8 +353,7 @@ static irqreturn_t nv_do_interrupt(struct ata_host *host, u8 irq_stat)
357 return IRQ_RETVAL(handled); 353 return IRQ_RETVAL(handled);
358} 354}
359 355
360static irqreturn_t nv_nf2_interrupt(int irq, void *dev_instance, 356static irqreturn_t nv_nf2_interrupt(int irq, void *dev_instance)
361 struct pt_regs *regs)
362{ 357{
363 struct ata_host *host = dev_instance; 358 struct ata_host *host = dev_instance;
364 u8 irq_stat; 359 u8 irq_stat;
@@ -372,8 +367,7 @@ static irqreturn_t nv_nf2_interrupt(int irq, void *dev_instance,
372 return ret; 367 return ret;
373} 368}
374 369
375static irqreturn_t nv_ck804_interrupt(int irq, void *dev_instance, 370static irqreturn_t nv_ck804_interrupt(int irq, void *dev_instance)
376 struct pt_regs *regs)
377{ 371{
378 struct ata_host *host = dev_instance; 372 struct ata_host *host = dev_instance;
379 u8 irq_stat; 373 u8 irq_stat;
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index 15c9437710fc..d636ede064aa 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -93,7 +93,7 @@ struct pdc_host_priv {
93static u32 pdc_sata_scr_read (struct ata_port *ap, unsigned int sc_reg); 93static u32 pdc_sata_scr_read (struct ata_port *ap, unsigned int sc_reg);
94static void pdc_sata_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val); 94static void pdc_sata_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
95static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *ent); 95static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
96static irqreturn_t pdc_interrupt (int irq, void *dev_instance, struct pt_regs *regs); 96static irqreturn_t pdc_interrupt (int irq, void *dev_instance);
97static void pdc_eng_timeout(struct ata_port *ap); 97static void pdc_eng_timeout(struct ata_port *ap);
98static int pdc_port_start(struct ata_port *ap); 98static int pdc_port_start(struct ata_port *ap);
99static void pdc_port_stop(struct ata_port *ap); 99static void pdc_port_stop(struct ata_port *ap);
@@ -498,7 +498,7 @@ static void pdc_irq_clear(struct ata_port *ap)
498 readl(mmio + PDC_INT_SEQMASK); 498 readl(mmio + PDC_INT_SEQMASK);
499} 499}
500 500
501static irqreturn_t pdc_interrupt (int irq, void *dev_instance, struct pt_regs *regs) 501static irqreturn_t pdc_interrupt (int irq, void *dev_instance)
502{ 502{
503 struct ata_host *host = dev_instance; 503 struct ata_host *host = dev_instance;
504 struct ata_port *ap; 504 struct ata_port *ap;
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
index 7f6cc3c07de5..710909df4eaf 100644
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
@@ -114,7 +114,7 @@ struct qs_port_priv {
114static u32 qs_scr_read (struct ata_port *ap, unsigned int sc_reg); 114static u32 qs_scr_read (struct ata_port *ap, unsigned int sc_reg);
115static void qs_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val); 115static void qs_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
116static int qs_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *ent); 116static int qs_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
117static irqreturn_t qs_intr (int irq, void *dev_instance, struct pt_regs *regs); 117static irqreturn_t qs_intr (int irq, void *dev_instance);
118static int qs_port_start(struct ata_port *ap); 118static int qs_port_start(struct ata_port *ap);
119static void qs_host_stop(struct ata_host *host); 119static void qs_host_stop(struct ata_host *host);
120static void qs_port_stop(struct ata_port *ap); 120static void qs_port_stop(struct ata_port *ap);
@@ -454,7 +454,7 @@ static inline unsigned int qs_intr_mmio(struct ata_host *host)
454 return handled; 454 return handled;
455} 455}
456 456
457static irqreturn_t qs_intr(int irq, void *dev_instance, struct pt_regs *regs) 457static irqreturn_t qs_intr(int irq, void *dev_instance)
458{ 458{
459 struct ata_host *host = dev_instance; 459 struct ata_host *host = dev_instance;
460 unsigned int handled = 0; 460 unsigned int handled = 0;
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index 3d9fa1cc834d..ae5edb80ea9a 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -116,8 +116,7 @@ static void sil_dev_config(struct ata_port *ap, struct ata_device *dev);
116static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg); 116static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg);
117static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val); 117static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
118static void sil_post_set_mode (struct ata_port *ap); 118static void sil_post_set_mode (struct ata_port *ap);
119static irqreturn_t sil_interrupt(int irq, void *dev_instance, 119static irqreturn_t sil_interrupt(int irq, void *dev_instance);
120 struct pt_regs *regs);
121static void sil_freeze(struct ata_port *ap); 120static void sil_freeze(struct ata_port *ap);
122static void sil_thaw(struct ata_port *ap); 121static void sil_thaw(struct ata_port *ap);
123 122
@@ -437,8 +436,7 @@ static void sil_host_intr(struct ata_port *ap, u32 bmdma2)
437 ata_port_freeze(ap); 436 ata_port_freeze(ap);
438} 437}
439 438
440static irqreturn_t sil_interrupt(int irq, void *dev_instance, 439static irqreturn_t sil_interrupt(int irq, void *dev_instance)
441 struct pt_regs *regs)
442{ 440{
443 struct ata_host *host = dev_instance; 441 struct ata_host *host = dev_instance;
444 void __iomem *mmio_base = host->mmio_base; 442 void __iomem *mmio_base = host->mmio_base;
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index a951f40c2f21..169e200a6a71 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -330,7 +330,7 @@ static void sil24_tf_read(struct ata_port *ap, struct ata_taskfile *tf);
330static void sil24_qc_prep(struct ata_queued_cmd *qc); 330static void sil24_qc_prep(struct ata_queued_cmd *qc);
331static unsigned int sil24_qc_issue(struct ata_queued_cmd *qc); 331static unsigned int sil24_qc_issue(struct ata_queued_cmd *qc);
332static void sil24_irq_clear(struct ata_port *ap); 332static void sil24_irq_clear(struct ata_port *ap);
333static irqreturn_t sil24_interrupt(int irq, void *dev_instance, struct pt_regs *regs); 333static irqreturn_t sil24_interrupt(int irq, void *dev_instance);
334static void sil24_freeze(struct ata_port *ap); 334static void sil24_freeze(struct ata_port *ap);
335static void sil24_thaw(struct ata_port *ap); 335static void sil24_thaw(struct ata_port *ap);
336static void sil24_error_handler(struct ata_port *ap); 336static void sil24_error_handler(struct ata_port *ap);
@@ -870,7 +870,7 @@ static inline void sil24_host_intr(struct ata_port *ap)
870 slot_stat, ap->active_tag, ap->sactive); 870 slot_stat, ap->active_tag, ap->sactive);
871} 871}
872 872
873static irqreturn_t sil24_interrupt(int irq, void *dev_instance, struct pt_regs *regs) 873static irqreturn_t sil24_interrupt(int irq, void *dev_instance)
874{ 874{
875 struct ata_host *host = dev_instance; 875 struct ata_host *host = dev_instance;
876 struct sil24_host_priv *hpriv = host->private_data; 876 struct sil24_host_priv *hpriv = host->private_data;
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
index 8c74f2ff4344..ae7992de4b08 100644
--- a/drivers/ata/sata_sx4.c
+++ b/drivers/ata/sata_sx4.c
@@ -152,7 +152,7 @@ struct pdc_host_priv {
152 152
153 153
154static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *ent); 154static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
155static irqreturn_t pdc20621_interrupt (int irq, void *dev_instance, struct pt_regs *regs); 155static irqreturn_t pdc20621_interrupt (int irq, void *dev_instance);
156static void pdc_eng_timeout(struct ata_port *ap); 156static void pdc_eng_timeout(struct ata_port *ap);
157static void pdc_20621_phy_reset (struct ata_port *ap); 157static void pdc_20621_phy_reset (struct ata_port *ap);
158static int pdc_port_start(struct ata_port *ap); 158static int pdc_port_start(struct ata_port *ap);
@@ -788,7 +788,7 @@ static void pdc20621_irq_clear(struct ata_port *ap)
788 readl(mmio + PDC_20621_SEQMASK); 788 readl(mmio + PDC_20621_SEQMASK);
789} 789}
790 790
791static irqreturn_t pdc20621_interrupt (int irq, void *dev_instance, struct pt_regs *regs) 791static irqreturn_t pdc20621_interrupt (int irq, void *dev_instance)
792{ 792{
793 struct ata_host *host = dev_instance; 793 struct ata_host *host = dev_instance;
794 struct ata_port *ap; 794 struct ata_port *ap;
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
index 273d88fcf980..e654b990b905 100644
--- a/drivers/ata/sata_vsc.c
+++ b/drivers/ata/sata_vsc.c
@@ -203,8 +203,7 @@ static void vsc_sata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
203 * 203 *
204 * Read the interrupt register and process for the devices that have them pending. 204 * Read the interrupt register and process for the devices that have them pending.
205 */ 205 */
206static irqreturn_t vsc_sata_interrupt (int irq, void *dev_instance, 206static irqreturn_t vsc_sata_interrupt (int irq, void *dev_instance)
207 struct pt_regs *regs)
208{ 207{
209 struct ata_host *host = dev_instance; 208 struct ata_host *host = dev_instance;
210 unsigned int i; 209 unsigned int i;