diff options
author | Magnus Damm <damm@opensource.se> | 2013-02-26 06:58:54 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-03-18 08:26:06 -0400 |
commit | 33f958f2a71c44164698d1cae5463c0b85296a2c (patch) | |
tree | d8a667815cce314b57aff72e2991c28b42d557c4 /drivers/irqchip/irq-renesas-intc-irqpin.c | |
parent | 862d309883c69d67e1a2095e6f9e8ef35bf72dd6 (diff) |
irqchip: intc-irqpin: Cache mapped IRQ
Cache IRQ in domain_irq variable instead of
making use of irq_find_mapping(). While at it
rename the irq variable to requested_irq.
Signed-off-by: Magnus Damm <damm@opensource.se>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'drivers/irqchip/irq-renesas-intc-irqpin.c')
-rw-r--r-- | drivers/irqchip/irq-renesas-intc-irqpin.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c index 4b5933fc0e3d..0ac2bf683378 100644 --- a/drivers/irqchip/irq-renesas-intc-irqpin.c +++ b/drivers/irqchip/irq-renesas-intc-irqpin.c | |||
@@ -61,7 +61,8 @@ struct intc_irqpin_iomem { | |||
61 | 61 | ||
62 | struct intc_irqpin_irq { | 62 | struct intc_irqpin_irq { |
63 | int hw_irq; | 63 | int hw_irq; |
64 | int irq; | 64 | int requested_irq; |
65 | int domain_irq; | ||
65 | struct intc_irqpin_priv *p; | 66 | struct intc_irqpin_priv *p; |
66 | }; | 67 | }; |
67 | 68 | ||
@@ -171,8 +172,7 @@ static int intc_irqpin_set_sense(struct intc_irqpin_priv *p, int irq, int value) | |||
171 | static void intc_irqpin_dbg(struct intc_irqpin_irq *i, char *str) | 172 | static void intc_irqpin_dbg(struct intc_irqpin_irq *i, char *str) |
172 | { | 173 | { |
173 | dev_dbg(&i->p->pdev->dev, "%s (%d:%d:%d)\n", | 174 | dev_dbg(&i->p->pdev->dev, "%s (%d:%d:%d)\n", |
174 | str, i->irq, i->hw_irq, | 175 | str, i->requested_irq, i->hw_irq, i->domain_irq); |
175 | irq_find_mapping(i->p->irq_domain, i->hw_irq)); | ||
176 | } | 176 | } |
177 | 177 | ||
178 | static void intc_irqpin_irq_enable(struct irq_data *d) | 178 | static void intc_irqpin_irq_enable(struct irq_data *d) |
@@ -196,7 +196,7 @@ static void intc_irqpin_irq_disable(struct irq_data *d) | |||
196 | static void intc_irqpin_irq_enable_force(struct irq_data *d) | 196 | static void intc_irqpin_irq_enable_force(struct irq_data *d) |
197 | { | 197 | { |
198 | struct intc_irqpin_priv *p = irq_data_get_irq_chip_data(d); | 198 | struct intc_irqpin_priv *p = irq_data_get_irq_chip_data(d); |
199 | int irq = p->irq[irqd_to_hwirq(d)].irq; | 199 | int irq = p->irq[irqd_to_hwirq(d)].requested_irq; |
200 | 200 | ||
201 | intc_irqpin_irq_enable(d); | 201 | intc_irqpin_irq_enable(d); |
202 | irq_get_chip(irq)->irq_unmask(irq_get_irq_data(irq)); | 202 | irq_get_chip(irq)->irq_unmask(irq_get_irq_data(irq)); |
@@ -205,7 +205,7 @@ static void intc_irqpin_irq_enable_force(struct irq_data *d) | |||
205 | static void intc_irqpin_irq_disable_force(struct irq_data *d) | 205 | static void intc_irqpin_irq_disable_force(struct irq_data *d) |
206 | { | 206 | { |
207 | struct intc_irqpin_priv *p = irq_data_get_irq_chip_data(d); | 207 | struct intc_irqpin_priv *p = irq_data_get_irq_chip_data(d); |
208 | int irq = p->irq[irqd_to_hwirq(d)].irq; | 208 | int irq = p->irq[irqd_to_hwirq(d)].requested_irq; |
209 | 209 | ||
210 | irq_get_chip(irq)->irq_mask(irq_get_irq_data(irq)); | 210 | irq_get_chip(irq)->irq_mask(irq_get_irq_data(irq)); |
211 | intc_irqpin_irq_disable(d); | 211 | intc_irqpin_irq_disable(d); |
@@ -246,7 +246,7 @@ static irqreturn_t intc_irqpin_irq_handler(int irq, void *dev_id) | |||
246 | if (intc_irqpin_read(p, INTC_IRQPIN_REG_SOURCE) & bit) { | 246 | if (intc_irqpin_read(p, INTC_IRQPIN_REG_SOURCE) & bit) { |
247 | intc_irqpin_write(p, INTC_IRQPIN_REG_SOURCE, ~bit); | 247 | intc_irqpin_write(p, INTC_IRQPIN_REG_SOURCE, ~bit); |
248 | intc_irqpin_dbg(i, "demux2"); | 248 | intc_irqpin_dbg(i, "demux2"); |
249 | generic_handle_irq(irq_find_mapping(p->irq_domain, i->hw_irq)); | 249 | generic_handle_irq(i->domain_irq); |
250 | return IRQ_HANDLED; | 250 | return IRQ_HANDLED; |
251 | } | 251 | } |
252 | return IRQ_NONE; | 252 | return IRQ_NONE; |
@@ -257,6 +257,9 @@ static int intc_irqpin_irq_domain_map(struct irq_domain *h, unsigned int virq, | |||
257 | { | 257 | { |
258 | struct intc_irqpin_priv *p = h->host_data; | 258 | struct intc_irqpin_priv *p = h->host_data; |
259 | 259 | ||
260 | p->irq[hw].domain_irq = virq; | ||
261 | p->irq[hw].hw_irq = hw; | ||
262 | |||
260 | intc_irqpin_dbg(&p->irq[hw], "map"); | 263 | intc_irqpin_dbg(&p->irq[hw], "map"); |
261 | irq_set_chip_data(virq, h->host_data); | 264 | irq_set_chip_data(virq, h->host_data); |
262 | irq_set_chip_and_handler(virq, &p->irq_chip, handle_level_irq); | 265 | irq_set_chip_and_handler(virq, &p->irq_chip, handle_level_irq); |
@@ -314,9 +317,8 @@ static int intc_irqpin_probe(struct platform_device *pdev) | |||
314 | if (!irq) | 317 | if (!irq) |
315 | break; | 318 | break; |
316 | 319 | ||
317 | p->irq[k].hw_irq = k; | ||
318 | p->irq[k].p = p; | 320 | p->irq[k].p = p; |
319 | p->irq[k].irq = irq->start; | 321 | p->irq[k].requested_irq = irq->start; |
320 | } | 322 | } |
321 | 323 | ||
322 | p->number_of_irqs = k; | 324 | p->number_of_irqs = k; |
@@ -389,7 +391,8 @@ static int intc_irqpin_probe(struct platform_device *pdev) | |||
389 | 391 | ||
390 | /* request and set priority on interrupts one by one */ | 392 | /* request and set priority on interrupts one by one */ |
391 | for (k = 0; k < p->number_of_irqs; k++) { | 393 | for (k = 0; k < p->number_of_irqs; k++) { |
392 | if (request_irq(p->irq[k].irq, intc_irqpin_irq_handler, | 394 | if (request_irq(p->irq[k].requested_irq, |
395 | intc_irqpin_irq_handler, | ||
393 | 0, name, &p->irq[k])) { | 396 | 0, name, &p->irq[k])) { |
394 | dev_err(&pdev->dev, "failed to request low IRQ\n"); | 397 | dev_err(&pdev->dev, "failed to request low IRQ\n"); |
395 | ret = -ENOENT; | 398 | ret = -ENOENT; |
@@ -402,17 +405,16 @@ static int intc_irqpin_probe(struct platform_device *pdev) | |||
402 | 405 | ||
403 | /* warn in case of mismatch if irq base is specified */ | 406 | /* warn in case of mismatch if irq base is specified */ |
404 | if (p->config.irq_base) { | 407 | if (p->config.irq_base) { |
405 | k = irq_find_mapping(p->irq_domain, 0); | 408 | if (p->config.irq_base != p->irq[0].domain_irq) |
406 | if (p->config.irq_base != k) | ||
407 | dev_warn(&pdev->dev, "irq base mismatch (%d/%d)\n", | 409 | dev_warn(&pdev->dev, "irq base mismatch (%d/%d)\n", |
408 | p->config.irq_base, k); | 410 | p->config.irq_base, p->irq[0].domain_irq); |
409 | } | 411 | } |
410 | 412 | ||
411 | return 0; | 413 | return 0; |
412 | 414 | ||
413 | err3: | 415 | err3: |
414 | for (; k >= 0; k--) | 416 | for (; k >= 0; k--) |
415 | free_irq(p->irq[k - 1].irq, &p->irq[k - 1]); | 417 | free_irq(p->irq[k - 1].requested_irq, &p->irq[k - 1]); |
416 | 418 | ||
417 | irq_domain_remove(p->irq_domain); | 419 | irq_domain_remove(p->irq_domain); |
418 | err2: | 420 | err2: |
@@ -430,7 +432,7 @@ static int intc_irqpin_remove(struct platform_device *pdev) | |||
430 | int k; | 432 | int k; |
431 | 433 | ||
432 | for (k = 0; k < p->number_of_irqs; k++) | 434 | for (k = 0; k < p->number_of_irqs; k++) |
433 | free_irq(p->irq[k].irq, &p->irq[k]); | 435 | free_irq(p->irq[k].requested_irq, &p->irq[k]); |
434 | 436 | ||
435 | irq_domain_remove(p->irq_domain); | 437 | irq_domain_remove(p->irq_domain); |
436 | 438 | ||