Received: by 10.223.185.116 with SMTP id b49csp3661662wrg;
        Tue, 13 Feb 2018 05:56:03 -0800 (PST)
X-Google-Smtp-Source: AH8x224rQQ7bLvAtTzjo7kkegbiP2fsFa9H5Ca9xdiAglMKcHOr6FWZiu3aqxh1iRe1XXimugqYe
X-Received: by 10.99.186.88 with SMTP id l24mr1037091pgu.369.1518530163669;
        Tue, 13 Feb 2018 05:56:03 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1518530163; cv=none;
        d=google.com; s=arc-20160816;
        b=moXoNH5tVfGn+zEcrqfa29663rsINSTFmWLyfbQ8lUQFcTxS1moJyCoPRhhcTGc3VN
         C8ld3gBR/uwA/La+wA6fNMS4J3z+9MswDqdHn0rNE2pq1aU7w87Xj7NHVtioGTTQkbCq
         zewhKcl2z29uUzdPn4g5AsMLxKAc3QbDSsNEZfvb9PkW+eTGIzfBoiCBE7v2Q1+aHVAL
         1mY4G5hyv/PVZ/58uVXjOkpjg1UhuP+s/RmHc81QhOJs2y9UfUmb7ySewkDoD4pc+odf
         OSc64Gv1KCPUAdAp4/0zkE1bNxV2zhPpLoUJzF6XNhEyp5Z/9GTKHNXrwnUZNkg3bm0D
         NCUA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=list-id:precedence:sender:content-transfer-encoding
         :content-language:in-reply-to:mime-version:user-agent:date
         :message-id:from:references:cc:to:subject:arc-authentication-results;
        bh=20lIa7AeRjoHmio+4PnJjUwtzW6J8pC+Vtz+jmjHx5c=;
        b=xwGb9aijdJawKN9PFw9+hFgtF6L7bgGwXE9fv7d8qpwQT62i5kqPAYwFGU0OIbMDLP
         tImHxESiH8hDXbOs+gdSS2tZxbUr7rKbRkT8EDRNICW9ZdFdxJGb3pPPOwSYGjhzi9Nw
         XbnZZO+OAKy1HMM4pxH63n00AVNh5sR16LbH178Pp0J5ZJKgMfSGVWjPgiZyN207Wgxj
         NZ19X6J+hAu7NvMWIaR6T/Z3d51mBgDX++P4VUlca4a2tpPsI7d8By6aU472563OT9RS
         PGkZEF0v5+vtjOqxY09Ct00hDbxoUpAeKyOEf8k7K92Ig1Tjgd1gRPgOGMNfBmyTQBtT
         AXYg==
ARC-Authentication-Results: i=1; mx.google.com;
       spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nvidia.com
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
        by mx.google.com with ESMTP id m15-v6si3627177pln.718.2018.02.13.05.55.49;
        Tue, 13 Feb 2018 05:56:03 -0800 (PST)
Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Authentication-Results: mx.google.com;
       spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nvidia.com
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S965039AbeBMNy4 (ORCPT <rfc822;mailist1go@gmail.com> + 99 others);
        Tue, 13 Feb 2018 08:54:56 -0500
