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.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=unavailable 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 6F8E4C433B4 for ; Fri, 30 Apr 2021 16:17:30 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E27366109E for ; Fri, 30 Apr 2021 16:17:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E27366109E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=Huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID: Subject:CC:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ToY32srI/qm2tsC1yyiO/H5c5thcQmvQbHn0XnPLvqI=; b=Goj7qX1lMe0BtNIiksQkhqAHW +SrVOIoVU3f0qJamFHQpm4NebiWuvkWpVwy3Q9Y6M3tdnXPZA7BzSDh9DSAax3v2kIABfnNr5AiMx Wb6+qH5h+sfzfySKo2vP5ZRenxAZJvXF/uJqzWEIHZwVC9wjs4RoD2+GmYgXCYoPXNBcSA1uCkBP3 e5oPknBrJpoc932zw2vgH26Ln3PMXLnipBhsyxrQhYpk+gS0qXdALr9AvXxwDpFArNPtSWptWVC3J CynDxU0GXnhsXOqfQm/8ky07t0RarzyXLxeSgGHpMcx+JkGKS7n+32E6gi34jC198qi4Sel6iMXT5 mH1pZQh/w==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lcVnv-008AgK-6e; Fri, 30 Apr 2021 16:15:47 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lcVns-008Afv-L6 for linux-arm-kernel@desiato.infradead.org; Fri, 30 Apr 2021 16:15:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Subject:CC:To: From:Date:Sender:Reply-To:Content-ID:Content-Description; bh=JdjTuLJ2uBOE/ZVksQt6homIh/fQoIrF2BKcLRuEAy8=; b=Br7eHwzsQ5DsjpO6c8l91NpRqO uA2NbnbcJ1KcLqZx2NsPn9ps+Sv4htxlDgL05Tn+cT9PJCexK1kA6XHv9V700TraAfhfUV9/CoS+k OVDcIQO49UM7bUYN7QR7118xhi5L0D8sx/dlgNrNPx+RGM+J7/udrRBT42pF29Yjni5u5101cJ9BB QFHZQ8uhRks9FEnZhiSC3PCDbMnziKxDUMotlvdw19v0STjIHF19xMW1CZ+oTEllJkWd93B5kAoer Fmxz5SFfOc3eKOECRPygciNejYxEhf8/HkXXDDVIklh7TYp+cMNLwjo1BqEABXzxxcqrEXL5NENiE CAqNy51A==; Received: from frasgout.his.huawei.com ([185.176.79.56]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lcVnn-001Vf5-EP for linux-arm-kernel@lists.infradead.org; Fri, 30 Apr 2021 16:15:41 +0000 Received: from fraeml703-chm.china.huawei.com (unknown [172.18.147.200]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4FWy4P4TKMz6rlml; Sat, 1 May 2021 00:09:41 +0800 (CST) Received: from lhreml710-chm.china.huawei.com (10.201.108.61) by fraeml703-chm.china.huawei.com (10.206.15.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Fri, 30 Apr 2021 18:15:22 +0200 Received: from localhost (10.52.124.90) 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; Fri, 30 Apr 2021 17:15:21 +0100 Date: Fri, 30 Apr 2021 17:13:47 +0100 From: Jonathan Cameron To: Mauro Carvalho Chehab CC: Alexandre Belloni , , , Ludovic Desroches , , Eugen Hristev , Mauro Carvalho Chehab , , Subject: Re: [PATCH v4 08/79] media: atmel: properly get pm_runtime Message-ID: <20210430171347.00004e7b@Huawei.com> In-Reply-To: <3150349be99187c4f9290ac35d6227bb6a83519b.1619621413.git.mchehab+huawei@kernel.org> References: <3150349be99187c4f9290ac35d6227bb6a83519b.1619621413.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 X-Originating-IP: [10.52.124.90] X-ClientProxiedBy: lhreml719-chm.china.huawei.com (10.201.108.70) To lhreml710-chm.china.huawei.com (10.201.108.61) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210430_091539_792904_8619C6AF X-CRM114-Status: GOOD ( 28.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, 28 Apr 2021 16:51:29 +0200 Mauro Carvalho Chehab wrote: > There are several issues in the way the atmel driver handles > pm_runtime_get_sync(): > > - it doesn't check return codes; > - it doesn't properly decrement the usage_count on all places; > - it starts streaming even if pm_runtime_get_sync() fails. > - while it tries to get pm_runtime at the clock enable logic, > it doesn't check if the operation was suceeded. > > Replace all occurrences of it to use the new kAPI: > pm_runtime_resume_and_get(), which ensures that, if the > return code is not negative, the usage_count was incremented. > > With that, add additional checks when this is called, in order > to ensure that errors will be properly addressed. > > Signed-off-by: Mauro Carvalho Chehab > --- > drivers/media/platform/atmel/atmel-isc-base.c | 27 ++++++++++++++----- > drivers/media/platform/atmel/atmel-isi.c | 19 ++++++++++--- > 2 files changed, 35 insertions(+), 11 deletions(-) > > diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c > index fe3ec8d0eaee..02543fe42e9d 100644 > --- a/drivers/media/platform/atmel/atmel-isc-base.c > +++ b/drivers/media/platform/atmel/atmel-isc-base.c > @@ -294,9 +294,13 @@ static int isc_wait_clk_stable(struct clk_hw *hw) > static int isc_clk_prepare(struct clk_hw *hw) > { > struct isc_clk *isc_clk = to_isc_clk(hw); > + int ret; > > - if (isc_clk->id == ISC_ISPCK) > - pm_runtime_get_sync(isc_clk->dev); > + if (isc_clk->id == ISC_ISPCK) { > + ret = pm_runtime_resume_and_get(isc_clk->dev); > + if (ret < 0) > + return 0; Why not the error? isc_wait_clk_stable() is happy to return -ETIMEDOUT so I assume the callers should fine with errors. > + } > > return isc_wait_clk_stable(hw); > } > @@ -353,9 +357,13 @@ static int isc_clk_is_enabled(struct clk_hw *hw) > { > struct isc_clk *isc_clk = to_isc_clk(hw); > u32 status; > + int ret; > > - if (isc_clk->id == ISC_ISPCK) > - pm_runtime_get_sync(isc_clk->dev); > + if (isc_clk->id == ISC_ISPCK) { > + ret = pm_runtime_resume_and_get(isc_clk->dev); > + if (ret < 0) > + return 0; > + } > > regmap_read(isc_clk->regmap, ISC_CLKSR, &status); > > @@ -807,7 +815,9 @@ static int isc_start_streaming(struct vb2_queue *vq, unsigned int count) > goto err_start_stream; > } > > - pm_runtime_get_sync(isc->dev); > + ret = pm_runtime_resume_and_get(isc->dev); > + if (ret < 0) > + goto err_pm_get; > > ret = isc_configure(isc); > if (unlikely(ret)) > @@ -838,7 +848,7 @@ static int isc_start_streaming(struct vb2_queue *vq, unsigned int count) > > err_configure: > pm_runtime_put_sync(isc->dev); > - > +err_pm_get: > v4l2_subdev_call(isc->current_subdev->sd, video, s_stream, 0); > > err_start_stream: > @@ -1809,6 +1819,7 @@ static void isc_awb_work(struct work_struct *w) > u32 baysel; > unsigned long flags; > u32 min, max; > + int ret; > > /* streaming is not active anymore */ > if (isc->stop) > @@ -1831,7 +1842,9 @@ static void isc_awb_work(struct work_struct *w) > ctrls->hist_id = hist_id; > baysel = isc->config.sd_format->cfa_baycfg << ISC_HIS_CFG_BAYSEL_SHIFT; > > - pm_runtime_get_sync(isc->dev); > + ret = pm_runtime_resume_and_get(isc->dev); > + if (ret < 0) Maybe warn or similar? > + return; > > /* > * only update if we have all the required histograms and controls > diff --git a/drivers/media/platform/atmel/atmel-isi.c b/drivers/media/platform/atmel/atmel-isi.c > index 0514be6153df..6a433926726d 100644 > --- a/drivers/media/platform/atmel/atmel-isi.c > +++ b/drivers/media/platform/atmel/atmel-isi.c > @@ -422,7 +422,9 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count) > struct frame_buffer *buf, *node; > int ret; > > - pm_runtime_get_sync(isi->dev); > + ret = pm_runtime_resume_and_get(isi->dev); > + if (ret < 0) > + return ret; > > /* Enable stream on the sub device */ > ret = v4l2_subdev_call(isi->entity.subdev, video, s_stream, 1); > @@ -782,9 +784,10 @@ static int isi_enum_frameintervals(struct file *file, void *fh, > return 0; > } > > -static void isi_camera_set_bus_param(struct atmel_isi *isi) > +static int isi_camera_set_bus_param(struct atmel_isi *isi) > { > u32 cfg1 = 0; > + int ret; > > /* set bus param for ISI */ > if (isi->pdata.hsync_act_low) > @@ -801,12 +804,16 @@ static void isi_camera_set_bus_param(struct atmel_isi *isi) > cfg1 |= ISI_CFG1_THMASK_BEATS_16; > > /* Enable PM and peripheral clock before operate isi registers */ > - pm_runtime_get_sync(isi->dev); > + ret = pm_runtime_resume_and_get(isi->dev); > + if (ret < 0) > + return ret; > > isi_writel(isi, ISI_CTRL, ISI_CTRL_DIS); > isi_writel(isi, ISI_CFG1, cfg1); > > pm_runtime_put(isi->dev); > + > + return 0; > } > > /* -----------------------------------------------------------------------*/ > @@ -1085,7 +1092,11 @@ static int isi_graph_notify_complete(struct v4l2_async_notifier *notifier) > dev_err(isi->dev, "No supported mediabus format found\n"); > return ret; > } > - isi_camera_set_bus_param(isi); > + ret = isi_camera_set_bus_param(isi); > + if (ret) { > + dev_err(isi->dev, "Can't wake up device\n"); > + return ret; > + } > > ret = isi_set_default_fmt(isi); > if (ret) { _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel