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>
---
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;
+ u32 value;
+};
+
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)
+ 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)
+ 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:
+ 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);
--
2.18.0
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 <moudy.ho@mediatek.com> > --- > 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);
© 2016 - 2024 Red Hat, Inc.