Received: from hqemgate16.nvidia.com ([216.228.121.65]:9770 "EHLO
        hqemgate16.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S964846AbeBMNyy (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 13 Feb 2018 08:54:54 -0500
Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqemgate16.nvidia.com
        id <B5a82ee360000>; Tue, 13 Feb 2018 05:55:02 -0800
Received: from HQMAIL101.nvidia.com ([172.20.161.6])
  by hqpgpgate101.nvidia.com (PGP Universal service);
  Tue, 13 Feb 2018 05:54:54 -0800
X-PGP-Universal: processed;
        by hqpgpgate101.nvidia.com on Tue, 13 Feb 2018 05:54:54 -0800
Received: from UKMAIL101.nvidia.com (10.26.138.13) by HQMAIL101.nvidia.com
 (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Tue, 13 Feb
 2018 13:54:53 +0000
Received: from [10.21.132.129] (10.21.132.129) by UKMAIL101.nvidia.com
 (10.26.138.13) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Tue, 13 Feb
 2018 13:54:49 +0000
Subject: Re: [PATCH v6 4/4] soc/tegra: pmc: Use the new reset APIs to manage
 reset controllers
To:     Philipp Zabel <p.zabel@pengutronix.de>,
        <linux-kernel@vger.kernel.org>
CC:     Vivek Gautam <vivek.gautam@codeaurora.org>,
        Felipe Balbi <balbi@kernel.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        "Thierry Reding" <treding@nvidia.com>,
        <linux-tegra@vger.kernel.org>, <linux-usb@vger.kernel.org>,
        <linux-arm-msm@vger.kernel.org>
References: <20170619143408.15668-1-p.zabel@pengutronix.de>
 <20170619143408.15668-5-p.zabel@pengutronix.de>
From:   Jon Hunter <jonathanh@nvidia.com>
Message-ID: <90ef269d-cb8f-414f-ad56-faa933ad2e8a@nvidia.com>
Date:   Tue, 13 Feb 2018 13:54:49 +0000
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.6.0
MIME-Version: 1.0
In-Reply-To: <20170619143408.15668-5-p.zabel@pengutronix.de>
X-Originating-IP: [10.21.132.129]
X-ClientProxiedBy: UKMAIL101.nvidia.com (10.26.138.13) To UKMAIL101.nvidia.com
 (10.26.138.13)
Content-Type: text/plain; charset="utf-8"
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org



On 19/06/17 15:34, Philipp Zabel wrote:
> From: Vivek Gautam <vivek.gautam@codeaurora.org>
> 
> Make use of of_reset_control_array_get_exclusive() to manage
> an array of reset controllers available with the device.
> 
> Cc: Jon Hunter <jonathanh@nvidia.com>
> Cc: Thierry Reding <treding@nvidia.com>
> Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
> [p.zabel@pengutronix.de: switch to hidden reset control array]
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
> Changes since v5: updated commit message, added missing SoB
> ---
>  drivers/soc/tegra/pmc.c | 82 ++++++++++++-------------------------------------
>  1 file changed, 20 insertions(+), 62 deletions(-)
> 
> diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
> index e233dd5dcab3d..749b218147a19 100644
> --- a/drivers/soc/tegra/pmc.c
> +++ b/drivers/soc/tegra/pmc.c
> @@ -124,8 +124,7 @@ struct tegra_powergate {
>  	unsigned int id;
>  	struct clk **clks;
>  	unsigned int num_clks;
> -	struct reset_control **resets;
> -	unsigned int num_resets;
> +	struct reset_control *reset;
>  };
>  
>  struct tegra_io_pad_soc {
> @@ -348,32 +347,14 @@ static int tegra_powergate_enable_clocks(struct tegra_powergate *pg)
>  	return err;
>  }
>  
> -static int tegra_powergate_reset_assert(struct tegra_powergate *pg)
> +static inline int tegra_powergate_reset_assert(struct tegra_powergate *pg)
>  {
> -	unsigned int i;
> -	int err;
> -
> -	for (i = 0; i < pg->num_resets; i++) {
> -		err = reset_control_assert(pg->resets[i]);
> -		if (err)
> -			return err;
> -	}
> -
> -	return 0;
> +	return reset_control_assert(pg->reset);
>  }
>  
> -static int tegra_powergate_reset_deassert(struct tegra_powergate *pg)
> +static inline int tegra_powergate_reset_deassert(struct tegra_powergate *pg)
>  {
> -	unsigned int i;
> -	int err;
> -
> -	for (i = 0; i < pg->num_resets; i++) {
> -		err = reset_control_deassert(pg->resets[i]);
> -		if (err)
> -			return err;
> -	}
> -
> -	return 0;
> +	return reset_control_deassert(pg->reset);
>  }
>  
>  static int tegra_powergate_power_up(struct tegra_powergate *pg,
> @@ -566,8 +547,7 @@ int tegra_powergate_sequence_power_up(unsigned int id, struct clk *clk,
>  	pg.id = id;
>  	pg.clks = &clk;
>  	pg.num_clks = 1;
> -	pg.resets = &rst;
> -	pg.num_resets = 1;
> +	pg.reset = IS_ERR(rst) ? NULL : rst;
>  
>  	err = tegra_powergate_power_up(&pg, false);
>  	if (err)
> @@ -755,45 +735,26 @@ static int tegra_powergate_of_get_clks(struct tegra_powergate *pg,
>  static int tegra_powergate_of_get_resets(struct tegra_powergate *pg,
>  					 struct device_node *np, bool off)
>  {
> -	struct reset_control *rst;
> -	unsigned int i, count;
>  	int err;
>  
> -	count = of_count_phandle_with_args(np, "resets", "#reset-cells");
> -	if (count == 0)
> -		return -ENODEV;
> -
> -	pg->resets = kcalloc(count, sizeof(rst), GFP_KERNEL);
> -	if (!pg->resets)
> -		return -ENOMEM;
> -
> -	for (i = 0; i < count; i++) {
> -		pg->resets[i] = of_reset_control_get_by_index(np, i);
> -		if (IS_ERR(pg->resets[i])) {
> -			err = PTR_ERR(pg->resets[i]);
> -			goto error;
> -		}
> -
> -		if (off)
> -			err = reset_control_assert(pg->resets[i]);
> -		else
> -			err = reset_control_deassert(pg->resets[i]);
> -
> -		if (err) {
> -			reset_control_put(pg->resets[i]);
> -			goto error;
> -		}
> +	pg->reset = of_reset_control_array_get_exclusive(np);
> +	if (IS_ERR(pg->reset)) {
> +		pr_err("failed to get device resets\n");
> +		return PTR_ERR(pg->reset);
>  	}
>  
> -	pg->num_resets = count;
> +	if (off)
> +		err = reset_control_assert(pg->reset);
> +	else
> +		err = reset_control_deassert(pg->reset);
>  
> -	return 0;
> +	if (err)
> +		goto put_reset;
>  
> -error:
> -	while (i--)
> -		reset_control_put(pg->resets[i]);
> +	return 0;
>  
> -	kfree(pg->resets);
> +put_reset:
> +	reset_control_put(pg->reset);
>  
>  	return err;
>  }
> @@ -885,10 +846,7 @@ static void tegra_powergate_add(struct tegra_pmc *pmc, struct device_node *np)
>  	pm_genpd_remove(&pg->genpd);
>  
>  remove_resets:
> -	while (pg->num_resets--)
> -		reset_control_put(pg->resets[pg->num_resets]);
> -
> -	kfree(pg->resets);
> +	reset_control_put(pg->reset);
>  
>  remove_clks:
>  	while (pg->num_clks--)
> 

Acked-by: Jon Hunter <jonathanh@nvidia.com>
Tested-by: Jon Hunter <jonathanh@nvidia.com>

Cheers
Jon

-- 
nvpublic