From: Jonathan Cameron <Jonathan.Cameron@Huawei.com>
To: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>,
<linux-kernel@vger.kernel.org>, <linuxarm@huawei.com>,
Ludovic Desroches <ludovic.desroches@microchip.com>,
<mauro.chehab@huawei.com>,
Eugen Hristev <eugen.hristev@microchip.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-media@vger.kernel.org>
Subject: Re: [PATCH v4 08/79] media: atmel: properly get pm_runtime
Date: Fri, 30 Apr 2021 17:13:47 +0100 [thread overview]
Message-ID: <20210430171347.00004e7b@Huawei.com> (raw)
In-Reply-To: <3150349be99187c4f9290ac35d6227bb6a83519b.1619621413.git.mchehab+huawei@kernel.org>
On Wed, 28 Apr 2021 16:51:29 +0200
Mauro Carvalho Chehab <mchehab+huawei@kernel.org> 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 <mchehab+huawei@kernel.org>
> ---
> 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) {
next prev parent reply other threads:[~2021-04-30 16:15 UTC|newest]
Thread overview: 128+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-28 14:51 [PATCH v4 00/79] Address some issues with PM runtime at media subsystem Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 01/79] media: venus: fix PM runtime logic at venus_sys_error_handler() Mauro Carvalho Chehab
2021-04-30 15:21 ` Jonathan Cameron
2021-05-03 9:00 ` Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 02/79] media: s6p_cec: decrement usage count if disabled Mauro Carvalho Chehab
2021-04-28 15:31 ` Sylwester Nawrocki
2021-04-28 14:51 ` [PATCH v4 03/79] media: i2c: ccs-core: return the right error code at suspend Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 04/79] media: i2c: ov7740: don't resume at remove time Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 05/79] media: i2c: video-i2c: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 06/79] media: i2c: imx334: fix the pm runtime get logic Mauro Carvalho Chehab
2021-04-30 15:54 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 07/79] media: exynos-gsc: don't resume at remove time Mauro Carvalho Chehab
2021-04-28 15:25 ` Sylwester Nawrocki
2021-04-28 19:44 ` kernel test robot
2021-04-28 19:56 ` kernel test robot
2021-04-28 14:51 ` [PATCH v4 08/79] media: atmel: properly get pm_runtime Mauro Carvalho Chehab
2021-04-30 16:13 ` Jonathan Cameron [this message]
2021-04-28 14:51 ` [PATCH v4 09/79] media: marvel-ccic: fix some issues when getting pm_runtime Mauro Carvalho Chehab
2021-04-30 16:29 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 10/79] media: mdk-mdp: fix pm_runtime_get_sync() usage count Mauro Carvalho Chehab
2021-04-30 16:30 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 11/79] media: rcar_fdp1: " Mauro Carvalho Chehab
2021-04-30 16:26 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 12/79] media: renesas-ceu: Properly check for PM errors Mauro Carvalho Chehab
2021-04-30 16:28 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 13/79] media: s5p: fix pm_runtime_get_sync() usage count Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 14/79] media: am437x: " Mauro Carvalho Chehab
2021-04-30 16:36 ` Jonathan Cameron
2021-05-04 7:19 ` Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 15/79] media: sh_vou: " Mauro Carvalho Chehab
2021-04-30 16:40 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 16/79] media: mtk-vcodec: " Mauro Carvalho Chehab
2021-04-30 16:44 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 17/79] media: s5p-jpeg: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 18/79] media: sti/delta: " Mauro Carvalho Chehab
2021-04-30 16:47 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 19/79] media: sunxi: " Mauro Carvalho Chehab
2021-04-30 16:48 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 20/79] staging: media: rkvdec: " Mauro Carvalho Chehab
2021-04-28 15:09 ` Johan Hovold
2021-04-29 7:38 ` Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 21/79] staging: media: atomisp: use pm_runtime_resume_and_get() Mauro Carvalho Chehab
2021-04-30 16:59 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 22/79] staging: media: imx7-mipi-csis: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 23/79] staging: media: ipu3: " Mauro Carvalho Chehab
2021-04-30 17:03 ` Jonathan Cameron
2021-05-03 9:57 ` Johan Hovold
2021-04-28 14:51 ` [PATCH v4 24/79] staging: media: cedrus_video: " Mauro Carvalho Chehab
2021-04-30 17:05 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 25/79] staging: media: tegra-vde: " Mauro Carvalho Chehab
2021-04-29 12:38 ` Dmitry Osipenko
2021-04-30 17:08 ` Jonathan Cameron
2021-04-30 17:11 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 26/79] staging: media: tegra-video: " Mauro Carvalho Chehab
2021-04-30 17:13 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 27/79] media: i2c: ak7375: " Mauro Carvalho Chehab
2021-04-30 17:14 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 28/79] media: i2c: ccs-core: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 29/79] media: i2c: dw9714: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 30/79] media: i2c: dw9768: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 31/79] media: i2c: dw9807-vcm: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 32/79] media: i2c: hi556: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 33/79] media: i2c: imx214: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 34/79] media: i2c: imx219: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 35/79] media: i2c: imx258: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 36/79] media: i2c: imx274: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 37/79] media: i2c: imx290: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 38/79] media: i2c: imx319: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 39/79] media: i2c: imx355: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 40/79] media: i2c: mt9m001: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 41/79] media: i2c: ov02a10: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 42/79] media: i2c: ov13858: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 43/79] media: i2c: ov2659: " Mauro Carvalho Chehab
2021-05-03 12:30 ` Lad, Prabhakar
2021-04-28 14:52 ` [PATCH v4 44/79] media: i2c: ov2685: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 45/79] media: i2c: ov2740: " Mauro Carvalho Chehab
2021-04-30 17:20 ` Jonathan Cameron
2021-04-28 14:52 ` [PATCH v4 46/79] media: i2c: ov5647: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 47/79] media: i2c: ov5648: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 48/79] media: i2c: ov5670: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 49/79] media: i2c: ov5675: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 50/79] media: i2c: ov5695: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 51/79] media: i2c: ov7740: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 52/79] media: i2c: ov8856: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 53/79] media: i2c: ov8865: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 54/79] media: i2c: ov9734: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 55/79] media: i2c: tvp5150: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 56/79] media: i2c: video-i2c: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 57/79] media: rockchip/rga: " Mauro Carvalho Chehab
2021-04-28 17:11 ` Ezequiel Garcia
2021-04-28 14:52 ` [PATCH v4 58/79] media: sti/hva: " Mauro Carvalho Chehab
2021-04-30 17:35 ` Jonathan Cameron
2021-04-28 14:52 ` [PATCH v4 59/79] media: sti/bdisp: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 60/79] media: ipu3: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 61/79] media: coda: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 62/79] media: exynos4-is: " Mauro Carvalho Chehab
2021-04-30 17:49 ` Jonathan Cameron
2021-04-28 14:52 ` [PATCH v4 63/79] media: exynos-gsc: " Mauro Carvalho Chehab
2021-04-30 17:50 ` Jonathan Cameron
2021-04-28 14:52 ` [PATCH v4 64/79] media: mtk-jpeg: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 65/79] media: camss: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 66/79] media: venus: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 67/79] media: venus: vdec: " Mauro Carvalho Chehab
2021-04-30 17:53 ` Jonathan Cameron
2021-04-28 14:52 ` [PATCH v4 68/79] media: venus: venc: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 69/79] media: rcar-fcp: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 70/79] media: rkisp1: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 71/79] media: s3c-camif: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 72/79] media: s5p-mfc: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 73/79] media: stm32: " Mauro Carvalho Chehab
2021-04-30 17:58 ` Jonathan Cameron
2021-04-28 14:52 ` [PATCH v4 74/79] media: sunxi: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 75/79] media: ti-vpe: " Mauro Carvalho Chehab
2021-04-30 18:03 ` Jonathan Cameron
2021-05-03 12:49 ` Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 76/79] media: vsp1: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 77/79] media: rcar-vin: " Mauro Carvalho Chehab
2021-04-30 18:05 ` Jonathan Cameron
2021-04-28 14:52 ` [PATCH v4 78/79] media: hantro: " Mauro Carvalho Chehab
2021-04-28 17:14 ` Ezequiel Garcia
2021-04-30 18:09 ` Jonathan Cameron
2021-04-28 14:52 ` [PATCH v4 79/79] media: hantro: do a PM resume earlier Mauro Carvalho Chehab
2021-04-28 17:17 ` Ezequiel Garcia
2021-04-29 7:13 ` Mauro Carvalho Chehab
2021-04-28 15:50 ` [PATCH v4 00/79] Address some issues with PM runtime at media subsystem Johan Hovold
2021-04-29 10:18 ` Mauro Carvalho Chehab
2021-04-29 12:33 ` Dmitry Osipenko
2021-04-29 15:17 ` Johan Hovold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210430171347.00004e7b@Huawei.com \
--to=jonathan.cameron@huawei.com \
--cc=alexandre.belloni@bootlin.com \
--cc=eugen.hristev@microchip.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=ludovic.desroches@microchip.com \
--cc=mauro.chehab@huawei.com \
--cc=mchehab+huawei@kernel.org \
--cc=mchehab@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).