linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Fenglin Wu <quic_fenglinw@quicinc.com>
To: <linux-arm-msm@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<sboyd@kernel.org>
Cc: <collinsd@codeaurora.org>, <subbaram@codeaurora.org>,
	<quic_fenglinw@quicinc.com>, <tglx@linutronix.de>,
	<maz@kernel.org>
Subject: [RESEND PATCH v2 03/11] spmi: pmic-arb: check apid against limits before calling irq handler
Date: Fri, 12 Nov 2021 12:24:11 +0800	[thread overview]
Message-ID: <1636691059-4305-4-git-send-email-quic_fenglinw@quicinc.com> (raw)
In-Reply-To: <1636691059-4305-1-git-send-email-quic_fenglinw@quicinc.com>

From: David Collins <collinsd@codeaurora.org>

Check that the apid for an SPMI interrupt falls between the
min_apid and max_apid that can be handled by the APPS processor
before invoking the per-apid interrupt handler:
periph_interrupt().

This avoids an access violation in rare cases where the status
bit is set for an interrupt that is not owned by the APPS
processor.

Signed-off-by: David Collins <collinsd@codeaurora.org>
Signed-off-by: Fenglin Wu <quic_fenglinw@quicinc.com>
---
 drivers/spmi/spmi-pmic-arb.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c
index ce7ae99..479f721 100644
--- a/drivers/spmi/spmi-pmic-arb.c
+++ b/drivers/spmi/spmi-pmic-arb.c
@@ -523,21 +523,26 @@ static void pmic_arb_chained_irq(struct irq_desc *desc)
 	struct spmi_pmic_arb *pmic_arb = irq_desc_get_handler_data(desc);
 	const struct pmic_arb_ver_ops *ver_ops = pmic_arb->ver_ops;
 	struct irq_chip *chip = irq_desc_get_chip(desc);
-	int first = pmic_arb->min_apid >> 5;
-	int last = pmic_arb->max_apid >> 5;
+	int first = pmic_arb->min_apid;
+	int last = pmic_arb->max_apid;
 	u8 ee = pmic_arb->ee;
 	u32 status, enable, handled = 0;
 	int i, id, apid;
 
 	chained_irq_enter(chip, desc);
 
-	for (i = first; i <= last; ++i) {
+	for (i = first >> 5; i <= last >> 5; ++i) {
 		status = readl_relaxed(
 				ver_ops->owner_acc_status(pmic_arb, ee, i));
 		while (status) {
 			id = ffs(status) - 1;
 			status &= ~BIT(id);
 			apid = id + i * 32;
+			if (apid < first || apid > last) {
+				WARN_ONCE(true, "spurious spmi irq received for apid=%d\n",
+					apid);
+				continue;
+			}
 			enable = readl_relaxed(
 					ver_ops->acc_enable(pmic_arb, apid));
 			if (enable & SPMI_PIC_ACC_ENABLE_BIT)
-- 
2.7.4


  parent reply	other threads:[~2021-11-12  4:25 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-12  4:24 [RESEND PATCH v2 00/11] A bunch of fix and optimization patches in spmi-pmic-arb.c Fenglin Wu
2021-11-12  4:24 ` [RESEND PATCH v2 01/11] spmi: pmic-arb: handle spurious interrupt Fenglin Wu
2021-11-12  4:24 ` [RESEND PATCH v2 02/11] spmi: pmic-arb: do not ack and clear peripheral interrupts in cleanup_irq Fenglin Wu
2021-11-12  4:24 ` Fenglin Wu [this message]
2021-11-12  4:24 ` [RESEND PATCH v2 04/11] spmi: pmic-arb: add support to dispatch interrupt based on IRQ status Fenglin Wu
2021-11-12  4:24 ` [RESEND PATCH v2 05/11] spmi: pmic-arb: correct duplicate APID to PPID mapping logic Fenglin Wu
2021-11-12  4:24 ` [RESEND PATCH v2 06/11] spmi: pmic-arb: block access for invalid PMIC arbiter v5 SPMI writes Fenglin Wu
2021-11-12  4:24 ` [RESEND PATCH v2 07/11] spmi: pmic-arb: clear unexpected interrupt trigger type Fenglin Wu
2021-11-12  4:24 ` [RESEND PATCH v2 08/11] bindings: spmi: spmi-pmic-arb: mark interrupt properties as optional Fenglin Wu
2021-11-12 15:13   ` Rob Herring
2021-11-12  4:24 ` [RESEND PATCH v2 09/11] spmi: pmic-arb: make interrupt support optional Fenglin Wu
2021-11-12  4:24 ` [RESEND PATCH v2 10/11] spmi: pmic-arb: increase SPMI transaction timeout delay Fenglin Wu
2021-11-12  4:24 ` [RESEND PATCH v2 11/11] dt-bindings: convert qcom,spmi-pmic-arb binding to YAML format Fenglin Wu
2021-11-12 13:48   ` Rob Herring
2021-11-15  0:16     ` Fenglin Wu
2021-11-15  6:38       ` Fenglin Wu

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=1636691059-4305-4-git-send-email-quic_fenglinw@quicinc.com \
    --to=quic_fenglinw@quicinc.com \
    --cc=collinsd@codeaurora.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maz@kernel.org \
    --cc=sboyd@kernel.org \
    --cc=subbaram@codeaurora.org \
    --cc=tglx@linutronix.de \
    /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).