From: Brian Masney <masneyb@onstation.org>
To: linus.walleij@linaro.org, sboyd@kernel.org,
bjorn.andersson@linaro.org, andy.gross@linaro.org,
marc.zyngier@arm.com
Cc: shawnguo@kernel.org, dianders@chromium.org,
linux-gpio@vger.kernel.org, nicolas.dechesne@linaro.org,
niklas.cassel@linaro.org, david.brown@linaro.org,
robh+dt@kernel.org, mark.rutland@arm.com,
thierry.reding@gmail.com, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org
Subject: [PATCH v6 14/15] spmi: pmic-arb: validate type when mapping IRQ
Date: Sat, 19 Jan 2019 15:42:51 -0500 [thread overview]
Message-ID: <20190119204252.18370-15-masneyb@onstation.org> (raw)
In-Reply-To: <20190119204252.18370-1-masneyb@onstation.org>
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: Brian Masney <masneyb@onstation.org>
---
Patch introduced in v6
drivers/spmi/spmi-pmic-arb.c | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c
index bc7dc1d6e4b2..5666b99c9a92 100644
--- a/drivers/spmi/spmi-pmic-arb.c
+++ b/drivers/spmi/spmi-pmic-arb.c
@@ -740,9 +740,9 @@ static int qpnpint_irq_domain_translate(struct irq_domain *d,
}
-static void 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)
+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)
{
irq_flow_handler_t handler;
unsigned int old_virq;
@@ -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;
}
--
2.17.2
next prev parent reply other threads:[~2019-01-19 20:44 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-19 20:42 [PATCH v6 00/15] qcom: spmi: add support for hierarchical IRQ chip Brian Masney
2019-01-19 20:42 ` [PATCH v6 01/15] dt-bindings: pinctrl: qcom-pmic-gpio: add qcom,pmi8998-gpio binding Brian Masney
2019-01-19 20:42 ` [PATCH v6 02/15] pinctrl: qcom: spmi-gpio: add support for three new variants Brian Masney
2019-01-19 20:42 ` [PATCH v6 03/15] pinctrl: qcom: spmi-gpio: hardcode IRQ counts Brian Masney
2019-01-19 20:42 ` [PATCH v6 04/15] spmi: pmic-arb: convert to v2 irq interfaces to support hierarchical IRQ chips Brian Masney
2019-01-20 11:30 ` Marc Zyngier
2019-01-19 20:42 ` [PATCH v6 05/15] gpio: add irq domain activate/deactivate functions Brian Masney
2019-01-19 20:42 ` [PATCH v6 06/15] spmi: pmic-arb: disassociate old virq if hwirq mapping already exists Brian Masney
2019-01-19 20:42 ` [PATCH v6 07/15] qcom: spmi-gpio: add support for hierarchical IRQ chip Brian Masney
2019-01-20 11:32 ` Marc Zyngier
2019-01-19 20:42 ` [PATCH v6 08/15] ARM: dts: qcom: pm8941: add interrupt controller properties Brian Masney
2019-01-19 20:42 ` [PATCH v6 09/15] ARM: dts: qcom: pma8084: " Brian Masney
2019-01-19 20:42 ` [PATCH v6 10/15] arm64: dts: qcom: pm8005: " Brian Masney
2019-01-19 20:42 ` [PATCH v6 11/15] arm64: dts: qcom: pm8998: " Brian Masney
2019-01-19 20:42 ` [PATCH v6 12/15] arm64: dts: qcom: pmi8994: " Brian Masney
2019-01-19 20:42 ` [PATCH v6 13/15] arm64: dts: qcom: pmi8998: " Brian Masney
2019-01-19 20:42 ` Brian Masney [this message]
2019-01-19 20:42 ` [PATCH v6 15/15] spmi: pmic-arb: revert "disassociate old virq if hwirq mapping already exists" Brian Masney
2019-01-19 23:13 ` [PATCH v6 00/15] qcom: spmi: add support for hierarchical IRQ chip Linus Walleij
2019-01-20 11:36 ` Marc Zyngier
2019-01-22 15:31 ` Linus Walleij
2019-01-22 21:13 ` Andy Gross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190119204252.18370-15-masneyb@onstation.org \
--to=masneyb@onstation.org \
--cc=andy.gross@linaro.org \
--cc=bjorn.andersson@linaro.org \
--cc=david.brown@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=dianders@chromium.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=nicolas.dechesne@linaro.org \
--cc=niklas.cassel@linaro.org \
--cc=robh+dt@kernel.org \
--cc=sboyd@kernel.org \
--cc=shawnguo@kernel.org \
--cc=thierry.reding@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).