soc: mediatek: mutex: add functions that operate registers by CMDQ

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@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Rex-BC Chen <rex-bc.chen@mediatek.com>
Reviewed-by: CK Hu <ck.hu@mediatek.com>
Link: https://lore.kernel.org/r/20220610063424.7800-7-moudy.ho@mediatek.com
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>

diff --git a/drivers/soc/mediatek/mtk-mutex.c b/drivers/soc/mediatek/mtk-mutex.c
index a566f4cf637221691aa1cbbdaf3fe9e9637161c7..fa8e0ba388039a4f04cde6ac352f22ad33ac852d 100644 (file)
--- a/drivers/soc/mediatek/mtk-mutex.c
+++ b/drivers/soc/mediatek/mtk-mutex.c
@@ -7,10 +7,12 @@
 #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 MT2701_MUTEX0_MOD0                     0x2c
 #define MT2701_MUTEX0_SOF0                     0x30
@@ -218,6 +220,8 @@ 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;
 };
 
 static const unsigned int mt2701_mutex_mod[DDP_COMPONENT_ID_MAX] = {
@@ -632,6 +636,30 @@ void mtk_mutex_enable(struct mtk_mutex *mutex)
 }
 EXPORT_SYMBOL_GPL(mtk_mutex_enable);
 
+int mtk_mutex_enable_by_cmdq(struct mtk_mutex *mutex, void *pkt)
+{
+       struct mtk_mutex_ctx *mtx = container_of(mutex, struct mtk_mutex_ctx,
+                                                mutex[mutex->id]);
+#if IS_REACHABLE(CONFIG_MTK_CMDQ)
+       struct cmdq_pkt *cmdq_pkt = (struct cmdq_pkt *)pkt;
+
+       WARN_ON(&mtx->mutex[mutex->id] != mutex);
+
+       if (!mtx->cmdq_reg.size) {
+               dev_err(mtx->dev, "mediatek,gce-client-reg hasn't been set");
+               return -EINVAL;
+       }
+
+       cmdq_pkt_write(cmdq_pkt, mtx->cmdq_reg.subsys,
+                      mtx->addr + DISP_REG_MUTEX_EN(mutex->id), 1);
+       return 0;
+#else
+       dev_err(mtx->dev, "Not support for enable MUTEX by CMDQ");
+       return -ENODEV;
+#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,
@@ -722,8 +750,11 @@ 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;
+#if IS_REACHABLE(CONFIG_MTK_CMDQ)
+       int ret;
+#endif
 
        mtx = devm_kzalloc(dev, sizeof(*mtx), GFP_KERNEL);
        if (!mtx)
@@ -743,6 +774,18 @@ static int mtk_mutex_probe(struct platform_device *pdev)
                }
        }
 
+       if (of_address_to_resource(dev->of_node, 0, &addr) < 0) {
+               dev_err(dev, "Failed to get addr\n");
+               return -EINVAL;
+       }
+       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");
+#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 2ddab9d2b85d4a88c61027d2564fa5c4f47de88f..a0f4f51a3b45dc2e7849020b3a37aff9414600ed 100644 (file)
--- a/include/linux/soc/mediatek/mtk-mutex.h
+++ b/include/linux/soc/mediatek/mtk-mutex.h
@@ -35,6 +35,8 @@ int mtk_mutex_prepare(struct mtk_mutex *mutex);
 void mtk_mutex_add_comp(struct mtk_mutex *mutex,
                        enum mtk_ddp_comp_id id);
 void mtk_mutex_enable(struct mtk_mutex *mutex);
+int 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);