From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C3ECC4332F for ; Fri, 27 May 2022 09:30:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236696AbiE0Ja4 (ORCPT ); Fri, 27 May 2022 05:30:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350599AbiE0Jax (ORCPT ); Fri, 27 May 2022 05:30:53 -0400 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 128C3FD37C; Fri, 27 May 2022 02:30:48 -0700 (PDT) X-UUID: b7df0aabe2694a75bc2d2f914f191f3d-20220527 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.5,REQID:ebdbe9a2-ce8a-476e-823e-b1af4bf74b6c,OB:0,LO B:0,IP:0,URL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,RULE:Release_Ham,ACTI ON:release,TS:0 X-CID-META: VersionHash:2a19b09,CLOUDID:2dc6b847-4fb1-496b-8f1d-39e733fed1ea,C OID:IGNORED,Recheck:0,SF:nil,TC:nil,Content:0,EDM:-3,IP:nil,URL:0,File:nil ,QS:0,BEC:nil X-UUID: b7df0aabe2694a75bc2d2f914f191f3d-20220527 Received: from mtkmbs10n2.mediatek.inc [(172.21.101.183)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 229779352; Fri, 27 May 2022 17:30:42 +0800 Received: from mtkmbs11n1.mediatek.inc (172.21.101.186) by mtkmbs11n2.mediatek.inc (172.21.101.187) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.3; Fri, 27 May 2022 17:30:40 +0800 Received: from mtksdccf07 (172.21.84.99) by mtkmbs11n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.3 via Frontend Transport; Fri, 27 May 2022 17:30:40 +0800 Message-ID: <997da91ccc893a53cf4e7713ba08b5e32043c507.camel@mediatek.com> Subject: Re: [PATCH v18 6/6] soc: mediatek: mutex: add functions that operate registers by CMDQ From: CK Hu To: Moudy Ho , Mauro Carvalho Chehab , Rob Herring , Matthias Brugger , Krzysztof Kozlowski , Hans Verkuil CC: Chun-Kuang Hu , Rob Landley , Laurent Pinchart , , , , , , Alexandre Courbot , , , , , Benjamin Gaignard , AngeloGioacchino Del Regno , daoyuan huang , Ping-Hsun Wu , , , , , , , , Date: Fri, 27 May 2022 17:30:40 +0800 In-Reply-To: <20220512084139.15086-7-moudy.ho@mediatek.com> References: <20220512084139.15086-1-moudy.ho@mediatek.com> <20220512084139.15086-7-moudy.ho@mediatek.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, Moudy: On Thu, 2022-05-12 at 16:41 +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 > Reviewed-by: AngeloGioacchino Del Regno < > angelogioacchino.delregno@collabora.com> > --- > drivers/soc/mediatek/mtk-mutex.c | 47 > +++++++++++++++++++++++++- > include/linux/soc/mediatek/mtk-mutex.h | 2 ++ > 2 files changed, 48 insertions(+), 1 deletion(-) > > diff --git a/drivers/soc/mediatek/mtk-mutex.c > b/drivers/soc/mediatek/mtk-mutex.c > index 92afdee14d43..4ec2954f2f43 100644 > --- a/drivers/soc/mediatek/mtk-mutex.c > +++ b/drivers/soc/mediatek/mtk-mutex.c > @@ -7,10 +7,12 @@ > #include > #include > #include > +#include > #include > #include > #include > #include > +#include > > #define MT2701_MUTEX0_MOD0 0x2c > #define MT2701_MUTEX0_SOF0 0x30 > @@ -176,6 +178,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; I think this is not necessary. If cmdq_reg.size == 0, that would imply cmdq_reg is invalid. > }; > > static const unsigned int mt2701_mutex_mod[DDP_COMPONENT_ID_MAX] = { > @@ -531,6 +536,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->has_gce_client_reg) { > + dev_err(mtx->dev, "mediatek,gce-client-reg hasn't been > set in dts"); > + 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, > @@ -655,8 +684,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) > @@ -676,6 +708,19 @@ static int mtk_mutex_probe(struct > platform_device *pdev) > } > } > > + if (of_address_to_resource(dev->of_node, 0, &addr) < 0) > + mtx->addr = 0L; You may return error, or you should check mtx->addr when use it. Regards, CK > + 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 f174452212d6..80425ae19fb7 100644 > --- a/include/linux/soc/mediatek/mtk-mutex.h > +++ b/include/linux/soc/mediatek/mtk-mutex.h > @@ -29,6 +29,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);