From nobody Sat May 10 05:49:34 2025 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1619518454; cv=none; d=zohomail.com; s=zohoarc; b=Zp6uIIce6+KQku9E8uZPA3i8YH5+BLwIjeToARGw5C94Agq8HSvcaI8buxMifxyzWqKFdS34rhRlfeDOtrzEzqihNIblAVr0SR/i9+frQuzj8K+0WI56hSlYSplNNmrvsZAuRWAcao5/3SD3aPBUIat9OJcyvmzzfgVB8sIs3TI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518454; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jEITpg5PVFjzGLluAxPMynipaClS1/3Jo4C972zlT7Y=; b=bvS2v9WE0woWMk/pcKJZbwiPvtbsmX7+VEbX8uh7rrgSOsCogmX/NqudD1ga7WX03B3i+jkMmuF6yHkDwQ7g6YiSanP29NmNqWXGJdNvmKUiwP0fw/QvCxdHE/9rZuagKzTi/NWaZyLkXkIDKldAr7+/S2tpbvYWlbgx98atnzo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1619518454630375.39508848016305; Tue, 27 Apr 2021 03:14:14 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235476AbhD0KOz (ORCPT ); Tue, 27 Apr 2021 06:14:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:34656 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235304AbhD0KOe (ORCPT ); Tue, 27 Apr 2021 06:14:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id DE919613C6; Tue, 27 Apr 2021 10:13:50 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiy-000j4v-G1; Tue, 27 Apr 2021 12:13:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=7cvQL/2CEUShgMHfIXo5pZaMj/4OUeemdQZifBElsOo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hq3COPd8OSGdrif9VHBXp6CRwrjlAlnTvk5/oCgS/5HkYgaF4txepgkMiS6npJqVG OzNYWc98VW1sp/SWYNQZYOq9Ip22eUE5+WTbe4UK8LQOuzkZTwqhod4l/4q9mWNtvf SzWMjNybANnSNDFxd6dGpUCyhWrnXduNZqs+PVDhX3NA/UFMItXV3G9MYGByljG4Gq TqOFedyOVqJ925bj5002+wOBOZvJbJP7jvB2VDu6BbjGrAMAsIykdltiVuwzSXqsOC SbcLMYf3Vcqg4p7v8cUw34i70CiAd2OQVhngcOxhwUbq5Ul0btt4cWoAdRYODFNsdo VeItlx8fMzgxA== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Alexandre Belloni , Eugen Hristev , Ludovic Desroches , Mauro Carvalho Chehab , Nicolas Ferre , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v2 07/79] media: atmel: properly get pm_runtime Date: Tue, 27 Apr 2021 12:12:34 +0200 Message-Id: <246fe06a2621c5945f474fdf357aa5e5a4e1fb12.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 =3D to_isc_clk(hw); + int ret; =20 - if (isc_clk->id =3D=3D ISC_ISPCK) - pm_runtime_get_sync(isc_clk->dev); + if (isc_clk->id =3D=3D ISC_ISPCK) { + ret =3D pm_runtime_resume_and_get(isc_clk->dev); + if (ret < 0) + return 0; + } =20 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 =3D to_isc_clk(hw); u32 status; + int ret; =20 - if (isc_clk->id =3D=3D ISC_ISPCK) - pm_runtime_get_sync(isc_clk->dev); + if (isc_clk->id =3D=3D ISC_ISPCK) { + ret =3D pm_runtime_resume_and_get(isc_clk->dev); + if (ret < 0) + return 0; + } =20 regmap_read(isc_clk->regmap, ISC_CLKSR, &status); =20 @@ -807,7 +815,9 @@ static int isc_start_streaming(struct vb2_queue *vq, un= signed int count) goto err_start_stream; } =20 - pm_runtime_get_sync(isc->dev); + ret =3D pm_runtime_resume_and_get(isc->dev); + if (ret < 0) + goto err_pm_get; =20 ret =3D isc_configure(isc); if (unlikely(ret)) @@ -838,7 +848,7 @@ static int isc_start_streaming(struct vb2_queue *vq, un= signed int count) =20 err_configure: pm_runtime_put_sync(isc->dev); - +err_pm_get: v4l2_subdev_call(isc->current_subdev->sd, video, s_stream, 0); =20 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; =20 /* streaming is not active anymore */ if (isc->stop) @@ -1831,7 +1842,9 @@ static void isc_awb_work(struct work_struct *w) ctrls->hist_id =3D hist_id; baysel =3D isc->config.sd_format->cfa_baycfg << ISC_HIS_CFG_BAYSEL_SHIFT; =20 - pm_runtime_get_sync(isc->dev); + ret =3D pm_runtime_resume_and_get(isc->dev); + if (ret < 0) + return; =20 /* * only update if we have all the required histograms and controls diff --git a/drivers/media/platform/atmel/atmel-isi.c b/drivers/media/platf= orm/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, unsign= ed int count) struct frame_buffer *buf, *node; int ret; =20 - pm_runtime_get_sync(isi->dev); + ret =3D pm_runtime_resume_and_get(isi->dev); + if (ret < 0) + return ret; =20 /* Enable stream on the sub device */ ret =3D 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; } =20 -static void isi_camera_set_bus_param(struct atmel_isi *isi) +static int isi_camera_set_bus_param(struct atmel_isi *isi) { u32 cfg1 =3D 0; + int ret; =20 /* 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 |=3D ISI_CFG1_THMASK_BEATS_16; =20 /* Enable PM and peripheral clock before operate isi registers */ - pm_runtime_get_sync(isi->dev); + ret =3D pm_runtime_resume_and_get(isi->dev); + if (ret < 0) + return ret; =20 isi_writel(isi, ISI_CTRL, ISI_CTRL_DIS); isi_writel(isi, ISI_CFG1, cfg1); =20 pm_runtime_put(isi->dev); + + return 0; } =20 /* -----------------------------------------------------------------------= */ @@ -1085,7 +1092,11 @@ static int isi_graph_notify_complete(struct v4l2_asy= nc_notifier *notifier) dev_err(isi->dev, "No supported mediabus format found\n"); return ret; } - isi_camera_set_bus_param(isi); + ret =3D isi_camera_set_bus_param(isi); + if (ret) { + dev_err(isi->dev, "Can't wake up device\n"); + return ret; + } =20 ret =3D isi_set_default_fmt(isi); if (ret) { --=20 2.30.2