From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
To: unlisted-recipients:; (no To-header on input)
Cc: linuxarm@huawei.com, mauro.chehab@huawei.com,
Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Eugen Hristev <eugen.hristev@microchip.com>,
Ludovic Desroches <ludovic.desroches@microchip.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Nicolas Ferre <nicolas.ferre@microchip.com>,
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 [thread overview]
Message-ID: <246fe06a2621c5945f474fdf357aa5e5a4e1fb12.1619518193.git.mchehab+huawei@kernel.org> (raw)
In-Reply-To: <cover.1619518193.git.mchehab+huawei@kernel.org>
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;
+ }
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)
+ 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) {
--
2.30.2
next prev parent reply other threads:[~2021-04-27 10:13 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-27 10:12 [PATCH v2 00/79] Address some issues with PM runtime at media subsystem Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 01/79] media: venus: fix PM runtime logic at venus_sys_error_handler() Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 02/79] media: i2c: ccs-core: return the right error code at suspend Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 03/79] media: i2c: mt9m001: don't resume at remove time Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 04/79] media: i2c: ov7740: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 05/79] media: i2c: video-i2c: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 06/79] media: exynos-gsc: " Mauro Carvalho Chehab
2021-04-27 10:12 ` Mauro Carvalho Chehab [this message]
2021-04-27 10:12 ` [PATCH v2 08/79] media: marvel-ccic: fix some issues when getting pm_runtime Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 09/79] media: mdk-mdp: fix pm_runtime_get_sync() usage count Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 10/79] media: rcar_fdp1: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 11/79] media: rga-buf: use pm_runtime_resume_and_get() Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 12/79] media: renesas-ceu: Properly check for PM errors Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 13/79] media: s5p: fix pm_runtime_get_sync() usage count Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 14/79] media: am437x: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 15/79] media: sh_vou: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 16/79] media: mtk-vcodec: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 17/79] media: s5p-jpeg: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 18/79] media: delta-v4l2: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 19/79] media: sun8i_rotate: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 20/79] staging: media: rkvdec: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 21/79] staging: media: atomisp_fops: use pm_runtime_resume_and_get() Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 22/79] staging: media: imx7-mipi-csis: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 23/79] staging: media: ipu3: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 24/79] staging: media: cedrus_video: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 25/79] staging: media: vde: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 26/79] staging: media: csi: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 27/79] staging: media: vi: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 28/79] media: i2c: ak7375: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 29/79] media: i2c: ccs-core: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 30/79] media: i2c: dw9714: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 31/79] media: i2c: dw9768: " Mauro Carvalho Chehab
2021-04-27 10:12 ` [PATCH v2 32/79] media: i2c: dw9807-vcm: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 33/79] media: i2c: hi556: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 34/79] media: i2c: imx214: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 35/79] media: i2c: imx219: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 36/79] media: i2c: imx258: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 37/79] media: i2c: imx274: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 38/79] media: i2c: imx290: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 39/79] media: i2c: imx319: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 40/79] media: i2c: imx334: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 41/79] media: i2c: imx355: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 42/79] media: i2c: mt9m001: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 43/79] media: i2c: ov02a10: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 44/79] media: i2c: ov13858: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 45/79] media: i2c: ov2659: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 46/79] media: i2c: ov2685: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 47/79] media: i2c: ov2740: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 48/79] media: i2c: ov5647: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 49/79] media: i2c: ov5648: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 50/79] media: i2c: ov5670: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 51/79] media: i2c: ov5675: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 52/79] media: i2c: ov5695: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 53/79] media: i2c: ov7740: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 54/79] media: i2c: ov8856: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 55/79] media: i2c: ov8865: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 56/79] media: i2c: ov9734: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 57/79] media: i2c: tvp5150: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 58/79] media: i2c: video-i2c: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 59/79] media: sti/hva: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 60/79] media: ipu3: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 61/79] media: coda: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 62/79] media: exynos4-is: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 63/79] media: exynos-gsc: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 64/79] media: mtk-jpeg: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 65/79] media: camss: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 66/79] media: venus: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 67/79] media: venus: vdec: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 68/79] media: venus: venc: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 69/79] media: rcar-fcp: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 70/79] media: rkisp1: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 71/79] media: s3c-camif: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 72/79] media: s5p-mfc: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 73/79] media: bdisp-v4l2: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 74/79] media: stm32: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 75/79] media: sunxi: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 76/79] media: ti-vpe: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 77/79] media: vsp1: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 78/79] media: rcar-vin: " Mauro Carvalho Chehab
2021-04-27 10:13 ` [PATCH v2 79/79] media: hantro: document the usage of pm_runtime_get_sync() Mauro Carvalho Chehab
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=246fe06a2621c5945f474fdf357aa5e5a4e1fb12.1619518193.git.mchehab+huawei@kernel.org \
--to=mchehab+huawei@kernel.org \
--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@kernel.org \
--cc=nicolas.ferre@microchip.com \
/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).