Re: [PATCH] spmi: pmic-arb: Always allocate ppid_to_apid table

Path	csiph.com!news.mixmin.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod
From	kgunda@codeaurora.org
Newsgroups	linux.kernel
Subject	Re: [PATCH] spmi: pmic-arb: Always allocate ppid_to_apid table
Date	Wed, 28 Jun 2017 09:00:01 +0200
Message-ID	<tXf7b-3qv-9@gated-at.bofh.it> (permalink)
References	<tWOgG-2mL-29@gated-at.bofh.it>
X-Original-To	Stephen Boyd <sboyd@codeaurora.org>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1498633131; bh=9kz9q9RfsKRe3X40hhLbHr2kX9TuPEuNfT1TC86qAAY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=fcWgHTjIIuTRRYvXVl1ULFIntp5v0l4v8Nw2AIAITPW1wpQ0sae3N1T1bC/d/yDWv x8+j/bXTNY7K3pd0e/1xF4bUUKCSOxTU4fADggJCep6wVv915PZvIVg5mbKNXHhe2m OkwQvx8058hh7iwRqxNyybdvyj4UfoO4FRv64vac=
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1498633130; bh=9kz9q9RfsKRe3X40hhLbHr2kX9TuPEuNfT1TC86qAAY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=i/9otntnYDkO2ruRv24nWaeU3VpP9GWmu8fc1CyP5aRcl8GOPI/OGtc2jUfjMzPKu NpFbNVrPxCTLhk4Vq95ugBLPjLW/eYOlNfmRbVbCuqoUo6hNrE13XXUMhvIFzJL682 hKb+Vhu8dV552augWTEYwd/96QtpWaZQOqoAH12c=
MIME-Version	1.0
Content-Type	text/plain; charset=US-ASCII; format=flowed
Content-Transfer-Encoding	7bit
X-Sender	kgunda@codeaurora.org
User-Agent	Roundcube Webmail/1.2.5
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	63
Organization	linux.* mail to news gateway
X-Original-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
X-Original-Date	Wed, 28 Jun 2017 12:28:50 +0530
X-Original-Message-ID	<50b43f2e54cb0b2260a249ed07fe21ce@codeaurora.org>
X-Original-References	<20170627021746.22445-1-sboyd@codeaurora.org>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1676409

Show key headers only | View raw

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>
> ---
>  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 !

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH] spmi: pmic-arb: Always allocate ppid_to_apid table Stephen Boyd <sboyd@codeaurora.org> - 2017-06-27 04:20 +0200
  Re: [PATCH] spmi: pmic-arb: Always allocate ppid_to_apid table kgunda@codeaurora.org - 2017-06-28 09:00 +0200

csiph-web