[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <ffff2d49-d90b-4512-a12e-cf7c4251b4a8@linaro.org>
Date: Thu, 6 Mar 2025 09:22:45 +0100
From: Neil Armstrong <neil.armstrong@...aro.org>
To: Vikash Garodia <quic_vgarodia@...cinc.com>,
Dikshita Agarwal <quic_dikshita@...cinc.com>,
Abhinav Kumar <quic_abhinavk@...cinc.com>,
Mauro Carvalho Chehab <mchehab@...nel.org>, Rob Herring <robh@...nel.org>,
Krzysztof Kozlowski <krzk+dt@...nel.org>, Conor Dooley
<conor+dt@...nel.org>, Philipp Zabel <p.zabel@...gutronix.de>
Cc: linux-media@...r.kernel.org, linux-arm-msm@...r.kernel.org,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2 3/7] media: platform: qcom/iris: add
power_off_controller to vpu_ops
On 05/03/2025 20:05, Neil Armstrong wrote:
> In order to support the SM8650 iris33 hardware, we need to provide a
> specific constoller power off sequences via the vpu_ops callbacks.
>
> Add the callback, and use the current helper for currently supported
> platforms.
>
> Signed-off-by: Neil Armstrong <neil.armstrong@...aro.org>
> ---
> drivers/media/platform/qcom/iris/iris_vpu2.c | 1 +
> drivers/media/platform/qcom/iris/iris_vpu3.c | 2 ++
> drivers/media/platform/qcom/iris/iris_vpu_common.c | 14 ++++++++++----
> drivers/media/platform/qcom/iris/iris_vpu_common.h | 2 ++
> 4 files changed, 15 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/iris/iris_vpu2.c b/drivers/media/platform/qcom/iris/iris_vpu2.c
> index 8f502aed43ce2fa6a272a2ce14ff1ca54d3e63a2..7cf1bfc352d34b897451061b5c14fbe90276433d 100644
> --- a/drivers/media/platform/qcom/iris/iris_vpu2.c
> +++ b/drivers/media/platform/qcom/iris/iris_vpu2.c
> @@ -34,5 +34,6 @@ static u64 iris_vpu2_calc_freq(struct iris_inst *inst, size_t data_size)
>
> const struct vpu_ops iris_vpu2_ops = {
> .power_off_hw = iris_vpu_power_off_hw,
> + .power_off_controller = iris_vpu_power_off_controller,
> .calc_freq = iris_vpu2_calc_freq,
> };
> diff --git a/drivers/media/platform/qcom/iris/iris_vpu3.c b/drivers/media/platform/qcom/iris/iris_vpu3.c
> index b484638e6105a69319232f667ee7ae95e3853698..95f362633c95b101ecfda6480c4c0b73416bd00c 100644
> --- a/drivers/media/platform/qcom/iris/iris_vpu3.c
> +++ b/drivers/media/platform/qcom/iris/iris_vpu3.c
> @@ -117,6 +117,8 @@ static u64 iris_vpu3_calculate_frequency(struct iris_inst *inst, size_t data_siz
> }
>
> const struct vpu_ops iris_vpu3_ops = {
> + .reset_controller = iris_vpu_reset_controller,
Seems I sent the patches too fast, this is remnant of v1, it should disappear, I'll fix it in v3.
> .power_off_hw = iris_vpu3_power_off_hardware,
> + .power_off_controller = iris_vpu_power_off_controller,
> .calc_freq = iris_vpu3_calculate_frequency,
> };
> diff --git a/drivers/media/platform/qcom/iris/iris_vpu_common.c b/drivers/media/platform/qcom/iris/iris_vpu_common.c
> index d6ce92f3c7544e44dccca26bf6a4c95a720f9229..3b3e1ca1e42183561ee78c89f50946fd0cc3c3ab 100644
> --- a/drivers/media/platform/qcom/iris/iris_vpu_common.c
> +++ b/drivers/media/platform/qcom/iris/iris_vpu_common.c
> @@ -251,7 +251,7 @@ static void iris_vpu_power_off_controller_disable(struct iris_core *core)
> iris_disable_power_domains(core, core->pmdomain_tbl->pd_devs[IRIS_CTRL_POWER_DOMAIN]);
> }
>
> -static int iris_vpu_power_off_controller(struct iris_core *core)
> +int iris_vpu_power_off_controller(struct iris_core *core)
> {
> u32 val = 0;
> int ret;
> @@ -284,23 +284,29 @@ void iris_vpu_power_off(struct iris_core *core)
> {
> dev_pm_opp_set_rate(core->dev, 0);
> core->iris_platform_data->vpu_ops->power_off_hw(core);
> - iris_vpu_power_off_controller(core);
> + core->iris_platform_data->vpu_ops->power_off_controller(core);
> iris_unset_icc_bw(core);
>
> if (!iris_vpu_watchdog(core, core->intr_status))
> disable_irq_nosync(core->irq);
> }
>
> -static int iris_vpu_power_on_controller(struct iris_core *core)
> +static int iris_vpu_reset_controller(struct iris_core *core)
> {
> u32 rst_tbl_size = core->iris_platform_data->clk_rst_tbl_size;
> +
> + return reset_control_bulk_reset(rst_tbl_size, core->resets);
> +}
Same here, I'll remove this now useless iris_vpu_reset_controller() function.
Neil
> +
> +static int iris_vpu_power_on_controller(struct iris_core *core)
> +{
> int ret;
>
> ret = iris_enable_power_domains(core, core->pmdomain_tbl->pd_devs[IRIS_CTRL_POWER_DOMAIN]);
> if (ret)
> return ret;
>
> - ret = reset_control_bulk_reset(rst_tbl_size, core->resets);
> + ret = iris_vpu_reset_controller(core);
> if (ret)
> goto err_disable_power;
>
> diff --git a/drivers/media/platform/qcom/iris/iris_vpu_common.h b/drivers/media/platform/qcom/iris/iris_vpu_common.h
> index 63fa1fa5a4989e48aebdb6c7619c140000c0b44c..f8965661c602f990d5a7057565f79df4112d097e 100644
> --- a/drivers/media/platform/qcom/iris/iris_vpu_common.h
> +++ b/drivers/media/platform/qcom/iris/iris_vpu_common.h
> @@ -13,6 +13,7 @@ extern const struct vpu_ops iris_vpu3_ops;
>
> struct vpu_ops {
> void (*power_off_hw)(struct iris_core *core);
> + int (*power_off_controller)(struct iris_core *core);
> u64 (*calc_freq)(struct iris_inst *inst, size_t data_size);
> };
>
> @@ -22,6 +23,7 @@ void iris_vpu_clear_interrupt(struct iris_core *core);
> int iris_vpu_watchdog(struct iris_core *core, u32 intr_status);
> int iris_vpu_prepare_pc(struct iris_core *core);
> int iris_vpu_power_on(struct iris_core *core);
> +int iris_vpu_power_off_controller(struct iris_core *core);
> void iris_vpu_power_off_hw(struct iris_core *core);
> void iris_vpu_power_off(struct iris_core *core);
>
>
Powered by blists - more mailing lists