leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

irqchip: intc-irqpin: Cache mapped IRQ

Browse Source 
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>
This commit is contained in:
Magnus Damm 2013-02-26 20:58:54 +09:00 committed by Simon Horman
parent 862d309883
commit 33f958f2a7
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/irqchip/irq-renesas-intc-irqpin.c
View File

@ -61,7 +61,8 @@ struct intc_irqpin_iomem {
struct intc_irqpin_irq { struct intc_irqpin_irq {
int hw_irq; int hw_irq;
int irq; int requested_irq;
int domain_irq;
struct intc_irqpin_priv *p; struct intc_irqpin_priv *p;
}; };
@ -171,8 +172,7 @@ static int intc_irqpin_set_sense(struct intc_irqpin_priv *p, int irq, int value)
static void intc_irqpin_dbg(struct intc_irqpin_irq *i, char *str) static void intc_irqpin_dbg(struct intc_irqpin_irq *i, char *str)
{ {
dev_dbg(&i->p->pdev->dev, "%s (%d:%d:%d)\n", dev_dbg(&i->p->pdev->dev, "%s (%d:%d:%d)\n",
str, i->irq, i->hw_irq, str, i->requested_irq, i->hw_irq, i->domain_irq);
irq_find_mapping(i->p->irq_domain, i->hw_irq));
} }
static void intc_irqpin_irq_enable(struct irq_data *d) static void intc_irqpin_irq_enable(struct irq_data *d)
@ -196,7 +196,7 @@ static void intc_irqpin_irq_disable(struct irq_data *d)
static void intc_irqpin_irq_enable_force(struct irq_data *d) static void intc_irqpin_irq_enable_force(struct irq_data *d)
{ {
struct intc_irqpin_priv *p = irq_data_get_irq_chip_data(d); struct intc_irqpin_priv *p = irq_data_get_irq_chip_data(d);
int irq = p->irq[irqd_to_hwirq(d)].irq; int irq = p->irq[irqd_to_hwirq(d)].requested_irq;
intc_irqpin_irq_enable(d); intc_irqpin_irq_enable(d);
irq_get_chip(irq)->irq_unmask(irq_get_irq_data(irq)); 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)
static void intc_irqpin_irq_disable_force(struct irq_data *d) static void intc_irqpin_irq_disable_force(struct irq_data *d)
{ {
struct intc_irqpin_priv *p = irq_data_get_irq_chip_data(d); struct intc_irqpin_priv *p = irq_data_get_irq_chip_data(d);
int irq = p->irq[irqd_to_hwirq(d)].irq; int irq = p->irq[irqd_to_hwirq(d)].requested_irq;
irq_get_chip(irq)->irq_mask(irq_get_irq_data(irq)); irq_get_chip(irq)->irq_mask(irq_get_irq_data(irq));
intc_irqpin_irq_disable(d); intc_irqpin_irq_disable(d);
@ -246,7 +246,7 @@ static irqreturn_t intc_irqpin_irq_handler(int irq, void *dev_id)
if (intc_irqpin_read(p, INTC_IRQPIN_REG_SOURCE) & bit) { if (intc_irqpin_read(p, INTC_IRQPIN_REG_SOURCE) & bit) {
intc_irqpin_write(p, INTC_IRQPIN_REG_SOURCE, ~bit); intc_irqpin_write(p, INTC_IRQPIN_REG_SOURCE, ~bit);
intc_irqpin_dbg(i, "demux2"); intc_irqpin_dbg(i, "demux2");
generic_handle_irq(irq_find_mapping(p->irq_domain, i->hw_irq)); generic_handle_irq(i->domain_irq);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
return IRQ_NONE; return IRQ_NONE;
@ -257,6 +257,9 @@ static int intc_irqpin_irq_domain_map(struct irq_domain *h, unsigned int virq,
{ {
struct intc_irqpin_priv *p = h->host_data; struct intc_irqpin_priv *p = h->host_data;
p->irq[hw].domain_irq = virq;
p->irq[hw].hw_irq = hw;
intc_irqpin_dbg(&p->irq[hw], "map"); intc_irqpin_dbg(&p->irq[hw], "map");
irq_set_chip_data(virq, h->host_data); irq_set_chip_data(virq, h->host_data);
irq_set_chip_and_handler(virq, &p->irq_chip, handle_level_irq); 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)
if (!irq) if (!irq)
break; break;
p->irq[k].hw_irq = k;
p->irq[k].p = p; p->irq[k].p = p;
p->irq[k].irq = irq->start; p->irq[k].requested_irq = irq->start;
} }
p->number_of_irqs = k; p->number_of_irqs = k;
@ -389,7 +391,8 @@ static int intc_irqpin_probe(struct platform_device *pdev)
/* request and set priority on interrupts one by one */ /* request and set priority on interrupts one by one */
for (k = 0; k < p->number_of_irqs; k++) { for (k = 0; k < p->number_of_irqs; k++) {
if (request_irq(p->irq[k].irq, intc_irqpin_irq_handler, if (request_irq(p->irq[k].requested_irq,
intc_irqpin_irq_handler,
0, name, &p->irq[k])) { 0, name, &p->irq[k])) {
dev_err(&pdev->dev, "failed to request low IRQ\n"); dev_err(&pdev->dev, "failed to request low IRQ\n");
ret = -ENOENT; ret = -ENOENT;
@ -402,17 +405,16 @@ static int intc_irqpin_probe(struct platform_device *pdev)
/* warn in case of mismatch if irq base is specified */ /* warn in case of mismatch if irq base is specified */
if (p->config.irq_base) { if (p->config.irq_base) {
k = irq_find_mapping(p->irq_domain, 0); if (p->config.irq_base != p->irq[0].domain_irq)
if (p->config.irq_base != k)
dev_warn(&pdev->dev, "irq base mismatch (%d/%d)\n", dev_warn(&pdev->dev, "irq base mismatch (%d/%d)\n",
p->config.irq_base, k); p->config.irq_base, p->irq[0].domain_irq);
} }
return 0; return 0;
err3: err3:
for (; k >= 0; k--) for (; k >= 0; k--)
free_irq(p->irq[k - 1].irq, &p->irq[k - 1]); free_irq(p->irq[k - 1].requested_irq, &p->irq[k - 1]);
irq_domain_remove(p->irq_domain); irq_domain_remove(p->irq_domain);
err2: err2:
@ -430,7 +432,7 @@ static int intc_irqpin_remove(struct platform_device *pdev)
int k; int k;
for (k = 0; k < p->number_of_irqs; k++) for (k = 0; k < p->number_of_irqs; k++)
free_irq(p->irq[k].irq, &p->irq[k]); free_irq(p->irq[k].requested_irq, &p->irq[k]);
irq_domain_remove(p->irq_domain); irq_domain_remove(p->irq_domain);