From: Hans Verkuil <hverkuil@xs4all.nl>
To: Prabhakar <prabhakar.csengg@gmail.com>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Shawn Guo <shawnguo@kernel.org>,
Sascha Hauer <s.hauer@pengutronix.de>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Fabio Estevam <festevam@gmail.com>,
NXP Linux Team <linux-imx@nxp.com>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Magnus Damm <magnus.damm@gmail.com>
Cc: Shawn Tu <shawnx.tu@intel.com>, Jacopo Mondi <jacopo@jmondi.org>,
linux-media@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-renesas-soc@vger.kernel.org,
Biju Das <biju.das.jz@bp.renesas.com>,
Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Subject: Re: [PATCH v4 6/9] media: i2c: ov5645: Use runtime PM
Date: Mon, 28 Nov 2022 14:49:17 +0100 [thread overview]
Message-ID: <738a2461-7a6a-286b-89e8-d46a26ec6506@xs4all.nl> (raw)
In-Reply-To: <20221031232202.131945-7-prabhakar.mahadev-lad.rj@bp.renesas.com>
Hi Prabhakar,
On 11/1/22 00:21, Prabhakar wrote:
> From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
>
> Switch to using runtime PM for power management.
>
> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> v3->v4
> * Fixed comments pointed by Sakari
>
> v2->v3
> * Jumped to err_pm_runtime label in case of sd register failure
> * Now calling pm_runtime_mark_last_busy() before pm_runtime_put_autosuspend()
> call
> * Now calling pm_runtime_put_sync() in case s_stream(1) fails
> * In s_stream(0) no calling pm_runtime_mark_last_busy() and
> pm_runtime_put_autosuspend()
> * Included RB tag from Laurent.
>
> v1->v2
> * Moved pm_runtime_*_autosuspend() calls after registering the subdev.
> ---
> drivers/media/i2c/ov5645.c | 133 +++++++++++++++++++------------------
> 1 file changed, 68 insertions(+), 65 deletions(-)
>
> diff --git a/drivers/media/i2c/ov5645.c b/drivers/media/i2c/ov5645.c
> index 47451238ca05..2e6135d0a31a 100644
> --- a/drivers/media/i2c/ov5645.c
> +++ b/drivers/media/i2c/ov5645.c
> @@ -27,6 +27,7 @@
> #include <linux/module.h>
> #include <linux/of.h>
> #include <linux/of_graph.h>
> +#include <linux/pm_runtime.h>
> #include <linux/regulator/consumer.h>
> #include <linux/slab.h>
> #include <linux/types.h>
> @@ -108,7 +109,6 @@ struct ov5645 {
> u8 timing_tc_reg21;
>
> struct mutex power_lock; /* lock to protect power state */
> - int power_count;
>
> struct gpio_desc *enable_gpio;
> struct gpio_desc *rst_gpio;
> @@ -635,8 +635,24 @@ static int ov5645_set_register_array(struct ov5645 *ov5645,
> return 0;
> }
>
> -static int ov5645_set_power_on(struct ov5645 *ov5645)
> +static int ov5645_set_power_off(struct device *dev)
> {
> + struct v4l2_subdev *sd = dev_get_drvdata(dev);
> + struct ov5645 *ov5645 = to_ov5645(sd);
> +
> + ov5645_write_reg(ov5645, OV5645_IO_MIPI_CTRL00, 0x58);
> + gpiod_set_value_cansleep(ov5645->rst_gpio, 1);
> + gpiod_set_value_cansleep(ov5645->enable_gpio, 0);
> + clk_disable_unprepare(ov5645->xclk);
> + regulator_bulk_disable(OV5645_NUM_SUPPLIES, ov5645->supplies);
> +
> + return 0;
> +}
> +
> +static int ov5645_set_power_on(struct device *dev)
> +{
> + struct v4l2_subdev *sd = dev_get_drvdata(dev);
> + struct ov5645 *ov5645 = to_ov5645(sd);
> int ret;
>
> ret = regulator_bulk_enable(OV5645_NUM_SUPPLIES, ov5645->supplies);
> @@ -658,57 +674,19 @@ static int ov5645_set_power_on(struct ov5645 *ov5645)
>
> msleep(20);
>
> - return 0;
> -}
> -
> -static void ov5645_set_power_off(struct ov5645 *ov5645)
> -{
> - gpiod_set_value_cansleep(ov5645->rst_gpio, 1);
> - gpiod_set_value_cansleep(ov5645->enable_gpio, 0);
> - clk_disable_unprepare(ov5645->xclk);
> - regulator_bulk_disable(OV5645_NUM_SUPPLIES, ov5645->supplies);
> -}
> -
> -static int ov5645_s_power(struct v4l2_subdev *sd, int on)
> -{
> - struct ov5645 *ov5645 = to_ov5645(sd);
> - int ret = 0;
> -
> - mutex_lock(&ov5645->power_lock);
> -
> - /* If the power count is modified from 0 to != 0 or from != 0 to 0,
> - * update the power state.
> - */
> - if (ov5645->power_count == !on) {
> - if (on) {
> - ret = ov5645_set_power_on(ov5645);
> - if (ret < 0)
> - goto exit;
> -
> - ret = ov5645_set_register_array(ov5645,
> - ov5645_global_init_setting,
> + ret = ov5645_set_register_array(ov5645, ov5645_global_init_setting,
> ARRAY_SIZE(ov5645_global_init_setting));
> - if (ret < 0) {
> - dev_err(ov5645->dev,
> - "could not set init registers\n");
> - ov5645_set_power_off(ov5645);
> - goto exit;
> - }
> -
> - usleep_range(500, 1000);
> - } else {
> - ov5645_write_reg(ov5645, OV5645_IO_MIPI_CTRL00, 0x58);
> - ov5645_set_power_off(ov5645);
> - }
> + if (ret < 0) {
> + dev_err(ov5645->dev, "could not set init registers\n");
> + goto exit;
> }
>
> - /* Update the power count. */
> - ov5645->power_count += on ? 1 : -1;
> - WARN_ON(ov5645->power_count < 0);
> + usleep_range(500, 1000);
>
> -exit:
> - mutex_unlock(&ov5645->power_lock);
> + return 0;
>
> +exit:
> + ov5645_set_power_off(dev);
> return ret;
smatch gives this warning:
drivers/media/i2c/ov5645.c:687 ov5645_set_power_on() warn: 'ov5645->xclk' from clk_prepare_enable() not released on lines: 687.
Can you take a look?
Thanks!
Hans
> }
next prev parent reply other threads:[~2022-11-28 13:49 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-31 23:21 [PATCH v4 0/9] media: i2c: ov5645 driver enhancements Prabhakar
2022-10-31 23:21 ` [PATCH v4 1/9] media: i2c: ov5645: Drop fetching the clk reference by name Prabhakar
2022-10-31 23:21 ` [PATCH v4 2/9] ARM: dts: imx6qdl-pico: Drop clock-names property Prabhakar
2022-10-31 23:21 ` [PATCH v4 3/9] ARM: dts: imx6qdl-wandboard: " Prabhakar
2022-10-31 23:21 ` [PATCH v4 4/9] arm64: dts: renesas: aistarvision-mipi-adapter-2.1: " Prabhakar
2022-10-31 23:21 ` [PATCH v4 5/9] media: dt-bindings: ov5645: Convert OV5645 binding to a schema Prabhakar
2022-11-02 16:38 ` Rob Herring
2022-10-31 23:21 ` [PATCH v4 6/9] media: i2c: ov5645: Use runtime PM Prabhakar
2022-11-28 13:49 ` Hans Verkuil [this message]
2022-11-28 13:53 ` Lad, Prabhakar
2022-11-29 0:02 ` Lad, Prabhakar
2022-10-31 23:22 ` [PATCH v4 7/9] media: i2c: ov5645: Drop empty comment Prabhakar
2022-10-31 23:22 ` [PATCH v4 8/9] media: i2c: ov5645: Make sure to call PM functions Prabhakar
2022-10-31 23:22 ` [PATCH v4 9/9] media: i2c: ov5645: Call ov5645_entity_init_cfg() before registering the subdev Prabhakar
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=738a2461-7a6a-286b-89e8-d46a26ec6506@xs4all.nl \
--to=hverkuil@xs4all.nl \
--cc=biju.das.jz@bp.renesas.com \
--cc=devicetree@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=geert+renesas@glider.be \
--cc=jacopo@jmondi.org \
--cc=kernel@pengutronix.de \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=magnus.damm@gmail.com \
--cc=mchehab@kernel.org \
--cc=prabhakar.csengg@gmail.com \
--cc=prabhakar.mahadev-lad.rj@bp.renesas.com \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=sakari.ailus@linux.intel.com \
--cc=shawnguo@kernel.org \
--cc=shawnx.tu@intel.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).