* [PATCH v3 1/3] remoteproc: mediatek: Support platform reg offsets in mtk_scp_of_data
2025-11-10 10:13 [PATCH v3 0/3] Add support for MT8189 SCP and device tree bindings Huayu Zong
@ 2025-11-10 10:13 ` Huayu Zong
2025-11-17 16:47 ` Mathieu Poirier
2025-11-10 10:13 ` [PATCH v3 2/3] remoteproc: mediatek: Add MT8189 SCP platform data Huayu Zong
2025-11-10 10:13 ` [PATCH v3 3/3] dt-bindings: remoteproc: mediatek: Add MT8189 SCP binding Huayu Zong
2 siblings, 1 reply; 7+ messages in thread
From: Huayu Zong @ 2025-11-10 10:13 UTC (permalink / raw)
To: Bjorn Andersson, Mathieu Poirier, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Matthias Brugger,
AngeloGioacchino Del Regno
Cc: linux-remoteproc, devicetree, linux-kernel, linux-arm-kernel,
linux-mediatek, Project_Global_Chrome_Upstream_Group, Huayu Zong
Some platforms only differ in HW register offsets, but can share
the same API. Refine struct mtk_scp_of_data to allow setting HW
register offsets via platform data, enabling better code reuse
and easier support for new platforms.
Signed-off-by: Huayu Zong <huayu.zong@mediatek.com>
---
drivers/remoteproc/mtk_common.h | 5 +++++
drivers/remoteproc/mtk_scp.c | 18 ++++++++++++++++--
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/drivers/remoteproc/mtk_common.h b/drivers/remoteproc/mtk_common.h
index fd5c539ab2ac..d45480ad332e 100644
--- a/drivers/remoteproc/mtk_common.h
+++ b/drivers/remoteproc/mtk_common.h
@@ -112,6 +112,11 @@ struct mtk_scp_of_data {
u32 host_to_scp_reg;
u32 host_to_scp_int_bit;
+ u32 scp_to_host_ipc_clr_reg;
+ u32 scp_to_spm_ipc_clr_reg;
+
+ u32 scp_secure_domain_reg;
+ u32 scp_domain_value;
size_t ipi_buf_offset;
const struct mtk_scp_sizes_data *scp_sizes;
diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
index 10e3f9eb8cd2..c3c37cae933a 100644
--- a/drivers/remoteproc/mtk_scp.c
+++ b/drivers/remoteproc/mtk_scp.c
@@ -236,7 +236,7 @@ static void mt8192_scp_irq_handler(struct mtk_scp *scp)
* MT8192_SCP2APMCU_IPC.
*/
writel(MT8192_SCP_IPC_INT_BIT,
- scp->cluster->reg_base + MT8192_SCP2APMCU_IPC_CLR);
+ scp->cluster->reg_base + scp->data->scp_to_host_ipc_clr_reg);
} else {
scp_wdt_handler(scp, scp_to_host);
writel(1, scp->cluster->reg_base + MT8192_CORE0_WDT_IRQ);
@@ -561,7 +561,7 @@ static int mt8188_scp_c1_before_load(struct mtk_scp *scp)
static int mt8192_scp_before_load(struct mtk_scp *scp)
{
/* clear SPM interrupt, SCP2SPM_IPC_CLR */
- writel(0xff, scp->cluster->reg_base + MT8192_SCP2SPM_IPC_CLR);
+ writel(0xff, scp->cluster->reg_base + scp->data->scp_to_spm_ipc_clr_reg);
writel(1, scp->cluster->reg_base + MT8192_CORE0_SW_RSTN_SET);
@@ -575,6 +575,18 @@ static int mt8192_scp_before_load(struct mtk_scp *scp)
/* enable MPU for all memory regions */
writel(0xff, scp->cluster->reg_base + MT8192_CORE0_MEM_ATT_PREDEF);
+ /* Set the domain of master in SCP.
+ *
+ * In the SCP, cores, DMA, and SPI are masters. When these masters
+ * access memory or devices, they need to carry a domain ID. This
+ * domain ID is used to determine whether they have permission to
+ * access the target device or memory.
+ */
+
+ if (scp->data->scp_secure_domain_reg)
+ writel(scp->data->scp_domain_value,
+ scp->cluster->reg_base + scp->data->scp_secure_domain_reg);
+
return 0;
}
@@ -1527,6 +1539,8 @@ static const struct mtk_scp_of_data mt8192_of_data = {
.scp_da_to_va = mt8192_scp_da_to_va,
.host_to_scp_reg = MT8192_GIPC_IN_SET,
.host_to_scp_int_bit = MT8192_HOST_IPC_INT_BIT,
+ .scp_to_host_ipc_clr_reg = MT8192_SCP2APMCU_IPC_CLR,
+ .scp_to_spm_ipc_clr_reg = MT8192_SCP2SPM_IPC_CLR,
.scp_sizes = &default_scp_sizes,
};
--
2.45.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v3 1/3] remoteproc: mediatek: Support platform reg offsets in mtk_scp_of_data
2025-11-10 10:13 ` [PATCH v3 1/3] remoteproc: mediatek: Support platform reg offsets in mtk_scp_of_data Huayu Zong
@ 2025-11-17 16:47 ` Mathieu Poirier
0 siblings, 0 replies; 7+ messages in thread
From: Mathieu Poirier @ 2025-11-17 16:47 UTC (permalink / raw)
To: Huayu Zong
Cc: Bjorn Andersson, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Matthias Brugger, AngeloGioacchino Del Regno, linux-remoteproc,
devicetree, linux-kernel, linux-arm-kernel, linux-mediatek,
Project_Global_Chrome_Upstream_Group
Good day,
On Mon, Nov 10, 2025 at 06:13:29PM +0800, Huayu Zong wrote:
> Some platforms only differ in HW register offsets, but can share
> the same API. Refine struct mtk_scp_of_data to allow setting HW
> register offsets via platform data, enabling better code reuse
> and easier support for new platforms.
>
> Signed-off-by: Huayu Zong <huayu.zong@mediatek.com>
> ---
> drivers/remoteproc/mtk_common.h | 5 +++++
> drivers/remoteproc/mtk_scp.c | 18 ++++++++++++++++--
> 2 files changed, 21 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/remoteproc/mtk_common.h b/drivers/remoteproc/mtk_common.h
> index fd5c539ab2ac..d45480ad332e 100644
> --- a/drivers/remoteproc/mtk_common.h
> +++ b/drivers/remoteproc/mtk_common.h
> @@ -112,6 +112,11 @@ struct mtk_scp_of_data {
>
> u32 host_to_scp_reg;
> u32 host_to_scp_int_bit;
> + u32 scp_to_host_ipc_clr_reg;
> + u32 scp_to_spm_ipc_clr_reg;
> +
> + u32 scp_secure_domain_reg;
> + u32 scp_domain_value;
>
> size_t ipi_buf_offset;
> const struct mtk_scp_sizes_data *scp_sizes;
> diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
> index 10e3f9eb8cd2..c3c37cae933a 100644
> --- a/drivers/remoteproc/mtk_scp.c
> +++ b/drivers/remoteproc/mtk_scp.c
> @@ -236,7 +236,7 @@ static void mt8192_scp_irq_handler(struct mtk_scp *scp)
> * MT8192_SCP2APMCU_IPC.
> */
> writel(MT8192_SCP_IPC_INT_BIT,
> - scp->cluster->reg_base + MT8192_SCP2APMCU_IPC_CLR);
> + scp->cluster->reg_base + scp->data->scp_to_host_ipc_clr_reg);
> } else {
> scp_wdt_handler(scp, scp_to_host);
> writel(1, scp->cluster->reg_base + MT8192_CORE0_WDT_IRQ);
> @@ -561,7 +561,7 @@ static int mt8188_scp_c1_before_load(struct mtk_scp *scp)
> static int mt8192_scp_before_load(struct mtk_scp *scp)
> {
> /* clear SPM interrupt, SCP2SPM_IPC_CLR */
> - writel(0xff, scp->cluster->reg_base + MT8192_SCP2SPM_IPC_CLR);
> + writel(0xff, scp->cluster->reg_base + scp->data->scp_to_spm_ipc_clr_reg);
>
> writel(1, scp->cluster->reg_base + MT8192_CORE0_SW_RSTN_SET);
>
> @@ -575,6 +575,18 @@ static int mt8192_scp_before_load(struct mtk_scp *scp)
> /* enable MPU for all memory regions */
> writel(0xff, scp->cluster->reg_base + MT8192_CORE0_MEM_ATT_PREDEF);
>
> + /* Set the domain of master in SCP.
> + *
> + * In the SCP, cores, DMA, and SPI are masters. When these masters
> + * access memory or devices, they need to carry a domain ID. This
> + * domain ID is used to determine whether they have permission to
> + * access the target device or memory.
> + */
> +
> + if (scp->data->scp_secure_domain_reg)
> + writel(scp->data->scp_domain_value,
> + scp->cluster->reg_base + scp->data->scp_secure_domain_reg);
> +
This change is not related to the description in the changelog, nor the other
changes in this patch. Please do another patch.
> return 0;
> }
>
> @@ -1527,6 +1539,8 @@ static const struct mtk_scp_of_data mt8192_of_data = {
> .scp_da_to_va = mt8192_scp_da_to_va,
> .host_to_scp_reg = MT8192_GIPC_IN_SET,
> .host_to_scp_int_bit = MT8192_HOST_IPC_INT_BIT,
> + .scp_to_host_ipc_clr_reg = MT8192_SCP2APMCU_IPC_CLR,
> + .scp_to_spm_ipc_clr_reg = MT8192_SCP2SPM_IPC_CLR,
> .scp_sizes = &default_scp_sizes,
> };
>
> --
> 2.45.2
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 2/3] remoteproc: mediatek: Add MT8189 SCP platform data
2025-11-10 10:13 [PATCH v3 0/3] Add support for MT8189 SCP and device tree bindings Huayu Zong
2025-11-10 10:13 ` [PATCH v3 1/3] remoteproc: mediatek: Support platform reg offsets in mtk_scp_of_data Huayu Zong
@ 2025-11-10 10:13 ` Huayu Zong
2025-11-17 16:52 ` Mathieu Poirier
2025-11-10 10:13 ` [PATCH v3 3/3] dt-bindings: remoteproc: mediatek: Add MT8189 SCP binding Huayu Zong
2 siblings, 1 reply; 7+ messages in thread
From: Huayu Zong @ 2025-11-10 10:13 UTC (permalink / raw)
To: Bjorn Andersson, Mathieu Poirier, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Matthias Brugger,
AngeloGioacchino Del Regno
Cc: linux-remoteproc, devicetree, linux-kernel, linux-arm-kernel,
linux-mediatek, Project_Global_Chrome_Upstream_Group, Huayu Zong
Add platform data for MT8189 to support SCP remote processor.
This enables SCP functionality on MT8189 SoC.
Signed-off-by: Huayu Zong <huayu.zong@mediatek.com>
---
drivers/remoteproc/mtk_common.h | 5 +++++
drivers/remoteproc/mtk_scp.c | 18 ++++++++++++++++++
2 files changed, 23 insertions(+)
diff --git a/drivers/remoteproc/mtk_common.h b/drivers/remoteproc/mtk_common.h
index d45480ad332e..abf0dbd9978c 100644
--- a/drivers/remoteproc/mtk_common.h
+++ b/drivers/remoteproc/mtk_common.h
@@ -35,6 +35,11 @@
#define MT8186_SCP_L1_SRAM_PD_P1 0x40B0
#define MT8186_SCP_L1_SRAM_PD_p2 0x40B4
+#define MT8189_SCP2APMCU_IPC_CLR 0x30010
+#define MT8189_SCP2SPM_IPC_CLR 0x30018
+#define MT8189_SCP_SECURE_DOMAIN 0xA080
+#define MT8189_SCP_DOMAIN_VAL 0x3303003
+
#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 c3c37cae933a..f311e23b6d65 100644
--- a/drivers/remoteproc/mtk_scp.c
+++ b/drivers/remoteproc/mtk_scp.c
@@ -1529,6 +1529,23 @@ static const struct mtk_scp_of_data mt8188_of_data_c1 = {
.scp_sizes = &mt8188_scp_c1_sizes,
};
+static const struct mtk_scp_of_data mt8189_of_data = {
+ .scp_clk_get = mt8195_scp_clk_get,
+ .scp_before_load = mt8192_scp_before_load,
+ .scp_irq_handler = mt8192_scp_irq_handler,
+ .scp_reset_assert = mt8192_scp_reset_assert,
+ .scp_reset_deassert = mt8192_scp_reset_deassert,
+ .scp_stop = mt8192_scp_stop,
+ .scp_da_to_va = mt8192_scp_da_to_va,
+ .host_to_scp_reg = MT8192_GIPC_IN_SET,
+ .host_to_scp_int_bit = MT8192_HOST_IPC_INT_BIT,
+ .scp_to_host_ipc_clr_reg = MT8189_SCP2APMCU_IPC_CLR,
+ .scp_to_spm_ipc_clr_reg = MT8189_SCP2SPM_IPC_CLR,
+ .scp_secure_domain_reg = MT8189_SCP_SECURE_DOMAIN,
+ .scp_domain_value = MT8189_SCP_DOMAIN_VAL,
+ .scp_sizes = &default_scp_sizes,
+};
+
static const struct mtk_scp_of_data mt8192_of_data = {
.scp_clk_get = mt8192_scp_clk_get,
.scp_before_load = mt8192_scp_before_load,
@@ -1587,6 +1604,7 @@ static const struct of_device_id mtk_scp_of_match[] = {
{ .compatible = "mediatek,mt8186-scp", .data = &mt8186_of_data },
{ .compatible = "mediatek,mt8188-scp", .data = &mt8188_of_data },
{ .compatible = "mediatek,mt8188-scp-dual", .data = &mt8188_of_data_cores },
+ { .compatible = "mediatek,mt8189-scp", .data = &mt8189_of_data },
{ .compatible = "mediatek,mt8192-scp", .data = &mt8192_of_data },
{ .compatible = "mediatek,mt8195-scp", .data = &mt8195_of_data },
{ .compatible = "mediatek,mt8195-scp-dual", .data = &mt8195_of_data_cores },
--
2.45.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v3 2/3] remoteproc: mediatek: Add MT8189 SCP platform data
2025-11-10 10:13 ` [PATCH v3 2/3] remoteproc: mediatek: Add MT8189 SCP platform data Huayu Zong
@ 2025-11-17 16:52 ` Mathieu Poirier
0 siblings, 0 replies; 7+ messages in thread
From: Mathieu Poirier @ 2025-11-17 16:52 UTC (permalink / raw)
To: Huayu Zong
Cc: Bjorn Andersson, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Matthias Brugger, AngeloGioacchino Del Regno, linux-remoteproc,
devicetree, linux-kernel, linux-arm-kernel, linux-mediatek,
Project_Global_Chrome_Upstream_Group
On Mon, Nov 10, 2025 at 06:13:30PM +0800, Huayu Zong wrote:
> Add platform data for MT8189 to support SCP remote processor.
> This enables SCP functionality on MT8189 SoC.
>
> Signed-off-by: Huayu Zong <huayu.zong@mediatek.com>
> ---
> drivers/remoteproc/mtk_common.h | 5 +++++
> drivers/remoteproc/mtk_scp.c | 18 ++++++++++++++++++
> 2 files changed, 23 insertions(+)
>
> diff --git a/drivers/remoteproc/mtk_common.h b/drivers/remoteproc/mtk_common.h
> index d45480ad332e..abf0dbd9978c 100644
> --- a/drivers/remoteproc/mtk_common.h
> +++ b/drivers/remoteproc/mtk_common.h
> @@ -35,6 +35,11 @@
> #define MT8186_SCP_L1_SRAM_PD_P1 0x40B0
> #define MT8186_SCP_L1_SRAM_PD_p2 0x40B4
>
> +#define MT8189_SCP2APMCU_IPC_CLR 0x30010
> +#define MT8189_SCP2SPM_IPC_CLR 0x30018
> +#define MT8189_SCP_SECURE_DOMAIN 0xA080
> +#define MT8189_SCP_DOMAIN_VAL 0x3303003
> +
> #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 c3c37cae933a..f311e23b6d65 100644
> --- a/drivers/remoteproc/mtk_scp.c
> +++ b/drivers/remoteproc/mtk_scp.c
> @@ -1529,6 +1529,23 @@ static const struct mtk_scp_of_data mt8188_of_data_c1 = {
> .scp_sizes = &mt8188_scp_c1_sizes,
> };
>
> +static const struct mtk_scp_of_data mt8189_of_data = {
> + .scp_clk_get = mt8195_scp_clk_get,
> + .scp_before_load = mt8192_scp_before_load,
> + .scp_irq_handler = mt8192_scp_irq_handler,
> + .scp_reset_assert = mt8192_scp_reset_assert,
> + .scp_reset_deassert = mt8192_scp_reset_deassert,
This is the last patchset I accept for this driver where the name of the
functions don't match the mt****_of_data. It is highly confusing, hard to
maintain and error prone. Functions that are re-used need to be given generic
names.
Thanks,
Mathieu
> + .scp_stop = mt8192_scp_stop,
> + .scp_da_to_va = mt8192_scp_da_to_va,
> + .host_to_scp_reg = MT8192_GIPC_IN_SET,
> + .host_to_scp_int_bit = MT8192_HOST_IPC_INT_BIT,
> + .scp_to_host_ipc_clr_reg = MT8189_SCP2APMCU_IPC_CLR,
> + .scp_to_spm_ipc_clr_reg = MT8189_SCP2SPM_IPC_CLR,
> + .scp_secure_domain_reg = MT8189_SCP_SECURE_DOMAIN,
> + .scp_domain_value = MT8189_SCP_DOMAIN_VAL,
> + .scp_sizes = &default_scp_sizes,
> +};
> +
> static const struct mtk_scp_of_data mt8192_of_data = {
> .scp_clk_get = mt8192_scp_clk_get,
> .scp_before_load = mt8192_scp_before_load,
> @@ -1587,6 +1604,7 @@ static const struct of_device_id mtk_scp_of_match[] = {
> { .compatible = "mediatek,mt8186-scp", .data = &mt8186_of_data },
> { .compatible = "mediatek,mt8188-scp", .data = &mt8188_of_data },
> { .compatible = "mediatek,mt8188-scp-dual", .data = &mt8188_of_data_cores },
> + { .compatible = "mediatek,mt8189-scp", .data = &mt8189_of_data },
> { .compatible = "mediatek,mt8192-scp", .data = &mt8192_of_data },
> { .compatible = "mediatek,mt8195-scp", .data = &mt8195_of_data },
> { .compatible = "mediatek,mt8195-scp-dual", .data = &mt8195_of_data_cores },
> --
> 2.45.2
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 3/3] dt-bindings: remoteproc: mediatek: Add MT8189 SCP binding
2025-11-10 10:13 [PATCH v3 0/3] Add support for MT8189 SCP and device tree bindings Huayu Zong
2025-11-10 10:13 ` [PATCH v3 1/3] remoteproc: mediatek: Support platform reg offsets in mtk_scp_of_data Huayu Zong
2025-11-10 10:13 ` [PATCH v3 2/3] remoteproc: mediatek: Add MT8189 SCP platform data Huayu Zong
@ 2025-11-10 10:13 ` Huayu Zong
2025-11-10 18:44 ` Conor Dooley
2 siblings, 1 reply; 7+ messages in thread
From: Huayu Zong @ 2025-11-10 10:13 UTC (permalink / raw)
To: Bjorn Andersson, Mathieu Poirier, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Matthias Brugger,
AngeloGioacchino Del Regno
Cc: linux-remoteproc, devicetree, linux-kernel, linux-arm-kernel,
linux-mediatek, Project_Global_Chrome_Upstream_Group, Huayu Zong
Add a new compatible string for MT8189 SCP.
While MT8189 SCP is partially compatible with MT8192, the register layout
has some differences, so a separate binding is required.
Signed-off-by: Huayu Zong <huayu.zong@mediatek.com>
---
Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml b/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml
index 179c98b33b4d..407be544b404 100644
--- a/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml
@@ -20,6 +20,7 @@ properties:
- mediatek,mt8186-scp
- mediatek,mt8188-scp
- mediatek,mt8188-scp-dual
+ - mediatek,mt8189-scp
- mediatek,mt8192-scp
- mediatek,mt8195-scp
- mediatek,mt8195-scp-dual
@@ -168,6 +169,7 @@ allOf:
- mediatek,mt8183-scp
- mediatek,mt8186-scp
- mediatek,mt8188-scp
+ - mediatek,mt8189-scp
then:
properties:
reg:
--
2.45.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v3 3/3] dt-bindings: remoteproc: mediatek: Add MT8189 SCP binding
2025-11-10 10:13 ` [PATCH v3 3/3] dt-bindings: remoteproc: mediatek: Add MT8189 SCP binding Huayu Zong
@ 2025-11-10 18:44 ` Conor Dooley
0 siblings, 0 replies; 7+ messages in thread
From: Conor Dooley @ 2025-11-10 18:44 UTC (permalink / raw)
To: Huayu Zong
Cc: Bjorn Andersson, Mathieu Poirier, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Matthias Brugger,
AngeloGioacchino Del Regno, linux-remoteproc, devicetree,
linux-kernel, linux-arm-kernel, linux-mediatek,
Project_Global_Chrome_Upstream_Group
[-- Attachment #1: Type: text/plain, Size: 75 bytes --]
Acked-by: Conor Dooley <conor.dooley@microchip.com>
pw-bot: not-applicable
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread