From patchwork Tue May 30 12:38:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kiran Gunda X-Patchwork-Id: 9754559 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C7A64602B9 for ; Tue, 30 May 2017 12:43:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B72072847B for ; Tue, 30 May 2017 12:43:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ABD8E2847E; Tue, 30 May 2017 12:43:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F2002847B for ; Tue, 30 May 2017 12:43:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751712AbdE3Mj5 (ORCPT ); Tue, 30 May 2017 08:39:57 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:56868 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751148AbdE3Mjz (ORCPT ); Tue, 30 May 2017 08:39:55 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id DB897600C9; Tue, 30 May 2017 12:39:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1496147994; bh=0Qk1qyQMnnUmReLgEr/gitR+u1iPLXDgilNtatl6JOs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RzQqBoQ8eFKgsLsdm9bY8/FQSsemnqbKqCp6I5db8srCyZL5elOIVLGaNim85QloU DsnpJnadNS5cB1272jT+lrTWrNOJugPgFKREu7J9cyhH3e98rBXKKX6YUqzsaTHedc UpODMYtDDL+KyAgclnFyDLs9K6HAEI/2vucBXitM= Received: from kgunda-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: kgunda@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id E5C27600C9; Tue, 30 May 2017 12:39:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1496147994; bh=0Qk1qyQMnnUmReLgEr/gitR+u1iPLXDgilNtatl6JOs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RzQqBoQ8eFKgsLsdm9bY8/FQSsemnqbKqCp6I5db8srCyZL5elOIVLGaNim85QloU DsnpJnadNS5cB1272jT+lrTWrNOJugPgFKREu7J9cyhH3e98rBXKKX6YUqzsaTHedc UpODMYtDDL+KyAgclnFyDLs9K6HAEI/2vucBXitM= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org E5C27600C9 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=kgunda@codeaurora.org From: Kiran Gunda To: Kiran Gunda , Abhijeet Dharmapurikar , Subbaraman Narayanamurthy , Greg Kroah-Hartman , David Collins , Christophe JAILLET , linux-kernel@vger.kernel.org Cc: linux-arm-msm@vger.kernel.org, adharmap@quicinc.com, aghayal@qti.qualcomm.com, sboyd@codeaurora.org Subject: [PATCH V1 03/15] spmi: pmic-arb: fix inconsistent use of apid and chan Date: Tue, 30 May 2017 18:08:51 +0530 Message-Id: <1496147943-25822-4-git-send-email-kgunda@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1496147943-25822-1-git-send-email-kgunda@codeaurora.org> References: <1496147943-25822-1-git-send-email-kgunda@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Abhijeet Dharmapurikar The driver currently uses "apid" and "chan" to mean apid. Remove the use of chan and use only apid. On a SPMI bus there is allocation to manage up to 4K peripherals. However, in practice only few peripherals are instantiated and only few among the instantiated ones actually interrupt. APID is CPU's way of keeping track of peripherals that could interrupt. There is a table that maps the 256 interrupting peripherals to a number between 0 and 255. This number is called APID. Information about that interrupting peripheral is stored in registers offset by its corresponding apid. Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Kiran Gunda --- drivers/spmi/spmi-pmic-arb.c | 68 ++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c index 7f918ea..7201611 100644 --- a/drivers/spmi/spmi-pmic-arb.c +++ b/drivers/spmi/spmi-pmic-arb.c @@ -117,7 +117,7 @@ enum pmic_arb_cmd_op_code { * @spmic: SPMI controller object * @apid_to_ppid: in-memory copy of APID -> PPID mapping table. * @ver_ops: version dependent operations. - * @ppid_to_chan in-memory copy of PPID -> channel (APID) mapping table. + * @ppid_to_apid in-memory copy of PPID -> channel (APID) mapping table. * v2 only. */ struct spmi_pmic_arb { @@ -140,9 +140,9 @@ struct spmi_pmic_arb { struct spmi_controller *spmic; u16 *apid_to_ppid; const struct pmic_arb_ver_ops *ver_ops; - u16 *ppid_to_chan; - u16 last_channel; - u8 *chan_to_owner; + u16 *ppid_to_apid; + u16 last_apid; + u8 *apid_to_owner; }; /** @@ -772,22 +772,22 @@ static int qpnpint_irq_domain_map(struct irq_domain *d, return 0; } -static u16 pmic_arb_find_chan(struct spmi_pmic_arb *pa, u16 ppid) +static u16 pmic_arb_find_apid(struct spmi_pmic_arb *pa, u16 ppid) { u32 regval, offset; - u16 chan; + u16 apid; u16 id; /* * PMIC_ARB_REG_CHNL is a table in HW mapping channel to ppid. - * ppid_to_chan is an in-memory invert of that table. + * ppid_to_apid is an in-memory invert of that table. */ - for (chan = pa->last_channel; chan < pa->max_periph; chan++) { + for (apid = pa->last_apid; apid < pa->max_periph; apid++) { regval = readl_relaxed(pa->cnfg + - SPMI_OWNERSHIP_TABLE_REG(chan)); - pa->chan_to_owner[chan] = SPMI_OWNERSHIP_PERIPH2OWNER(regval); + SPMI_OWNERSHIP_TABLE_REG(apid)); + pa->apid_to_owner[apid] = SPMI_OWNERSHIP_PERIPH2OWNER(regval); - offset = PMIC_ARB_REG_CHNL(chan); + offset = PMIC_ARB_REG_CHNL(apid); if (offset >= pa->core_size) break; @@ -796,15 +796,15 @@ static u16 pmic_arb_find_chan(struct spmi_pmic_arb *pa, u16 ppid) continue; id = (regval >> 8) & PMIC_ARB_PPID_MASK; - pa->ppid_to_chan[id] = chan | PMIC_ARB_CHAN_VALID; + pa->ppid_to_apid[id] = apid | PMIC_ARB_CHAN_VALID; if (id == ppid) { - chan |= PMIC_ARB_CHAN_VALID; + apid |= PMIC_ARB_CHAN_VALID; break; } } - pa->last_channel = chan & ~PMIC_ARB_CHAN_VALID; + pa->last_apid = apid & ~PMIC_ARB_CHAN_VALID; - return chan; + return apid; } @@ -812,38 +812,38 @@ static u16 pmic_arb_find_chan(struct spmi_pmic_arb *pa, u16 ppid) pmic_arb_mode_v2(struct spmi_pmic_arb *pa, u8 sid, u16 addr, mode_t *mode) { u16 ppid = (sid << 8) | (addr >> 8); - u16 chan; + u16 apid; u8 owner; - chan = pa->ppid_to_chan[ppid]; - if (!(chan & PMIC_ARB_CHAN_VALID)) + apid = pa->ppid_to_apid[ppid]; + if (!(apid & PMIC_ARB_CHAN_VALID)) return -ENODEV; *mode = 0; *mode |= S_IRUSR; - chan &= ~PMIC_ARB_CHAN_VALID; - owner = pa->chan_to_owner[chan]; + apid &= ~PMIC_ARB_CHAN_VALID; + owner = pa->apid_to_owner[apid]; if (owner == pa->ee) *mode |= S_IWUSR; return 0; } -/* v2 offset per ppid (chan) and per ee */ +/* v2 offset per ppid and per ee */ static int pmic_arb_offset_v2(struct spmi_pmic_arb *pa, u8 sid, u16 addr, u32 *offset) { u16 ppid = (sid << 8) | (addr >> 8); - u16 chan; + u16 apid; - chan = pa->ppid_to_chan[ppid]; - if (!(chan & PMIC_ARB_CHAN_VALID)) - chan = pmic_arb_find_chan(pa, ppid); - if (!(chan & PMIC_ARB_CHAN_VALID)) + apid = pa->ppid_to_apid[ppid]; + if (!(apid & PMIC_ARB_CHAN_VALID)) + apid = pmic_arb_find_apid(pa, ppid); + if (!(apid & PMIC_ARB_CHAN_VALID)) return -ENODEV; - chan &= ~PMIC_ARB_CHAN_VALID; + apid &= ~PMIC_ARB_CHAN_VALID; - *offset = 0x1000 * pa->ee + 0x8000 * chan; + *offset = 0x1000 * pa->ee + 0x8000 * apid; return 0; } @@ -988,20 +988,20 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev) goto err_put_ctrl; } - pa->ppid_to_chan = devm_kcalloc(&ctrl->dev, + pa->ppid_to_apid = devm_kcalloc(&ctrl->dev, PMIC_ARB_MAX_PPID, - sizeof(*pa->ppid_to_chan), + sizeof(*pa->ppid_to_apid), GFP_KERNEL); - if (!pa->ppid_to_chan) { + if (!pa->ppid_to_apid) { err = -ENOMEM; goto err_put_ctrl; } - pa->chan_to_owner = devm_kcalloc(&ctrl->dev, + pa->apid_to_owner = devm_kcalloc(&ctrl->dev, pa->max_periph, - sizeof(*pa->chan_to_owner), + sizeof(*pa->apid_to_owner), GFP_KERNEL); - if (!pa->chan_to_owner) { + if (!pa->apid_to_owner) { err = -ENOMEM; goto err_put_ctrl; }