Re: [PATCH v18 1/6] soc: mediatek: mutex: add common interface for modules setting

[CK Hu <ck.hu@mediatek.com>]

Hi, Moudy:

On Thu, 2022-05-12 at 16:41 +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 <moudy.ho@mediatek.com>
> Reviewed-by: AngeloGioacchino Del Regno <
> angelogioacchino.delregno@collabora.com>
> ---
>  drivers/soc/mediatek/mtk-mutex.c       | 88
> ++++++++++++++++++++++++++
>  include/linux/soc/mediatek/mtk-mutex.h | 22 +++++++
>  2 files changed, 110 insertions(+)
> 
> diff --git a/drivers/soc/mediatek/mtk-mutex.c
> b/drivers/soc/mediatek/mtk-mutex.c
> index aaf8fc1abb43..a62ac1811419 100644
> --- a/drivers/soc/mediatek/mtk-mutex.c
> +++ b/drivers/soc/mediatek/mtk-mutex.c
> @@ -156,6 +156,8 @@ struct mtk_mutex_data {
>  	const unsigned int *mutex_sof;
>  	const unsigned int mutex_mod_reg;
>  	const unsigned int mutex_sof_reg;
> +	const unsigned int *mutex_table_mod;
> +	const unsigned int *mutex_table_sof;
>  	const bool no_clk;
>  };
>  
> @@ -530,6 +532,92 @@ void mtk_mutex_release(struct mtk_mutex *mutex)
>  }
>  EXPORT_SYMBOL_GPL(mtk_mutex_release);
>  
> +static int mtk_mutex_write_mod(struct mtk_mutex *mutex,
> +			       enum mtk_mutex_table_index idx, bool
> clear)
> +{
> +	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) {
> +		dev_err(mtx->dev, "Not supported MOD table index : %d",
> idx);
> +		return -EINVAL;
> +	}
> +
> +	offset = DISP_REG_MUTEX_MOD(mtx->data->mutex_mod_reg,
> +				    mutex->id);
> +	reg = readl_relaxed(mtx->regs + offset);
> +
> +	if (clear)
> +		reg &= ~BIT(mtx->data->mutex_table_mod[idx]);
> +	else
> +		reg |= BIT(mtx->data->mutex_table_mod[idx]);
> +
> +	writel_relaxed(reg, mtx->regs + offset);
> +
> +	return 0;
> +}
> +
> +int mtk_mutex_set_mod(struct mtk_mutex *mutex,
> +		      enum mtk_mutex_table_index idx)
> +{
> +	return mtk_mutex_write_mod(mutex, idx, false);
> +}
> +EXPORT_SYMBOL_GPL(mtk_mutex_set_mod);

Why not just export symbol of mtk_mutex_write_mod() and drop
mtk_mutex_set_mod()/mtk_mutex_clear_mod()?

> +
> +int mtk_mutex_clear_mod(struct mtk_mutex *mutex,
> +			enum mtk_mutex_table_index idx)
> +{
> +	return mtk_mutex_write_mod(mutex, idx, true);
> +}
> +EXPORT_SYMBOL_GPL(mtk_mutex_clear_mod);
> +
> +int mtk_mutex_write_sof(struct mtk_mutex *mutex,
> +			enum mtk_mutex_table_index idx, bool clear)
> +{
> +	struct mtk_mutex_ctx *mtx = container_of(mutex, struct
> mtk_mutex_ctx,
> +						 mutex[mutex->id]);
> +	unsigned int sof_id, val;
> +
> +	WARN_ON(&mtx->mutex[mutex->id] != mutex);
> +
> +	if (idx < MUTEX_TABLE_IDX_MDP_RDMA0 ||
> +	    idx >= MUTEX_TABLE_IDX_MAX) {
> +		dev_err(mtx->dev, "Not supported SOF table index : %d",
> idx);
> +		return -EINVAL;
> +	}
> +
> +	sof_id = mtx->data->mutex_table_sof[idx];

Why do you map each idx to a sof? For each idx, we could choose sof by
different application. I would like to change parameter
mtk_mutex_table_index to mtk_mutex_sof_index.

Regards,
CK

> +
> +	if (clear)
> +		val = MUTEX_SOF_SINGLE_MODE;
> +	else
> +		val = mtx->data->mutex_sof[sof_id];
> +
> +	writel_relaxed(val, mtx->regs +
> +		       DISP_REG_MUTEX_SOF(mtx->data->mutex_sof_reg,
> mutex->id));
> +
> +	return 0;
> +}
> +
> +int mtk_mutex_set_sof(struct mtk_mutex *mutex,
> +		      enum mtk_mutex_table_index idx)
> +{
> +	return mtk_mutex_write_sof(mutex, idx, false);
> +}
> +EXPORT_SYMBOL_GPL(mtk_mutex_set_sof);
> +
> +int mtk_mutex_clear_sof(struct mtk_mutex *mutex,
> +			enum mtk_mutex_table_index idx)
> +{
> +	return mtk_mutex_write_sof(mutex, idx, true);
> +}
> +EXPORT_SYMBOL_GPL(mtk_mutex_clear_sof);
> +
>  static int mtk_mutex_probe(struct platform_device *pdev)
>  {
>  	struct device *dev = &pdev->dev;
> diff --git a/include/linux/soc/mediatek/mtk-mutex.h
> b/include/linux/soc/mediatek/mtk-mutex.h
> index 6fe4ffbde290..f174452212d6 100644
> --- a/include/linux/soc/mediatek/mtk-mutex.h
> +++ b/include/linux/soc/mediatek/mtk-mutex.h
> @@ -10,6 +10,20 @@ 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,
> @@ -22,5 +36,13 @@ void mtk_mutex_unprepare(struct mtk_mutex *mutex);
>  void mtk_mutex_put(struct mtk_mutex *mutex);
>  void mtk_mutex_acquire(struct mtk_mutex *mutex);
>  void mtk_mutex_release(struct mtk_mutex *mutex);
> +int mtk_mutex_set_mod(struct mtk_mutex *mutex,
> +		      enum mtk_mutex_table_index idx);
> +int mtk_mutex_clear_mod(struct mtk_mutex *mutex,
> +			enum mtk_mutex_table_index idx);
> +int mtk_mutex_set_sof(struct mtk_mutex *mutex,
> +		      enum mtk_mutex_table_index idx);
> +int mtk_mutex_clear_sof(struct mtk_mutex *mutex,
> +			enum mtk_mutex_table_index idx);
>  
>  #endif /* MTK_MUTEX_H */