Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752155AbdGILjL (ORCPT ); Sun, 9 Jul 2017 07:39:11 -0400 Received: from mail.z3ntu.xyz ([128.199.32.197]:35804 "EHLO mail.z3ntu.xyz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751774AbdGILjK (ORCPT ); Sun, 9 Jul 2017 07:39:10 -0400 X-Greylist: delayed 479 seconds by postgrey-1.27 at vger.kernel.org; Sun, 09 Jul 2017 07:39:10 EDT From: Luca Weiss To: Stephen Boyd Cc: Greg Kroah-Hartman , linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Abhijeet Dharmapurikar , Kiran Gunda Subject: Re: spmi: pmic-arb: Always allocate ppid_to_apid table Date: Sun, 09 Jul 2017 13:31:07 +0200 Message-ID: <1570691.3NiRTdm5OM@g550jk> In-Reply-To: <20170627021746.22445-1-sboyd@codeaurora.org> References: <20170627021746.22445-1-sboyd@codeaurora.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2085 Lines: 60 On Dienstag, 27. Juni 2017 04:17:46 CEST 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 > Cc: Kiran Gunda > Fixes: 7f1d4e58dabb ("spmi: pmic-arb: optimize table lookups") > Signed-off-by: Stephen Boyd > Reviewed-by: Kiran Gunda > --- > 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", Tested-by: Luca Weiss