From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D792C433B4 for ; Wed, 5 May 2021 12:32:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 445BC613BF for ; Wed, 5 May 2021 12:32:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232397AbhEEMdy (ORCPT ); Wed, 5 May 2021 08:33:54 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:3024 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229793AbhEEMdx (ORCPT ); Wed, 5 May 2021 08:33:53 -0400 Received: from fraeml712-chm.china.huawei.com (unknown [172.18.147.201]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4FZwnL147Bz70gJ2; Wed, 5 May 2021 20:21:58 +0800 (CST) Received: from lhreml710-chm.china.huawei.com (10.201.108.61) by fraeml712-chm.china.huawei.com (10.206.15.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 5 May 2021 14:32:55 +0200 Received: from localhost (10.52.120.138) by lhreml710-chm.china.huawei.com (10.201.108.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 5 May 2021 13:32:54 +0100 Date: Wed, 5 May 2021 13:31:15 +0100 From: Jonathan Cameron To: Mauro Carvalho Chehab CC: , , Kieran Bingham , Mauro Carvalho Chehab , , , Subject: Re: [PATCH 13/25] media: rcar_fdp1: fix pm_runtime_get_sync() usage count Message-ID: <20210505133115.00007bd1@Huawei.com> In-Reply-To: <372d88637707ececab77fffaae49d455d90cf24f.1620207353.git.mchehab+huawei@kernel.org> References: <372d88637707ececab77fffaae49d455d90cf24f.1620207353.git.mchehab+huawei@kernel.org> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; i686-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.52.120.138] X-ClientProxiedBy: lhreml725-chm.china.huawei.com (10.201.108.76) To lhreml710-chm.china.huawei.com (10.201.108.61) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Wed, 5 May 2021 11:42:03 +0200 Mauro Carvalho Chehab wrote: > The pm_runtime_get_sync() internally increments the > dev->power.usage_count without decrementing it, even on errors. > Replace it by the new pm_runtime_resume_and_get(), introduced by: > commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter") > in order to properly decrement the usage counter, avoiding > a potential PM usage counter leak. > > Also, right now, the driver is ignoring any troubles when > trying to do PM resume. So, add the proper error handling > for the code. > > Signed-off-by: Mauro Carvalho Chehab Reviewed-by: Jonathan Cameron > --- > drivers/media/platform/rcar_fdp1.c | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/rcar_fdp1.c b/drivers/media/platform/rcar_fdp1.c > index d26413fa5205..89aac60066d9 100644 > --- a/drivers/media/platform/rcar_fdp1.c > +++ b/drivers/media/platform/rcar_fdp1.c > @@ -2135,7 +2135,9 @@ static int fdp1_open(struct file *file) > } > > /* Perform any power management required */ > - pm_runtime_get_sync(fdp1->dev); > + ret = pm_runtime_resume_and_get(fdp1->dev); > + if (ret < 0) > + goto error_pm; > > v4l2_fh_add(&ctx->fh); > > @@ -2145,6 +2147,8 @@ static int fdp1_open(struct file *file) > mutex_unlock(&fdp1->dev_mutex); > return 0; > > +error_pm: > + v4l2_m2m_ctx_release(ctx->fh.m2m_ctx); > error_ctx: > v4l2_ctrl_handler_free(&ctx->hdl); > kfree(ctx); > @@ -2352,7 +2356,9 @@ static int fdp1_probe(struct platform_device *pdev) > > /* Power up the cells to read HW */ > pm_runtime_enable(&pdev->dev); > - pm_runtime_get_sync(fdp1->dev); > + ret = pm_runtime_resume_and_get(fdp1->dev); > + if (ret < 0) > + goto disable_pm; > > hw_version = fdp1_read(fdp1, FD1_IP_INTDATA); > switch (hw_version) { > @@ -2381,6 +2387,9 @@ static int fdp1_probe(struct platform_device *pdev) > > return 0; > > +disable_pm: > + pm_runtime_disable(fdp1->dev); > + > release_m2m: > v4l2_m2m_release(fdp1->m2m_dev); >