Message ID | 20220531055224.19280-2-moudy.ho@mediatek.com |
---|---|
State | New |
Headers | show |
Series | [v19,1/6] soc: mediatek: mutex: add common interface for modules setting | expand |
Hi, Moudy: On Tue, 2022-05-31 at 13:52 +0800, Moudy Ho wrote: > In order to allow multiple modules to operate MUTEX hardware through > a common interfrace, two flexible indexes "mtk_mutex_mod_index" and > "mtk_mutex_sof_index" need to be added to replace original component > ID so that like DDP and MDP can add their own MOD table or SOF > settings independently. > > In addition, 2 generic interface "mtk_mutex_write_mod" and > "mtk_mutex_write_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> > Reviewed-by: Rex-BC Chen <rex-bc.chen@mediatek.com> > --- > drivers/soc/mediatek/mtk-mutex.c | 59 > ++++++++++++++++++++++++++ > include/linux/soc/mediatek/mtk-mutex.h | 26 ++++++++++++ > 2 files changed, 85 insertions(+) > > diff --git a/drivers/soc/mediatek/mtk-mutex.c > b/drivers/soc/mediatek/mtk-mutex.c > index 981d56967e7a..a3b054b33826 100644 > --- a/drivers/soc/mediatek/mtk-mutex.c > +++ b/drivers/soc/mediatek/mtk-mutex.c > @@ -185,6 +185,7 @@ 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 bool no_clk; > }; > > @@ -606,6 +607,64 @@ void mtk_mutex_release(struct mtk_mutex *mutex) > } > EXPORT_SYMBOL_GPL(mtk_mutex_release); > > +int mtk_mutex_write_mod(struct mtk_mutex *mutex, > + enum mtk_mutex_mod_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_MOD_IDX_MDP_RDMA0 || > + idx >= MUTEX_MOD_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; > +} > +EXPORT_SYMBOL_GPL(mtk_mutex_write_mod); > + > +int mtk_mutex_write_sof(struct mtk_mutex *mutex, > + enum mtk_mutex_sof_index idx, bool clear) > +{ > + struct mtk_mutex_ctx *mtx = container_of(mutex, struct > mtk_mutex_ctx, > + mutex[mutex->id]); > + unsigned int val; > + > + WARN_ON(&mtx->mutex[mutex->id] != mutex); > + > + if (idx < MUTEX_SOF_IDX_SINGLE_MODE || > + idx >= MUTEX_SOF_IDX_MAX) { > + dev_err(mtx->dev, "Not supported SOF index : %d", idx); > + return -EINVAL; > + } > + > + if (clear) > + val = MUTEX_SOF_SINGLE_MODE; This equal to 'idx = MUTEX_SOF_SINGLE_MODE', so 'clear' is not necessary. Regards, CK > + else > + val = idx; > + > + writel_relaxed(val, mtx->regs + > + DISP_REG_MUTEX_SOF(mtx->data->mutex_sof_reg, > mutex->id)); > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(mtk_mutex_write_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..829231523e3f 100644 > --- a/include/linux/soc/mediatek/mtk-mutex.h > +++ b/include/linux/soc/mediatek/mtk-mutex.h > @@ -10,6 +10,26 @@ struct regmap; > struct device; > struct mtk_mutex; > > +enum mtk_mutex_mod_index { > + /* MDP table index */ > + MUTEX_MOD_IDX_MDP_RDMA0, > + MUTEX_MOD_IDX_MDP_RSZ0, > + MUTEX_MOD_IDX_MDP_RSZ1, > + MUTEX_MOD_IDX_MDP_TDSHP0, > + MUTEX_MOD_IDX_MDP_WROT0, > + MUTEX_MOD_IDX_MDP_WDMA, > + MUTEX_MOD_IDX_MDP_AAL0, > + MUTEX_MOD_IDX_MDP_CCORR0, > + > + MUTEX_MOD_IDX_MAX /* ALWAYS keep at the end */ > +}; > + > +enum mtk_mutex_sof_index { > + MUTEX_SOF_IDX_SINGLE_MODE, > + > + MUTEX_SOF_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 +42,11 @@ 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_write_mod(struct mtk_mutex *mutex, > + enum mtk_mutex_mod_index idx, > + bool clear); > +int mtk_mutex_write_sof(struct mtk_mutex *mutex, > + enum mtk_mutex_sof_index idx, > + bool clear); > > #endif /* MTK_MUTEX_H */
diff --git a/drivers/soc/mediatek/mtk-mutex.c b/drivers/soc/mediatek/mtk-mutex.c index 981d56967e7a..a3b054b33826 100644 --- a/drivers/soc/mediatek/mtk-mutex.c +++ b/drivers/soc/mediatek/mtk-mutex.c @@ -185,6 +185,7 @@ 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 bool no_clk; }; @@ -606,6 +607,64 @@ void mtk_mutex_release(struct mtk_mutex *mutex) } EXPORT_SYMBOL_GPL(mtk_mutex_release); +int mtk_mutex_write_mod(struct mtk_mutex *mutex, + enum mtk_mutex_mod_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_MOD_IDX_MDP_RDMA0 || + idx >= MUTEX_MOD_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; +} +EXPORT_SYMBOL_GPL(mtk_mutex_write_mod); + +int mtk_mutex_write_sof(struct mtk_mutex *mutex, + enum mtk_mutex_sof_index idx, bool clear) +{ + struct mtk_mutex_ctx *mtx = container_of(mutex, struct mtk_mutex_ctx, + mutex[mutex->id]); + unsigned int val; + + WARN_ON(&mtx->mutex[mutex->id] != mutex); + + if (idx < MUTEX_SOF_IDX_SINGLE_MODE || + idx >= MUTEX_SOF_IDX_MAX) { + dev_err(mtx->dev, "Not supported SOF index : %d", idx); + return -EINVAL; + } + + if (clear) + val = MUTEX_SOF_SINGLE_MODE; + else + val = idx; + + writel_relaxed(val, mtx->regs + + DISP_REG_MUTEX_SOF(mtx->data->mutex_sof_reg, mutex->id)); + + return 0; +} +EXPORT_SYMBOL_GPL(mtk_mutex_write_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..829231523e3f 100644 --- a/include/linux/soc/mediatek/mtk-mutex.h +++ b/include/linux/soc/mediatek/mtk-mutex.h @@ -10,6 +10,26 @@ struct regmap; struct device; struct mtk_mutex; +enum mtk_mutex_mod_index { + /* MDP table index */ + MUTEX_MOD_IDX_MDP_RDMA0, + MUTEX_MOD_IDX_MDP_RSZ0, + MUTEX_MOD_IDX_MDP_RSZ1, + MUTEX_MOD_IDX_MDP_TDSHP0, + MUTEX_MOD_IDX_MDP_WROT0, + MUTEX_MOD_IDX_MDP_WDMA, + MUTEX_MOD_IDX_MDP_AAL0, + MUTEX_MOD_IDX_MDP_CCORR0, + + MUTEX_MOD_IDX_MAX /* ALWAYS keep at the end */ +}; + +enum mtk_mutex_sof_index { + MUTEX_SOF_IDX_SINGLE_MODE, + + MUTEX_SOF_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 +42,11 @@ 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_write_mod(struct mtk_mutex *mutex, + enum mtk_mutex_mod_index idx, + bool clear); +int mtk_mutex_write_sof(struct mtk_mutex *mutex, + enum mtk_mutex_sof_index idx, + bool clear); #endif /* MTK_MUTEX_H */