Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Reply-To: kieran.bingham+renesas@ideasonboard.com
Subject: Re: [PATCH] [v2] media: vsp1: Fix runtime PM imbalance on error
To:     Dinghao Liu <dinghao.liu@zju.edu.cn>, kjlu@umn.edu
Cc:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
        Mauro Carvalho Chehab <mchehab@kernel.org>,
        linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <20200608052919.4984-1-dinghao.liu@zju.edu.cn>
From:   Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Organization: Ideas on Board
Message-ID: <dad95caa-0cbc-7df2-8187-af5f38dee1da@ideasonboard.com>
Date:   Mon, 8 Jun 2020 22:29:56 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.7.0
MIME-Version: 1.0
In-Reply-To: <20200608052919.4984-1-dinghao.liu@zju.edu.cn>
Content-Type: text/plain; charset=utf-8
Content-Language: en-GB
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Hi Dinghao,

On 08/06/2020 06:29, Dinghao Liu wrote:
> pm_runtime_get_sync() increments the runtime PM usage counter even
> when it returns an error code. Thus a pairing decrement is needed on
> the error handling path to keep the counter balanced.
> 

Looks good to me:

Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

> Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
> ---
> 
> Changelog:
> 
> v2: - Fix the imbalance in vsp1_device_get().
>       Use vsp1_device_get() and vsp1_device_put()
>       to replace pm_runtime_get_sync() and
>       pm_runtime_put_sync() in vsp1_probe().

That looks like a helpful addition!

> ---
>  drivers/media/platform/vsp1/vsp1_drv.c | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c
> index c650e45bb0ad..dc62533cf32c 100644
> --- a/drivers/media/platform/vsp1/vsp1_drv.c
> +++ b/drivers/media/platform/vsp1/vsp1_drv.c
> @@ -562,7 +562,12 @@ int vsp1_device_get(struct vsp1_device *vsp1)
>  	int ret;
>  
>  	ret = pm_runtime_get_sync(vsp1->dev);
> -	return ret < 0 ? ret : 0;
> +	if (ret < 0) {
> +		pm_runtime_put_noidle(vsp1->dev);

Hrm... I was going to query the _noidle here, as I presume the device is
likely already idle ... but actually this looks like it simply adds
protection against decrementing the refcnt below zero, so it is likely
useful.


> +		return ret;
> +	}
> +
> +	return 0;
>  }
>  
>  /*
> @@ -845,12 +850,12 @@ static int vsp1_probe(struct platform_device *pdev)
>  	/* Configure device parameters based on the version register. */
>  	pm_runtime_enable(&pdev->dev);
>  
> -	ret = pm_runtime_get_sync(&pdev->dev);
> +	ret = vsp1_device_get(vsp1);
>  	if (ret < 0)
>  		goto done;
>  
>  	vsp1->version = vsp1_read(vsp1, VI6_IP_VERSION);
> -	pm_runtime_put_sync(&pdev->dev);
> +	vsp1_device_put(vsp1);
>  
>  	for (i = 0; i < ARRAY_SIZE(vsp1_device_infos); ++i) {
>  		if ((vsp1->version & VI6_IP_VERSION_MODEL_MASK) ==
>