[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <3077494e5e989db6e347bc7c681bb584ab20e593.camel@mediatek.com>
Date: Mon, 24 Feb 2025 06:04:29 +0000
From: CK Hu (胡俊光) <ck.hu@...iatek.com>
To: "jassisinghbrar@...il.com" <jassisinghbrar@...il.com>,
Jason-JH Lin (林睿祥) <Jason-JH.Lin@...iatek.com>,
"chunkuang.hu@...nel.org" <chunkuang.hu@...nel.org>, "AngeloGioacchino Del
Regno" <angelogioacchino.delregno@...labora.com>
CC: Singo Chang (張興國) <Singo.Chang@...iatek.com>,
"treapking@...omium.org" <treapking@...omium.org>,
Yongqiang Niu (牛永强)
<yongqiang.niu@...iatek.com>, Project_Global_Chrome_Upstream_Group
<Project_Global_Chrome_Upstream_Group@...iatek.com>,
Nancy Lin (林欣螢) <Nancy.Lin@...iatek.com>,
Xavier Chang (張獻文) <Xavier.Chang@...iatek.com>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
Sirius Wang (王皓昱) <Sirius.Wang@...iatek.com>,
"wenst@...omium.org" <wenst@...omium.org>,
Xiandong Wang (王先冬)
<Xiandong.Wang@...iatek.com>, "linux-mediatek@...ts.infradead.org"
<linux-mediatek@...ts.infradead.org>, "linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>
Subject: Re: [PATCH] mailbox: mtk-cmdq: Refine GCE_GCTL_VALUE setting
On Mon, 2025-02-24 at 13:01 +0800, Jason-JH Lin wrote:
> Add cmdq_gctl_value_toggle() to configure GCE_CTRL_BY_SW and GCE_DDR_EN
> together in same the GCE_GCTL_VALUE register.
>
> Move this function into cmdq_runtime_resume() and cmdq_runtime_suspend()
> to ensure it can be called when the GCE clock is enabled.
Why need GCE clock to be enabled when toggle GCE_GCTL_VALUE register?
In some hardware, just need power on to access register. It's not necessary to enable clock.
If GCE need to enable clock to access register, add information here.
>
> Fixes: 7abd037aa581 ("mailbox: mtk-cmdq: add gce ddr enable support flow")
> Signed-off-by: Jason-JH Lin <jason-jh.lin@...iatek.com>
> ---
> drivers/mailbox/mtk-cmdq-mailbox.c | 41 +++++++++++++-----------------
> 1 file changed, 17 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c
> index d186865b8dce..be17697d7785 100644
> --- a/drivers/mailbox/mtk-cmdq-mailbox.c
> +++ b/drivers/mailbox/mtk-cmdq-mailbox.c
> @@ -92,16 +92,17 @@ struct gce_plat {
> u32 gce_num;
> };
>
> -static void cmdq_sw_ddr_enable(struct cmdq *cmdq, bool enable)
> +static void cmdq_gctl_value_toggle(struct cmdq *cmdq, bool ddr_enable)
> {
> - WARN_ON(clk_bulk_enable(cmdq->pdata->gce_num, cmdq->clocks));
> + u32 val = (cmdq->pdata->control_by_sw) ? GCE_CTRL_BY_SW : 0;
u32 val = cmdq->pdata->control_by_sw ? GCE_CTRL_BY_SW : 0;
>
> - if (enable)
> - writel(GCE_DDR_EN | GCE_CTRL_BY_SW, cmdq->base + GCE_GCTL_VALUE);
> - else
> - writel(GCE_CTRL_BY_SW, cmdq->base + GCE_GCTL_VALUE);
> + if (!cmdq->pdata->control_by_sw && !cmdq->pdata->sw_ddr_en)
> + return;
>
> - clk_bulk_disable(cmdq->pdata->gce_num, cmdq->clocks);
> + if (cmdq->pdata->sw_ddr_en && ddr_enable)
> + val |= GCE_DDR_EN;
> +
> + writel(val, cmdq->base + GCE_GCTL_VALUE);
> }
>
> u8 cmdq_get_shift_pa(struct mbox_chan *chan)
> @@ -140,16 +141,10 @@ static void cmdq_thread_resume(struct cmdq_thread *thread)
> static void cmdq_init(struct cmdq *cmdq)
> {
> int i;
> - u32 gctl_regval = 0;
>
> WARN_ON(clk_bulk_enable(cmdq->pdata->gce_num, cmdq->clocks));
> - if (cmdq->pdata->control_by_sw)
> - gctl_regval = GCE_CTRL_BY_SW;
> - if (cmdq->pdata->sw_ddr_en)
> - gctl_regval |= GCE_DDR_EN;
>
> - if (gctl_regval)
> - writel(gctl_regval, cmdq->base + GCE_GCTL_VALUE);
> + cmdq_gctl_value_toggle(cmdq, true);
>
> writel(CMDQ_THR_ACTIVE_SLOT_CYCLES, cmdq->base + CMDQ_THR_SLOT_CYCLES);
> for (i = 0; i <= CMDQ_MAX_EVENT; i++)
> @@ -315,14 +310,21 @@ static irqreturn_t cmdq_irq_handler(int irq, void *dev)
> static int cmdq_runtime_resume(struct device *dev)
> {
> struct cmdq *cmdq = dev_get_drvdata(dev);
> + int ret;
>
> - return clk_bulk_enable(cmdq->pdata->gce_num, cmdq->clocks);
> + ret = clk_bulk_enable(cmdq->pdata->gce_num, cmdq->clocks);
> + if (ret)
> + return ret;
> +
> + cmdq_gctl_value_toggle(cmdq, true);
> + return 0;
> }
>
> static int cmdq_runtime_suspend(struct device *dev)
> {
> struct cmdq *cmdq = dev_get_drvdata(dev);
>
> + cmdq_gctl_value_toggle(cmdq, false);
> clk_bulk_disable(cmdq->pdata->gce_num, cmdq->clocks);
> return 0;
> }
> @@ -347,9 +349,6 @@ static int cmdq_suspend(struct device *dev)
> if (task_running)
> dev_warn(dev, "exist running task(s) in suspend\n");
>
> - if (cmdq->pdata->sw_ddr_en)
> - cmdq_sw_ddr_enable(cmdq, false);
> -
> return pm_runtime_force_suspend(dev);
> }
>
> @@ -360,9 +359,6 @@ static int cmdq_resume(struct device *dev)
> WARN_ON(pm_runtime_force_resume(dev));
> cmdq->suspended = false;
>
> - if (cmdq->pdata->sw_ddr_en)
> - cmdq_sw_ddr_enable(cmdq, true);
> -
> return 0;
> }
>
> @@ -370,9 +366,6 @@ static void cmdq_remove(struct platform_device *pdev)
> {
> struct cmdq *cmdq = platform_get_drvdata(pdev);
>
> - if (cmdq->pdata->sw_ddr_en)
> - cmdq_sw_ddr_enable(cmdq, false);
> -
> if (!IS_ENABLED(CONFIG_PM))
> cmdq_runtime_suspend(&pdev->dev);
>
Powered by blists - more mailing lists