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>, Kiran Gunda <kgunda@codeaurora.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	David Collins <collinsd@codeaurora.org>
Cc: <subbaram@codeaurora.org>, <quic_fenglinw@quicinc.com>,
	<tglx@linutronix.de>, <maz@kernel.org>
Subject: [RESEND PATCH v2 05/11] spmi: pmic-arb: correct duplicate APID to PPID mapping logic
Date: Fri, 12 Nov 2021 12:24:13 +0800	[thread overview]
Message-ID: <1636691059-4305-6-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>

Correct the way that duplicate PPID mappings are handled for PMIC
arbiter v5.  The final APID mapped to a given PPID should be the
one which has write owner = APPS EE, if it exists, or if not
that, then the first APID mapped to the PPID, if it exists.

Fixes: 40f318f0ed67 ("spmi: pmic-arb: add support for HW version 5")
Signed-off-by: David Collins <collinsd@codeaurora.org>
Signed-off-by: Fenglin Wu <quic_fenglinw@quicinc.com>
---
 drivers/spmi/spmi-pmic-arb.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c
index 127a427..011044e 100644
--- a/drivers/spmi/spmi-pmic-arb.c
+++ b/drivers/spmi/spmi-pmic-arb.c
@@ -925,7 +925,8 @@ static int pmic_arb_read_apid_map_v5(struct spmi_pmic_arb *pmic_arb)
 	 * version 5, there is more than one APID mapped to each PPID.
 	 * The owner field for each of these mappings specifies the EE which is
 	 * allowed to write to the APID.  The owner of the last (highest) APID
-	 * for a given PPID will receive interrupts from the PPID.
+	 * which has the IRQ owner bit set for a given PPID will receive
+	 * interrupts from the PPID.
 	 */
 	for (i = 0; ; i++, apidd++) {
 		offset = pmic_arb->ver_ops->apid_map_offset(i);
@@ -948,16 +949,16 @@ static int pmic_arb_read_apid_map_v5(struct spmi_pmic_arb *pmic_arb)
 		apid = pmic_arb->ppid_to_apid[ppid] & ~PMIC_ARB_APID_VALID;
 		prev_apidd = &pmic_arb->apid_data[apid];
 
-		if (valid && is_irq_ee &&
-				prev_apidd->write_ee == pmic_arb->ee) {
+		if (!valid || apidd->write_ee == pmic_arb->ee) {
+			/* First PPID mapping or one for this EE */
+			pmic_arb->ppid_to_apid[ppid] = i | PMIC_ARB_APID_VALID;
+		} else if (valid && is_irq_ee &&
+			   prev_apidd->write_ee == pmic_arb->ee) {
 			/*
 			 * Duplicate PPID mapping after the one for this EE;
 			 * override the irq owner
 			 */
 			prev_apidd->irq_ee = apidd->irq_ee;
-		} else if (!valid || is_irq_ee) {
-			/* First PPID mapping or duplicate for another EE */
-			pmic_arb->ppid_to_apid[ppid] = i | PMIC_ARB_APID_VALID;
 		}
 
 		apidd->ppid = ppid;
-- 
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 ` [RESEND PATCH v2 03/11] spmi: pmic-arb: check apid against limits before calling irq handler Fenglin Wu
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 ` Fenglin Wu [this message]
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-6-git-send-email-quic_fenglinw@quicinc.com \
    --to=quic_fenglinw@quicinc.com \
    --cc=collinsd@codeaurora.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=kgunda@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).