Re: [PATCH v14 6/6] soc: mediatek: mutex: add functions that operate registers by CMDQ

From: CK Hu
Date: Tue Mar 22 2022 - 06:04:58 EST


Hi, Moudy:

On Thu, 2022-03-17 at 22:39 +0800, Moudy Ho wrote:
> Due to HW limitations, MDP3 is necessary to enable MUTEX in each
> frame
> for SOF triggering and cooperate with CMDQ control to reduce the
> amount
> of interrupts generated(also, reduce frame latency).
>
> In response to the above situation, a new interface
> "mtk_mutex_enable_by_cmdq" has been added to achieve the purpose.
>
> Signed-off-by: Moudy Ho <moudy.ho@xxxxxxxxxxxx>
> ---
> drivers/soc/mediatek/mtk-mutex.c | 45
> +++++++++++++++++++++++++-
> include/linux/soc/mediatek/mtk-mutex.h | 2 ++
> 2 files changed, 46 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/soc/mediatek/mtk-mutex.c
> b/drivers/soc/mediatek/mtk-mutex.c
> index c72e9f6ee4cc..32c87b8ed077 100644
> --- a/drivers/soc/mediatek/mtk-mutex.c
> +++ b/drivers/soc/mediatek/mtk-mutex.c
> @@ -7,10 +7,14 @@
> #include <linux/iopoll.h>
> #include <linux/module.h>
> #include <linux/of_device.h>
> +#include <linux/of_address.h>
> #include <linux/platform_device.h>
> #include <linux/regmap.h>
> #include <linux/soc/mediatek/mtk-mmsys.h>
> #include <linux/soc/mediatek/mtk-mutex.h>
> +#include <linux/soc/mediatek/mtk-cmdq.h>
> +
> +#define MTK_MUTEX_ENABLE BIT(0)

If this is necessary, separate this to another patch and apply to
mtk_mutex_enable() also.

>
> #define MT2701_MUTEX0_MOD0 0x2c
> #define MT2701_MUTEX0_SOF0 0x30
> @@ -180,6 +184,9 @@ struct mtk_mutex_ctx {
> void __iomem *regs;
> struct mtk_mutex mutex[10];
> const struct mtk_mutex_data *data;
> + phys_addr_t addr;
> + struct cmdq_client_reg cmdq_reg;
> + bool has_gce_client_reg;
> };
>
> static const unsigned int mt2701_mutex_mod[DDP_COMPONENT_ID_MAX] = {
> @@ -638,6 +645,29 @@ void mtk_mutex_enable(struct mtk_mutex *mutex)
> }
> EXPORT_SYMBOL_GPL(mtk_mutex_enable);
>
> +void mtk_mutex_enable_by_cmdq(struct mtk_mutex *mutex, void *pkt)
> +{
> +#if IS_REACHABLE(CONFIG_MTK_CMDQ)
> + struct mtk_mutex_ctx *mtx = container_of(mutex, struct
> mtk_mutex_ctx,
> + mutex[mutex->id]);
> + struct cmdq_pkt *cmdq_pkt = (struct cmdq_pkt *)pkt;
> +
> + WARN_ON(&mtx->mutex[mutex->id] != mutex);
> +
> + if (!mtx->has_gce_client_reg) {
> + dev_dbg(mtx->dev, "mediatek,gce-client-reg hasn't been
> set in dts");

dev_err()

> + return;
> + }
> +
> + cmdq_pkt_write_mask(cmdq_pkt, mtx->cmdq_reg.subsys,
> + mtx->addr + DISP_REG_MUTEX_EN(mutex->id),
+ MTK_MUTEX_ENABLE, MTK_MUTEX_ENABLE);

According to mtk_mutex_enable(),

cmdq_pkt_write(cmdq_pkt, mtx->cmdq_reg.subsys,
mtx->addr + DISP_REG_MUTEX_EN(mutex->id),
1);

> +#else
> + dev_dbg(mtx->dev, "Not support for enable MUTEX by CMDQ");

dev_err()
Regards,
CK

> +#endif
> +}
> +EXPORT_SYMBOL_GPL(mtk_mutex_enable_by_cmdq);
> +
> void mtk_mutex_disable(struct mtk_mutex *mutex)
> {
> struct mtk_mutex_ctx *mtx = container_of(mutex, struct
> mtk_mutex_ctx,
> @@ -676,7 +706,7 @@ static int mtk_mutex_probe(struct platform_device
> *pdev)
> {
> struct device *dev = &pdev->dev;
> struct mtk_mutex_ctx *mtx;
> - struct resource *regs;
> + struct resource *regs, addr;
> int i;
>
> mtx = devm_kzalloc(dev, sizeof(*mtx), GFP_KERNEL);
> @@ -697,6 +727,19 @@ static int mtk_mutex_probe(struct
> platform_device *pdev)
> }
> }
>
> + if (of_address_to_resource(dev->of_node, 0, &addr) < 0)
> + mtx->addr = 0L;
> + else
> + mtx->addr = addr.start;
> +
> +#if IS_REACHABLE(CONFIG_MTK_CMDQ)
> + ret = cmdq_dev_get_client_reg(dev, &mtx->cmdq_reg, 0);
> + if (ret)
> + dev_dbg(dev, "No mediatek,gce-client-reg!\n");
> + else
> + mtx->has_gce_client_reg = true;
> +#endif
> +
> regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> mtx->regs = devm_ioremap_resource(dev, regs);
> if (IS_ERR(mtx->regs)) {
> diff --git a/include/linux/soc/mediatek/mtk-mutex.h
> b/include/linux/soc/mediatek/mtk-mutex.h
> index 200f4365c950..17eea55b6809 100644
> --- a/include/linux/soc/mediatek/mtk-mutex.h
> +++ b/include/linux/soc/mediatek/mtk-mutex.h
> @@ -33,6 +33,8 @@ void mtk_mutex_set_mod(struct mtk_mutex *mutex,
> void mtk_mutex_set_sof(struct mtk_mutex *mutex,
> enum mtk_mutex_table_index idx);
> void mtk_mutex_enable(struct mtk_mutex *mutex);
> +void mtk_mutex_enable_by_cmdq(struct mtk_mutex *mutex,
> + void *pkt);
> void mtk_mutex_disable(struct mtk_mutex *mutex);
> void mtk_mutex_remove_comp(struct mtk_mutex *mutex,
> enum mtk_ddp_comp_id id);