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 641D6C433EF for ; Tue, 22 Mar 2022 09:37:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232636AbiCVJjT (ORCPT ); Tue, 22 Mar 2022 05:39:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232608AbiCVJjS (ORCPT ); Tue, 22 Mar 2022 05:39:18 -0400 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D6865F88; Tue, 22 Mar 2022 02:37:50 -0700 (PDT) X-UUID: 9ef5b65970ee4d8bba8a8f4bf3a27690-20220322 X-UUID: 9ef5b65970ee4d8bba8a8f4bf3a27690-20220322 Received: from mtkexhb02.mediatek.inc [(172.21.101.103)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1629472461; Tue, 22 Mar 2022 17:37:44 +0800 Received: from mtkexhb01.mediatek.inc (172.21.101.102) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.15; Tue, 22 Mar 2022 17:37:43 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkexhb01.mediatek.inc (172.21.101.102) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 22 Mar 2022 17:37:41 +0800 Received: from mtksdccf07 (172.21.84.99) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 22 Mar 2022 17:37:41 +0800 Message-ID: <0a81bedfecd0f691c4da06640c50fc409f1e2cb0.camel@mediatek.com> Subject: Re: [PATCH v14 1/6] soc: mediatek: mutex: add common interface to accommodate multiple modules operationg MUTEX From: CK Hu To: Moudy Ho , Mauro Carvalho Chehab , Rob Herring , Matthias Brugger , Hans Verkuil , "Jernej Skrabec" CC: Chun-Kuang Hu , Geert Uytterhoeven , Rob Landley , Laurent Pinchart , , , , , , Alexandre Courbot , , , , , AngeloGioacchino Del Regno , Maoguang Meng , daoyuan huang , Ping-Hsun Wu , , , , , , , , , Date: Tue, 22 Mar 2022 17:37:41 +0800 In-Reply-To: <20220317143926.15835-2-moudy.ho@mediatek.com> References: <20220317143926.15835-1-moudy.ho@mediatek.com> <20220317143926.15835-2-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-03-17 at 22:39 +0800, Moudy Ho wrote: > In order to allow multiple modules to operate MUTEX hardware through > a common interfrace, a flexible index "mtk_mutex_table_index" needs > to > be added to replace original component ID so that like DDP and MDP > can add their own MUTEX table settings independently. > > In addition, 4 generic interface "mtk_mutex_set_mod", > "mtk_mutex_set_sof", > "mtk_mutex_clear_mod" and "mtk_mutex_clear_sof" have been added, > which is > expected to replace the "mtk_mutex_add_comp" and > "mtk_mutex_remove_comp" > pair originally dedicated to DDP in the future. > > Signed-off-by: Moudy Ho > --- > drivers/soc/mediatek/mtk-mutex.c | 105 > +++++++++++++++++++++++++ > include/linux/soc/mediatek/mtk-mutex.h | 21 +++++ > 2 files changed, 126 insertions(+) > > diff --git a/drivers/soc/mediatek/mtk-mutex.c > b/drivers/soc/mediatek/mtk-mutex.c > index aaf8fc1abb43..f8c33186685a 100644 > --- a/drivers/soc/mediatek/mtk-mutex.c > +++ b/drivers/soc/mediatek/mtk-mutex.c > @@ -151,11 +151,17 @@ enum mtk_mutex_sof_id { > MUTEX_SOF_DSI3, > }; > > +struct mtk_mutex_mod { > + u8 tab; tab is always 0 in this series, so remove this. > + u32 value; Without tab, this struct is not necessary. > +}; > + > struct mtk_mutex_data { > const unsigned int *mutex_mod; > const unsigned int *mutex_sof; > const unsigned int mutex_mod_reg; > const unsigned int mutex_sof_reg; > + const struct mtk_mutex_mod *mutex_table_mod; > const bool no_clk; > }; > > @@ -445,6 +451,65 @@ void mtk_mutex_add_comp(struct mtk_mutex *mutex, > } > EXPORT_SYMBOL_GPL(mtk_mutex_add_comp); > > +void mtk_mutex_set_mod(struct mtk_mutex *mutex, > + enum mtk_mutex_table_index idx) > +{ > + struct mtk_mutex_ctx *mtx = container_of(mutex, struct > mtk_mutex_ctx, > + mutex[mutex->id]); > + unsigned int reg; > + unsigned int offset; > + > + WARN_ON(&mtx->mutex[mutex->id] != mutex); > + > + if (idx < MUTEX_TABLE_IDX_MDP_RDMA0 || > + idx >= MUTEX_TABLE_IDX_MAX) error message? > + return; > + > + if (mtx->data->mutex_table_mod[idx].tab) > + offset = DISP_REG_MUTEX_MOD2(mutex->id); > + else > + offset = DISP_REG_MUTEX_MOD(mtx->data->mutex_mod_reg, > + mutex->id); > + > + reg = readl_relaxed(mtx->regs + offset); > + reg |= 1 << mtx->data->mutex_table_mod[idx].value; > + writel_relaxed(reg, mtx->regs + offset); > +} > +EXPORT_SYMBOL_GPL(mtk_mutex_set_mod); > + > +void mtk_mutex_set_sof(struct mtk_mutex *mutex, > + enum mtk_mutex_table_index idx) > +{ > + struct mtk_mutex_ctx *mtx = container_of(mutex, struct > mtk_mutex_ctx, > + mutex[mutex->id]); > + unsigned int sof_id; > + > + WARN_ON(&mtx->mutex[mutex->id] != mutex); > + > + if (idx < MUTEX_TABLE_IDX_MDP_RDMA0 || > + idx >= MUTEX_TABLE_IDX_MAX) Ditto. > + return; > + > + switch (idx) { > + case MUTEX_TABLE_IDX_MDP_RDMA0: > + case MUTEX_TABLE_IDX_MDP_RSZ0: > + case MUTEX_TABLE_IDX_MDP_RSZ1: > + case MUTEX_TABLE_IDX_MDP_TDSHP0: > + case MUTEX_TABLE_IDX_MDP_WROT0: > + case MUTEX_TABLE_IDX_MDP_WDMA: > + case MUTEX_TABLE_IDX_MDP_AAL0: > + case MUTEX_TABLE_IDX_MDP_CCORR0: Error & return? Regards, CK > + default: > + sof_id = MUTEX_SOF_SINGLE_MODE; > + break; > + } > + > + writel_relaxed(mtx->data->mutex_sof[sof_id], > + mtx->regs + > + DISP_REG_MUTEX_SOF(mtx->data->mutex_sof_reg, > mutex->id)); > +} > +EXPORT_SYMBOL_GPL(mtk_mutex_set_sof); > + > void mtk_mutex_remove_comp(struct mtk_mutex *mutex, > enum mtk_ddp_comp_id id) > { > @@ -485,6 +550,46 @@ void mtk_mutex_remove_comp(struct mtk_mutex > *mutex, > } > EXPORT_SYMBOL_GPL(mtk_mutex_remove_comp); > > +void mtk_mutex_clear_mod(struct mtk_mutex *mutex, > + enum mtk_mutex_table_index idx) > +{ > + struct mtk_mutex_ctx *mtx = container_of(mutex, struct > mtk_mutex_ctx, > + mutex[mutex->id]); > + unsigned int reg; > + unsigned int offset; > + > + WARN_ON(&mtx->mutex[mutex->id] != mutex); > + > + if (idx < MUTEX_TABLE_IDX_MDP_RDMA0 || > + idx >= MUTEX_TABLE_IDX_MAX) > + return; > + > + if (mtx->data->mutex_table_mod[idx].tab) > + offset = DISP_REG_MUTEX_MOD2(mutex->id); > + else > + offset = DISP_REG_MUTEX_MOD(mtx->data->mutex_mod_reg, > + mutex->id); > + > + reg = readl_relaxed(mtx->regs + offset); > + reg &= ~(1 << mtx->data->mutex_table_mod[idx].value); > + writel_relaxed(reg, mtx->regs + offset); > +} > +EXPORT_SYMBOL_GPL(mtk_mutex_clear_mod); > + > +void mtk_mutex_clear_sof(struct mtk_mutex *mutex) > +{ > + struct mtk_mutex_ctx *mtx = container_of(mutex, struct > mtk_mutex_ctx, > + mutex[mutex->id]); > + > + WARN_ON(&mtx->mutex[mutex->id] != mutex); > + > + writel_relaxed(MUTEX_SOF_SINGLE_MODE, > + mtx->regs + > + DISP_REG_MUTEX_SOF(mtx->data->mutex_sof_reg, > + mutex->id)); > +} > +EXPORT_SYMBOL_GPL(mtk_mutex_clear_sof); > + > void mtk_mutex_enable(struct mtk_mutex *mutex) > { > struct mtk_mutex_ctx *mtx = container_of(mutex, struct > mtk_mutex_ctx, > diff --git a/include/linux/soc/mediatek/mtk-mutex.h > b/include/linux/soc/mediatek/mtk-mutex.h > index 6fe4ffbde290..200f4365c950 100644 > --- a/include/linux/soc/mediatek/mtk-mutex.h > +++ b/include/linux/soc/mediatek/mtk-mutex.h > @@ -10,14 +10,35 @@ struct regmap; > struct device; > struct mtk_mutex; > > +enum mtk_mutex_table_index { > + /* MDP table index */ > + MUTEX_TABLE_IDX_MDP_RDMA0, > + MUTEX_TABLE_IDX_MDP_RSZ0, > + MUTEX_TABLE_IDX_MDP_RSZ1, > + MUTEX_TABLE_IDX_MDP_TDSHP0, > + MUTEX_TABLE_IDX_MDP_WROT0, > + MUTEX_TABLE_IDX_MDP_WDMA, > + MUTEX_TABLE_IDX_MDP_AAL0, > + MUTEX_TABLE_IDX_MDP_CCORR0, > + > + MUTEX_TABLE_IDX_MAX /* ALWAYS keep at the end */ > +}; > + > struct mtk_mutex *mtk_mutex_get(struct device *dev); > 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_set_mod(struct mtk_mutex *mutex, > + enum mtk_mutex_table_index idx); > +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_disable(struct mtk_mutex *mutex); > void mtk_mutex_remove_comp(struct mtk_mutex *mutex, > enum mtk_ddp_comp_id id); > +void mtk_mutex_clear_mod(struct mtk_mutex *mutex, > + enum mtk_mutex_table_index idx); > +void mtk_mutex_clear_sof(struct mtk_mutex *mutex); > void mtk_mutex_unprepare(struct mtk_mutex *mutex); > void mtk_mutex_put(struct mtk_mutex *mutex); > void mtk_mutex_acquire(struct mtk_mutex *mutex);