Commit 135ef21a authored by Brian Masney's avatar Brian Masney Committed by Linus Walleij

spmi: pmic-arb: validate type when mapping IRQ

qpnpint_irq_domain_map did not validate the IRQ type and this can cause
IRQs to not work as expected if an unsupported type (such as
IRQ_TYPE_NONE) is passed in. Now that spmi-gpio is a hierarchical IRQ
controller, and all device tree bindings have been updated, add
additional validation to the type field.
Signed-off-by: default avatarBrian Masney <masneyb@onstation.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent f14a5e6d
......@@ -740,7 +740,7 @@ static int qpnpint_irq_domain_translate(struct irq_domain *d,
}
static void qpnpint_irq_domain_map(struct spmi_pmic_arb *pmic_arb,
static int qpnpint_irq_domain_map(struct spmi_pmic_arb *pmic_arb,
struct irq_domain *domain, unsigned int virq,
irq_hw_number_t hwirq, unsigned int type)
{
......@@ -756,11 +756,15 @@ static void qpnpint_irq_domain_map(struct spmi_pmic_arb *pmic_arb,
if (type & IRQ_TYPE_EDGE_BOTH)
handler = handle_edge_irq;
else
else if (type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))
handler = handle_level_irq;
else
return -EINVAL;
irq_domain_set_info(domain, virq, hwirq, &pmic_arb_irqchip, pmic_arb,
handler, NULL, NULL);
return 0;
}
static int qpnpint_irq_domain_alloc(struct irq_domain *domain,
......@@ -777,9 +781,12 @@ static int qpnpint_irq_domain_alloc(struct irq_domain *domain,
if (ret)
return ret;
for (i = 0; i < nr_irqs; i++)
qpnpint_irq_domain_map(pmic_arb, domain, virq + i, hwirq + i,
type);
for (i = 0; i < nr_irqs; i++) {
ret = qpnpint_irq_domain_map(pmic_arb, domain, virq + i,
hwirq + i, type);
if (ret)
return ret;
}
return 0;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment