lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 590/862] spmi: pmic-arb: correct duplicate APID to PPID mapping logic
    Date
    From: David Collins <collinsd@codeaurora.org>

    [ 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: 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>
    Link: https://lore.kernel.org/r/1655004286-11493-7-git-send-email-quic_fenglinw@quicinc.com
    Signed-off-by: Stephen Boyd <sboyd@kernel.org>
    Link: https://lore.kernel.org/r/20220930005019.2663064-8-sboyd@kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 2113be40b5a9..58f580e7aacc 100644
    --- a/drivers/spmi/spmi-pmic-arb.c
    +++ b/drivers/spmi/spmi-pmic-arb.c
    @@ -992,7 +992,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);
    @@ -1015,16 +1016,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.35.1


    \
     
     \ /
      Last update: 2022-10-19 11:34    [W:2.767 / U:0.368 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site