From: Frank Rowand <frowand.list@gmail.com>
To: kgunda@codeaurora.org, Stephen Boyd <sboyd@codeaurora.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Abhijeet Dharmapurikar <adharmap@codeaurora.org>,
linux-arm-msm-owner@vger.kernel.org
Subject: Re: [PATCH] spmi: pmic-arb: Always allocate ppid_to_apid table
Date: Tue, 18 Jul 2017 16:46:21 -0700 [thread overview]
Message-ID: <596E9DCD.7030009@gmail.com> (raw)
In-Reply-To: <50b43f2e54cb0b2260a249ed07fe21ce@codeaurora.org>
On 06/27/17 23:58, kgunda@codeaurora.org wrote:
> On 2017-06-27 07:47, Stephen Boyd wrote:
>> After commit 7f1d4e58dabb ("spmi: pmic-arb: optimize table
>> lookups") we always need the ppid_to_apid table regardless of the
>> version of pmic arbiter we have. Otherwise, we will try to deref
>> the array when we don't allocate it on v2 hardware like the
>> msm8974 SoCs.
>>
>> Cc: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
>> Cc: Kiran Gunda <kgunda@codeaurora.org>
>> Fixes: 7f1d4e58dabb ("spmi: pmic-arb: optimize table lookups")
>> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> Reviewed-by: Kiran Gunda <kgunda@codeaurora.org>
Tested on a qcom-apq8074-dragonboard on 4.13-rc1
Tested-by: Frank Rowand <frank.rowand@sony.com>
>> ---
>> drivers/spmi/spmi-pmic-arb.c | 17 +++++++----------
>> 1 file changed, 7 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c
>> index 2afe3597982e..f4b7a98a7913 100644
>> --- a/drivers/spmi/spmi-pmic-arb.c
>> +++ b/drivers/spmi/spmi-pmic-arb.c
>> @@ -134,7 +134,6 @@ struct apid_data {
>> * @spmic: SPMI controller object
>> * @ver_ops: version dependent operations.
>> * @ppid_to_apid in-memory copy of PPID -> channel (APID) mapping table.
>> - * v2 only.
>> */
>> struct spmi_pmic_arb {
>> void __iomem *rd_base;
>> @@ -1016,6 +1015,13 @@ static int spmi_pmic_arb_probe(struct
>> platform_device *pdev)
>> goto err_put_ctrl;
>> }
>>
>> + pa->ppid_to_apid = devm_kcalloc(&ctrl->dev, PMIC_ARB_MAX_PPID,
>> + sizeof(*pa->ppid_to_apid), GFP_KERNEL);
>> + if (!pa->ppid_to_apid) {
>> + err = -ENOMEM;
>> + goto err_put_ctrl;
>> + }
>> +
>> hw_ver = readl_relaxed(core + PMIC_ARB_VERSION);
>>
>> if (hw_ver < PMIC_ARB_VERSION_V2_MIN) {
>> @@ -1048,15 +1054,6 @@ static int spmi_pmic_arb_probe(struct
>> platform_device *pdev)
>> err = PTR_ERR(pa->wr_base);
>> goto err_put_ctrl;
>> }
>> -
>> - pa->ppid_to_apid = devm_kcalloc(&ctrl->dev,
>> - PMIC_ARB_MAX_PPID,
>> - sizeof(*pa->ppid_to_apid),
>> - GFP_KERNEL);
>> - if (!pa->ppid_to_apid) {
>> - err = -ENOMEM;
>> - goto err_put_ctrl;
>> - }
>> }
>>
>> dev_info(&ctrl->dev, "PMIC arbiter version %s (0x%x)\n",
> Thanks for the fix !
> --
> To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
WARNING: multiple messages have this Message-ID (diff)
From: frowand.list@gmail.com (Frank Rowand)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] spmi: pmic-arb: Always allocate ppid_to_apid table
Date: Tue, 18 Jul 2017 16:46:21 -0700 [thread overview]
Message-ID: <596E9DCD.7030009@gmail.com> (raw)
In-Reply-To: <50b43f2e54cb0b2260a249ed07fe21ce@codeaurora.org>
On 06/27/17 23:58, kgunda at codeaurora.org wrote:
> On 2017-06-27 07:47, Stephen Boyd wrote:
>> After commit 7f1d4e58dabb ("spmi: pmic-arb: optimize table
>> lookups") we always need the ppid_to_apid table regardless of the
>> version of pmic arbiter we have. Otherwise, we will try to deref
>> the array when we don't allocate it on v2 hardware like the
>> msm8974 SoCs.
>>
>> Cc: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
>> Cc: Kiran Gunda <kgunda@codeaurora.org>
>> Fixes: 7f1d4e58dabb ("spmi: pmic-arb: optimize table lookups")
>> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> Reviewed-by: Kiran Gunda <kgunda@codeaurora.org>
Tested on a qcom-apq8074-dragonboard on 4.13-rc1
Tested-by: Frank Rowand <frank.rowand@sony.com>
>> ---
>> drivers/spmi/spmi-pmic-arb.c | 17 +++++++----------
>> 1 file changed, 7 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c
>> index 2afe3597982e..f4b7a98a7913 100644
>> --- a/drivers/spmi/spmi-pmic-arb.c
>> +++ b/drivers/spmi/spmi-pmic-arb.c
>> @@ -134,7 +134,6 @@ struct apid_data {
>> * @spmic: SPMI controller object
>> * @ver_ops: version dependent operations.
>> * @ppid_to_apid in-memory copy of PPID -> channel (APID) mapping table.
>> - * v2 only.
>> */
>> struct spmi_pmic_arb {
>> void __iomem *rd_base;
>> @@ -1016,6 +1015,13 @@ static int spmi_pmic_arb_probe(struct
>> platform_device *pdev)
>> goto err_put_ctrl;
>> }
>>
>> + pa->ppid_to_apid = devm_kcalloc(&ctrl->dev, PMIC_ARB_MAX_PPID,
>> + sizeof(*pa->ppid_to_apid), GFP_KERNEL);
>> + if (!pa->ppid_to_apid) {
>> + err = -ENOMEM;
>> + goto err_put_ctrl;
>> + }
>> +
>> hw_ver = readl_relaxed(core + PMIC_ARB_VERSION);
>>
>> if (hw_ver < PMIC_ARB_VERSION_V2_MIN) {
>> @@ -1048,15 +1054,6 @@ static int spmi_pmic_arb_probe(struct
>> platform_device *pdev)
>> err = PTR_ERR(pa->wr_base);
>> goto err_put_ctrl;
>> }
>> -
>> - pa->ppid_to_apid = devm_kcalloc(&ctrl->dev,
>> - PMIC_ARB_MAX_PPID,
>> - sizeof(*pa->ppid_to_apid),
>> - GFP_KERNEL);
>> - if (!pa->ppid_to_apid) {
>> - err = -ENOMEM;
>> - goto err_put_ctrl;
>> - }
>> }
>>
>> dev_info(&ctrl->dev, "PMIC arbiter version %s (0x%x)\n",
> Thanks for the fix !
> --
> To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
next prev parent reply other threads:[~2017-07-18 23:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-27 2:17 [PATCH] spmi: pmic-arb: Always allocate ppid_to_apid table Stephen Boyd
2017-06-27 2:17 ` Stephen Boyd
2017-06-28 6:58 ` kgunda
2017-06-28 6:58 ` kgunda at codeaurora.org
2017-07-18 23:46 ` Frank Rowand [this message]
2017-07-18 23:46 ` Frank Rowand
2017-07-09 11:31 ` Luca Weiss
2017-07-09 11:31 ` Luca Weiss
2017-07-14 16:54 ` [PATCH] " Andy Gross
2017-07-14 16:54 ` Andy Gross
2017-07-17 12:57 ` Greg Kroah-Hartman
2017-07-17 12:57 ` Greg Kroah-Hartman
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=596E9DCD.7030009@gmail.com \
--to=frowand.list@gmail.com \
--cc=adharmap@codeaurora.org \
--cc=gregkh@linuxfoundation.org \
--cc=kgunda@codeaurora.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm-owner@vger.kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sboyd@codeaurora.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.