* [PATCH 1/2] dt-bindings: remoteproc: mediatek: Add binding for mt8186 scp
2022-01-04 11:47 [PATCH 0/2] Add SCP support for mt8186 allen-kh.cheng
@ 2022-01-04 11:47 ` allen-kh.cheng
2022-01-04 11:47 ` [PATCH 2/2] remoteproc: mediatek: Support " allen-kh.cheng
2022-01-04 16:53 ` [PATCH 0/2] Add SCP support for mt8186 Mathieu Poirier
2 siblings, 0 replies; 5+ messages in thread
From: allen-kh.cheng @ 2022-01-04 11:47 UTC (permalink / raw)
To: Ohad Ben-Cohen, Bjorn Andersson, Mathieu Poirier, Rob Herring,
Matthias Brugger
Cc: Tinghan Shen, Project_Global_Chrome_Upstream_Group, linux-kernel,
devicetree, linux-mediatek, linux-arm-kernel, linux-remoteproc,
allen-kh.cheng
Add mt8186 compatible to binding document.
Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com>
Reviewed-By: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
---
Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml b/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml
index d21a25ee96e6..5b693a2d049c 100644
--- a/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml
@@ -17,6 +17,7 @@ properties:
compatible:
enum:
- mediatek,mt8183-scp
+ - mediatek,mt8186-scp
- mediatek,mt8192-scp
- mediatek,mt8195-scp
--
2.18.0
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] remoteproc: mediatek: Support mt8186 scp
2022-01-04 11:47 [PATCH 0/2] Add SCP support for mt8186 allen-kh.cheng
2022-01-04 11:47 ` [PATCH 1/2] dt-bindings: remoteproc: mediatek: Add binding for mt8186 scp allen-kh.cheng
@ 2022-01-04 11:47 ` allen-kh.cheng
2022-01-05 9:19 ` AngeloGioacchino Del Regno
2022-01-04 16:53 ` [PATCH 0/2] Add SCP support for mt8186 Mathieu Poirier
2 siblings, 1 reply; 5+ messages in thread
From: allen-kh.cheng @ 2022-01-04 11:47 UTC (permalink / raw)
To: Ohad Ben-Cohen, Bjorn Andersson, Mathieu Poirier, Rob Herring,
Matthias Brugger
Cc: Tinghan Shen, Project_Global_Chrome_Upstream_Group, linux-kernel,
devicetree, linux-mediatek, linux-arm-kernel, linux-remoteproc,
allen-kh.cheng
Add SCP support for mt8186
Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com>
---
drivers/remoteproc/mtk_common.h | 3 +++
drivers/remoteproc/mtk_scp.c | 35 +++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+)
diff --git a/drivers/remoteproc/mtk_common.h b/drivers/remoteproc/mtk_common.h
index 5ff3867c72f3..71ce4977cb0b 100644
--- a/drivers/remoteproc/mtk_common.h
+++ b/drivers/remoteproc/mtk_common.h
@@ -32,6 +32,9 @@
#define MT8183_SCP_CACHESIZE_8KB BIT(8)
#define MT8183_SCP_CACHE_CON_WAYEN BIT(10)
+#define MT8186_SCP_L1_SRAM_PD_P1 0x40B0
+#define MT8186_SCP_L1_SRAM_PD_p2 0x40B4
+
#define MT8192_L2TCM_SRAM_PD_0 0x10C0
#define MT8192_L2TCM_SRAM_PD_1 0x10C4
#define MT8192_L2TCM_SRAM_PD_2 0x10C8
diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
index 36e48cf58ed6..6860ea4d5125 100644
--- a/drivers/remoteproc/mtk_scp.c
+++ b/drivers/remoteproc/mtk_scp.c
@@ -383,6 +383,27 @@ static void mt8192_power_off_sram(void __iomem *addr)
writel(GENMASK(i, 0), addr);
}
+static int mt8186_scp_before_load(struct mtk_scp *scp)
+{
+ /* Clear SCP to host interrupt */
+ writel(MT8183_SCP_IPC_INT_BIT, scp->reg_base + MT8183_SCP_TO_HOST);
+
+ /* Reset clocks before loading FW */
+ writel(0x0, scp->reg_base + MT8183_SCP_CLK_SW_SEL);
+ writel(0x0, scp->reg_base + MT8183_SCP_CLK_DIV_SEL);
+
+ /* Turn on the power of SCP's SRAM before using it. Enable 1 block per time*/
+ mt8192_power_on_sram(scp->reg_base + MT8183_SCP_SRAM_PDN);
+
+ /* Initialize TCM before loading FW. */
+ writel(0x0, scp->reg_base + MT8183_SCP_L1_SRAM_PD);
+ writel(0x0, scp->reg_base + MT8183_SCP_TCM_TAIL_SRAM_PD);
+ writel(0x0, scp->reg_base + MT8186_SCP_L1_SRAM_PD_P1);
+ writel(0x0, scp->reg_base + MT8186_SCP_L1_SRAM_PD_p2);
+
+ return 0;
+}
+
static int mt8192_scp_before_load(struct mtk_scp *scp)
{
/* clear SPM interrupt, SCP2SPM_IPC_CLR */
@@ -887,6 +908,19 @@ static const struct mtk_scp_of_data mt8183_of_data = {
.ipi_buf_offset = 0x7bdb0,
};
+static const struct mtk_scp_of_data mt8186_of_data = {
+ .scp_clk_get = mt8195_scp_clk_get,
+ .scp_before_load = mt8186_scp_before_load,
+ .scp_irq_handler = mt8183_scp_irq_handler,
+ .scp_reset_assert = mt8183_scp_reset_assert,
+ .scp_reset_deassert = mt8183_scp_reset_deassert,
+ .scp_stop = mt8183_scp_stop,
+ .scp_da_to_va = mt8183_scp_da_to_va,
+ .host_to_scp_reg = MT8183_HOST_TO_SCP,
+ .host_to_scp_int_bit = MT8183_HOST_IPC_INT_BIT,
+ .ipi_buf_offset = 0x7bdb0,
+};
+
static const struct mtk_scp_of_data mt8192_of_data = {
.scp_clk_get = mt8192_scp_clk_get,
.scp_before_load = mt8192_scp_before_load,
@@ -913,6 +947,7 @@ static const struct mtk_scp_of_data mt8195_of_data = {
static const struct of_device_id mtk_scp_of_match[] = {
{ .compatible = "mediatek,mt8183-scp", .data = &mt8183_of_data },
+ { .compatible = "mediatek,mt8186-scp", .data = &mt8186_of_data },
{ .compatible = "mediatek,mt8192-scp", .data = &mt8192_of_data },
{ .compatible = "mediatek,mt8195-scp", .data = &mt8195_of_data },
{},
--
2.18.0
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 0/2] Add SCP support for mt8186
2022-01-04 11:47 [PATCH 0/2] Add SCP support for mt8186 allen-kh.cheng
2022-01-04 11:47 ` [PATCH 1/2] dt-bindings: remoteproc: mediatek: Add binding for mt8186 scp allen-kh.cheng
2022-01-04 11:47 ` [PATCH 2/2] remoteproc: mediatek: Support " allen-kh.cheng
@ 2022-01-04 16:53 ` Mathieu Poirier
2 siblings, 0 replies; 5+ messages in thread
From: Mathieu Poirier @ 2022-01-04 16:53 UTC (permalink / raw)
To: allen-kh.cheng
Cc: Ohad Ben-Cohen, Bjorn Andersson, Rob Herring, Matthias Brugger,
Tinghan Shen, Project_Global_Chrome_Upstream_Group, linux-kernel,
devicetree, linux-mediatek, linux-arm-kernel, linux-remoteproc
Hi Allen,
On Tue, Jan 04, 2022 at 07:47:04PM +0800, allen-kh.cheng wrote:
> From: Allen-KH Cheng <Allen-KH.Cheng@mediatek.com>
>
> changes since v1:
> - use mt8192_power_on_sram() helper
> - add MT8186_SCP_L1_SRAM_PD_P1 in mtk_common.h
> - add MT8186_SCP_L1_SRAM_PD_P2 in mtk_common.h
It is quite hard to follow the evolution of this patchset. The second revision
had a "v2" tag but this one doesn't, which can be confused with the patchset
sent on January 3rd. Please send another one (v4) with:
1) A cover letter.
2) The right SoB.
3) The right version tag.
>
> Based on v5.16-rc8
This should be based on rproc-next[1].
Thanks,
Mathieu
https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git/log/?h=rproc-next
>
> allen-kh.cheng (2):
> dt-bindings: remoteproc: mediatek: Add binding for mt8186 scp
> remoteproc: mediatek: Support mt8186 scp
>
> .../bindings/remoteproc/mtk,scp.yaml | 1 +
> drivers/remoteproc/mtk_common.h | 3 ++
> drivers/remoteproc/mtk_scp.c | 35 +++++++++++++++++++
> 3 files changed, 39 insertions(+)
>
> --
> 2.18.0
>
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 5+ messages in thread