Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2177fa0b authored by David Collins's avatar David Collins Committed by Greg Kroah-Hartman
Browse files

spmi: pmic-arb: correct duplicate APID to PPID mapping logic 



[ Upstream commit 1f1693118c2476cb1666ad357edcf3cf48bf9b16 ]

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: 40f318f0 ("spmi: pmic-arb: add support for HW version 5")
Signed-off-by: default avatarDavid Collins <collinsd@codeaurora.org>
Signed-off-by: default avatarFenglin Wu <quic_fenglinw@quicinc.com>
Link: https://lore.kernel.org/r/1655004286-11493-7-git-send-email-quic_fenglinw@quicinc.com


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
Link: https://lore.kernel.org/r/20220930005019.2663064-8-sboyd@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f3289eb9

drivers/spmi/spmi-pmic-arb.c

+7 −6
Original line number Diff line number Diff line
@@ -867,7 +867,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);
@@ -890,16 +891,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 &&

		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;