On Fri, Jul 21, 2023 at 10:41:24AM +0800, Tinghan Shen wrote:
> This is the 1st preliminary steps for probing multi-core SCP.
> The registers of config and l1tcm are common on single-core SCP
> and multi-core SCP. Extract these registers out to reduce duplicated
> fields in mtk_scp when probing multi-core SCP.
>
> Signed-off-by: Tinghan Shen <tinghan.shen@xxxxxxxxxxxx>
> ---
> drivers/remoteproc/mtk_common.h | 13 +-
> drivers/remoteproc/mtk_scp.c | 201 +++++++++++++++++--------------
> drivers/remoteproc/mtk_scp_ipi.c | 4 +-
> 3 files changed, 122 insertions(+), 96 deletions(-)
>
> diff --git a/drivers/remoteproc/mtk_common.h b/drivers/remoteproc/mtk_common.h
> index c0905aec3b4b..b04d71277c1f 100644
> --- a/drivers/remoteproc/mtk_common.h
> +++ b/drivers/remoteproc/mtk_common.h
> @@ -100,17 +100,20 @@ struct mtk_scp_of_data {
> size_t ipi_buf_offset;
> };
>
> +struct mtk_scp_of_cluster {
> + void __iomem *reg_base;
> + void __iomem *l1tcm_base;
> + size_t l1tcm_size;
> + phys_addr_t l1tcm_phys;
> +};
> +
Ok
> struct mtk_scp {
> struct device *dev;
> struct rproc *rproc;
> struct clk *clk;
> - void __iomem *reg_base;
> void __iomem *sram_base;
> size_t sram_size;
> phys_addr_t sram_phys;
> - void __iomem *l1tcm_base;
> - size_t l1tcm_size;
> - phys_addr_t l1tcm_phys;
>
Ok
> const struct mtk_scp_of_data *data;
>
> @@ -128,6 +131,8 @@ struct mtk_scp {
> size_t dram_size;
>
> struct rproc_subdev *rpmsg_subdev;
> +
> + struct mtk_scp_of_cluster *cluster;
Ok
> };
>
> /**
> diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
> index 48e759c2d486..9486f5020946 100644
> --- a/drivers/remoteproc/mtk_scp.c
> +++ b/drivers/remoteproc/mtk_scp.c
> @@ -152,45 +152,45 @@ static void mt8183_scp_reset_assert(struct mtk_scp *scp)
> {
> u32 val;
>
> - val = readl(scp->reg_base + MT8183_SW_RSTN);
> + val = readl(scp->cluster->reg_base + MT8183_SW_RSTN);
> val &= ~MT8183_SW_RSTN_BIT;
> - writel(val, scp->reg_base + MT8183_SW_RSTN);
> + writel(val, scp->cluster->reg_base + MT8183_SW_RSTN);
> }
>
> static void mt8183_scp_reset_deassert(struct mtk_scp *scp)
> {
> u32 val;
>
> - val = readl(scp->reg_base + MT8183_SW_RSTN);
> + val = readl(scp->cluster->reg_base + MT8183_SW_RSTN);
> val |= MT8183_SW_RSTN_BIT;
> - writel(val, scp->reg_base + MT8183_SW_RSTN);
> + writel(val, scp->cluster->reg_base + MT8183_SW_RSTN);
> }
>
> static void mt8192_scp_reset_assert(struct mtk_scp *scp)
> {
> - writel(1, scp->reg_base + MT8192_CORE0_SW_RSTN_SET);
> + writel(1, scp->cluster->reg_base + MT8192_CORE0_SW_RSTN_SET);
> }
>
> static void mt8192_scp_reset_deassert(struct mtk_scp *scp)
> {
> - writel(1, scp->reg_base + MT8192_CORE0_SW_RSTN_CLR);
> + writel(1, scp->cluster->reg_base + MT8192_CORE0_SW_RSTN_CLR);
> }
>
> static void mt8195_scp_c1_reset_assert(struct mtk_scp *scp)
> {
> - writel(1, scp->reg_base + MT8195_CORE1_SW_RSTN_SET);
> + writel(1, scp->cluster->reg_base + MT8195_CORE1_SW_RSTN_SET);
> }
>
> static void mt8195_scp_c1_reset_deassert(struct mtk_scp *scp)
> {
> - writel(1, scp->reg_base + MT8195_CORE1_SW_RSTN_CLR);
> + writel(1, scp->cluster->reg_base + MT8195_CORE1_SW_RSTN_CLR);
> }
>
> static void mt8183_scp_irq_handler(struct mtk_scp *scp)
> {
> u32 scp_to_host;
>
> - scp_to_host = readl(scp->reg_base + MT8183_SCP_TO_HOST);
> + scp_to_host = readl(scp->cluster->reg_base + MT8183_SCP_TO_HOST);
> if (scp_to_host & MT8183_SCP_IPC_INT_BIT)
> scp_ipi_handler(scp);
> else
> @@ -198,14 +198,14 @@ static void mt8183_scp_irq_handler(struct mtk_scp *scp)
>
> /* SCP won't send another interrupt until we set SCP_TO_HOST to 0. */
> writel(MT8183_SCP_IPC_INT_BIT | MT8183_SCP_WDT_INT_BIT,
> - scp->reg_base + MT8183_SCP_TO_HOST);
> + scp->cluster->reg_base + MT8183_SCP_TO_HOST);
> }
>
> static void mt8192_scp_irq_handler(struct mtk_scp *scp)
> {
> u32 scp_to_host;
>
> - scp_to_host = readl(scp->reg_base + MT8192_SCP2APMCU_IPC_SET);
> + scp_to_host = readl(scp->cluster->reg_base + MT8192_SCP2APMCU_IPC_SET);
>
> if (scp_to_host & MT8192_SCP_IPC_INT_BIT) {
> scp_ipi_handler(scp);
> @@ -215,10 +215,10 @@ static void mt8192_scp_irq_handler(struct mtk_scp *scp)
> * MT8192_SCP2APMCU_IPC.
> */
> writel(MT8192_SCP_IPC_INT_BIT,
> - scp->reg_base + MT8192_SCP2APMCU_IPC_CLR);
> + scp->cluster->reg_base + MT8192_SCP2APMCU_IPC_CLR);
> } else {
> scp_wdt_handler(scp, scp_to_host);
> - writel(1, scp->reg_base + MT8192_CORE0_WDT_IRQ);
> + writel(1, scp->cluster->reg_base + MT8192_CORE0_WDT_IRQ);
> }
> }
>
> @@ -226,12 +226,12 @@ static void mt8195_scp_c1_irq_handler(struct mtk_scp *scp)
> {
> u32 scp_to_host;
>
> - scp_to_host = readl(scp->reg_base + MT8195_SSHUB2APMCU_IPC_SET);
> + scp_to_host = readl(scp->cluster->reg_base + MT8195_SSHUB2APMCU_IPC_SET);
>
> if (scp_to_host & MT8192_SCP_IPC_INT_BIT)
> scp_ipi_handler(scp);
>
> - writel(scp_to_host, scp->reg_base + MT8195_SSHUB2APMCU_IPC_CLR);
> + writel(scp_to_host, scp->cluster->reg_base + MT8195_SSHUB2APMCU_IPC_CLR);
> }
>
> static irqreturn_t scp_irq_handler(int irq, void *priv)
> @@ -363,26 +363,26 @@ static int mt8195_scp_clk_get(struct mtk_scp *scp)
> static int mt8183_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);
> + writel(MT8183_SCP_IPC_INT_BIT, scp->cluster->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);
> + writel(0x0, scp->cluster->reg_base + MT8183_SCP_CLK_SW_SEL);
> + writel(0x0, scp->cluster->reg_base + MT8183_SCP_CLK_DIV_SEL);
>
> /* 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->cluster->reg_base + MT8183_SCP_L1_SRAM_PD);
> + writel(0x0, scp->cluster->reg_base + MT8183_SCP_TCM_TAIL_SRAM_PD);
>
> /* Turn on the power of SCP's SRAM before using it. */
> - writel(0x0, scp->reg_base + MT8183_SCP_SRAM_PDN);
> + writel(0x0, scp->cluster->reg_base + MT8183_SCP_SRAM_PDN);
>
> /*
> * Set I-cache and D-cache size before loading SCP FW.
> * SCP SRAM logical address may change when cache size setting differs.
> */
> writel(MT8183_SCP_CACHE_CON_WAYEN | MT8183_SCP_CACHESIZE_8KB,
> - scp->reg_base + MT8183_SCP_CACHE_CON);
> - writel(MT8183_SCP_CACHESIZE_8KB, scp->reg_base + MT8183_SCP_DCACHE_CON);
> + scp->cluster->reg_base + MT8183_SCP_CACHE_CON);
> + writel(MT8183_SCP_CACHESIZE_8KB, scp->cluster->reg_base + MT8183_SCP_DCACHE_CON);
>
> return 0;
> }
> @@ -408,28 +408,28 @@ static void scp_sram_power_off(void __iomem *addr, u32 reserved_mask)
> 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);
> + writel(MT8183_SCP_IPC_INT_BIT, scp->cluster->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);
> + writel(0x0, scp->cluster->reg_base + MT8183_SCP_CLK_SW_SEL);
> + writel(0x0, scp->cluster->reg_base + MT8183_SCP_CLK_DIV_SEL);
>
> /* Turn on the power of SCP's SRAM before using it. Enable 1 block per time*/
> - scp_sram_power_on(scp->reg_base + MT8183_SCP_SRAM_PDN, 0);
> + scp_sram_power_on(scp->cluster->reg_base + MT8183_SCP_SRAM_PDN, 0);
>
> /* 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);
> + writel(0x0, scp->cluster->reg_base + MT8183_SCP_L1_SRAM_PD);
> + writel(0x0, scp->cluster->reg_base + MT8183_SCP_TCM_TAIL_SRAM_PD);
> + writel(0x0, scp->cluster->reg_base + MT8186_SCP_L1_SRAM_PD_P1);
> + writel(0x0, scp->cluster->reg_base + MT8186_SCP_L1_SRAM_PD_p2);
>
> /*
> * Set I-cache and D-cache size before loading SCP FW.
> * SCP SRAM logical address may change when cache size setting differs.
> */
> writel(MT8183_SCP_CACHE_CON_WAYEN | MT8183_SCP_CACHESIZE_8KB,
> - scp->reg_base + MT8183_SCP_CACHE_CON);
> - writel(MT8183_SCP_CACHESIZE_8KB, scp->reg_base + MT8183_SCP_DCACHE_CON);
> + scp->cluster->reg_base + MT8183_SCP_CACHE_CON);
> + writel(MT8183_SCP_CACHESIZE_8KB, scp->cluster->reg_base + MT8183_SCP_DCACHE_CON);
>
> return 0;
> }
> @@ -437,19 +437,19 @@ static int mt8186_scp_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->reg_base + MT8192_SCP2SPM_IPC_CLR);
> + writel(0xff, scp->cluster->reg_base + MT8192_SCP2SPM_IPC_CLR);
>
> - writel(1, scp->reg_base + MT8192_CORE0_SW_RSTN_SET);
> + writel(1, scp->cluster->reg_base + MT8192_CORE0_SW_RSTN_SET);
>
> /* enable SRAM clock */
> - scp_sram_power_on(scp->reg_base + MT8192_L2TCM_SRAM_PD_0, 0);
> - scp_sram_power_on(scp->reg_base + MT8192_L2TCM_SRAM_PD_1, 0);
> - scp_sram_power_on(scp->reg_base + MT8192_L2TCM_SRAM_PD_2, 0);
> - scp_sram_power_on(scp->reg_base + MT8192_L1TCM_SRAM_PDN, 0);
> - scp_sram_power_on(scp->reg_base + MT8192_CPU0_SRAM_PD, 0);
> + scp_sram_power_on(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_0, 0);
> + scp_sram_power_on(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_1, 0);
> + scp_sram_power_on(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_2, 0);
> + scp_sram_power_on(scp->cluster->reg_base + MT8192_L1TCM_SRAM_PDN, 0);
> + scp_sram_power_on(scp->cluster->reg_base + MT8192_CPU0_SRAM_PD, 0);
>
> /* enable MPU for all memory regions */
> - writel(0xff, scp->reg_base + MT8192_CORE0_MEM_ATT_PREDEF);
> + writel(0xff, scp->cluster->reg_base + MT8192_CORE0_MEM_ATT_PREDEF);
>
> return 0;
> }
> @@ -457,20 +457,20 @@ static int mt8192_scp_before_load(struct mtk_scp *scp)
> static int mt8195_scp_before_load(struct mtk_scp *scp)
> {
> /* clear SPM interrupt, SCP2SPM_IPC_CLR */
> - writel(0xff, scp->reg_base + MT8192_SCP2SPM_IPC_CLR);
> + writel(0xff, scp->cluster->reg_base + MT8192_SCP2SPM_IPC_CLR);
>
> - writel(1, scp->reg_base + MT8192_CORE0_SW_RSTN_SET);
> + writel(1, scp->cluster->reg_base + MT8192_CORE0_SW_RSTN_SET);
>
> /* enable SRAM clock */
> - scp_sram_power_on(scp->reg_base + MT8192_L2TCM_SRAM_PD_0, 0);
> - scp_sram_power_on(scp->reg_base + MT8192_L2TCM_SRAM_PD_1, 0);
> - scp_sram_power_on(scp->reg_base + MT8192_L2TCM_SRAM_PD_2, 0);
> - scp_sram_power_on(scp->reg_base + MT8192_L1TCM_SRAM_PDN,
> + scp_sram_power_on(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_0, 0);
> + scp_sram_power_on(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_1, 0);
> + scp_sram_power_on(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_2, 0);
> + scp_sram_power_on(scp->cluster->reg_base + MT8192_L1TCM_SRAM_PDN,
> MT8195_L1TCM_SRAM_PDN_RESERVED_RSI_BITS);
> - scp_sram_power_on(scp->reg_base + MT8192_CPU0_SRAM_PD, 0);
> + scp_sram_power_on(scp->cluster->reg_base + MT8192_CPU0_SRAM_PD, 0);
>
> /* enable MPU for all memory regions */
> - writel(0xff, scp->reg_base + MT8192_CORE0_MEM_ATT_PREDEF);
> + writel(0xff, scp->cluster->reg_base + MT8192_CORE0_MEM_ATT_PREDEF);
>
> return 0;
> }
> @@ -479,10 +479,10 @@ static int mt8195_scp_c1_before_load(struct mtk_scp *scp)
> {
> scp->data->scp_reset_assert(scp);
>
> - scp_sram_power_on(scp->reg_base + MT8195_CPU1_SRAM_PD, 0);
> + scp_sram_power_on(scp->cluster->reg_base + MT8195_CPU1_SRAM_PD, 0);
>
> /* enable MPU for all memory regions */
> - writel(0xff, scp->reg_base + MT8195_CORE1_MEM_ATT_PREDEF);
> + writel(0xff, scp->cluster->reg_base + MT8195_CORE1_MEM_ATT_PREDEF);
>
> return 0;
> }
> @@ -601,11 +601,11 @@ static void *mt8192_scp_da_to_va(struct mtk_scp *scp, u64 da, size_t len)
> }
>
> /* optional memory region */
> - if (scp->l1tcm_size &&
> - da >= scp->l1tcm_phys &&
> - (da + len) <= scp->l1tcm_phys + scp->l1tcm_size) {
> - offset = da - scp->l1tcm_phys;
> - return (void __force *)scp->l1tcm_base + offset;
> + if (scp->cluster->l1tcm_size &&
> + da >= scp->cluster->l1tcm_phys &&
> + (da + len) <= scp->cluster->l1tcm_phys + scp->cluster->l1tcm_size) {
> + offset = da - scp->cluster->l1tcm_phys;
> + return (void __force *)scp->cluster->l1tcm_base + offset;
> }
>
> /* optional memory region */
> @@ -629,43 +629,43 @@ static void *scp_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_iome
> static void mt8183_scp_stop(struct mtk_scp *scp)
> {
> /* Disable SCP watchdog */
> - writel(0, scp->reg_base + MT8183_WDT_CFG);
> + writel(0, scp->cluster->reg_base + MT8183_WDT_CFG);
> }
>
> static void mt8192_scp_stop(struct mtk_scp *scp)
> {
> /* Disable SRAM clock */
> - scp_sram_power_off(scp->reg_base + MT8192_L2TCM_SRAM_PD_0, 0);
> - scp_sram_power_off(scp->reg_base + MT8192_L2TCM_SRAM_PD_1, 0);
> - scp_sram_power_off(scp->reg_base + MT8192_L2TCM_SRAM_PD_2, 0);
> - scp_sram_power_off(scp->reg_base + MT8192_L1TCM_SRAM_PDN, 0);
> - scp_sram_power_off(scp->reg_base + MT8192_CPU0_SRAM_PD, 0);
> + scp_sram_power_off(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_0, 0);
> + scp_sram_power_off(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_1, 0);
> + scp_sram_power_off(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_2, 0);
> + scp_sram_power_off(scp->cluster->reg_base + MT8192_L1TCM_SRAM_PDN, 0);
> + scp_sram_power_off(scp->cluster->reg_base + MT8192_CPU0_SRAM_PD, 0);
>
> /* Disable SCP watchdog */
> - writel(0, scp->reg_base + MT8192_CORE0_WDT_CFG);
> + writel(0, scp->cluster->reg_base + MT8192_CORE0_WDT_CFG);
> }
>
> static void mt8195_scp_stop(struct mtk_scp *scp)
> {
> /* Disable SRAM clock */
> - scp_sram_power_off(scp->reg_base + MT8192_L2TCM_SRAM_PD_0, 0);
> - scp_sram_power_off(scp->reg_base + MT8192_L2TCM_SRAM_PD_1, 0);
> - scp_sram_power_off(scp->reg_base + MT8192_L2TCM_SRAM_PD_2, 0);
> - scp_sram_power_off(scp->reg_base + MT8192_L1TCM_SRAM_PDN,
> + scp_sram_power_off(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_0, 0);
> + scp_sram_power_off(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_1, 0);
> + scp_sram_power_off(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_2, 0);
> + scp_sram_power_off(scp->cluster->reg_base + MT8192_L1TCM_SRAM_PDN,
> MT8195_L1TCM_SRAM_PDN_RESERVED_RSI_BITS);
> - scp_sram_power_off(scp->reg_base + MT8192_CPU0_SRAM_PD, 0);
> + scp_sram_power_off(scp->cluster->reg_base + MT8192_CPU0_SRAM_PD, 0);
>
> /* Disable SCP watchdog */
> - writel(0, scp->reg_base + MT8192_CORE0_WDT_CFG);
> + writel(0, scp->cluster->reg_base + MT8192_CORE0_WDT_CFG);
> }
>
> static void mt8195_scp_c1_stop(struct mtk_scp *scp)
> {
> /* Power off CPU SRAM */
> - scp_sram_power_off(scp->reg_base + MT8195_CPU1_SRAM_PD, 0);
> + scp_sram_power_off(scp->cluster->reg_base + MT8195_CPU1_SRAM_PD, 0);
>
> /* Disable SCP watchdog */
> - writel(0, scp->reg_base + MT8195_CORE1_WDT_CFG);
> + writel(0, scp->cluster->reg_base + MT8195_CORE1_WDT_CFG);
> }
>
> static int scp_stop(struct rproc *rproc)
> @@ -854,7 +854,8 @@ static void scp_remove_rpmsg_subdev(struct mtk_scp *scp)
> }
> }
>
> -static int scp_probe(struct platform_device *pdev)
> +static int scp_cluster_init(struct platform_device *pdev,
> + struct mtk_scp_of_cluster *scp_cluster)
Why is the mtk_scp and mtk_scp_of_cluster structure refactoring entangled with
scp_probe()? Just add another patch to prepare the upcoming work, exactly the
same way pach 04/13 does.
> {
> struct device *dev = &pdev->dev;
> struct device_node *np = dev->of_node;
> @@ -876,6 +877,7 @@ static int scp_probe(struct platform_device *pdev)
> scp->rproc = rproc;
> scp->dev = dev;
> scp->data = of_device_get_match_data(dev);
> + scp->cluster = scp_cluster;
> platform_set_drvdata(pdev, scp);
>
> res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "sram");
> @@ -887,24 +889,6 @@ static int scp_probe(struct platform_device *pdev)
> scp->sram_size = resource_size(res);
> scp->sram_phys = res->start;
>
> - /* l1tcm is an optional memory region */
> - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "l1tcm");
> - scp->l1tcm_base = devm_ioremap_resource(dev, res);
> - if (IS_ERR(scp->l1tcm_base)) {
> - ret = PTR_ERR(scp->l1tcm_base);
> - if (ret != -EINVAL) {
> - return dev_err_probe(dev, ret, "Failed to map l1tcm memory\n");
> - }
> - } else {
> - scp->l1tcm_size = resource_size(res);
> - scp->l1tcm_phys = res->start;
> - }
> -
> - scp->reg_base = devm_platform_ioremap_resource_byname(pdev, "cfg");
> - if (IS_ERR(scp->reg_base))
> - return dev_err_probe(dev, PTR_ERR(scp->reg_base),
> - "Failed to parse and map cfg memory\n");
> -
> ret = scp->data->scp_clk_get(scp);
> if (ret)
> return ret;
> @@ -956,6 +940,43 @@ static int scp_probe(struct platform_device *pdev)
> return ret;
> }
>
> +static int scp_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct mtk_scp_of_cluster *scp_cluster;
> + struct resource *res;
> + int ret;
> +
> + scp_cluster = devm_kzalloc(dev, sizeof(*scp_cluster), GFP_KERNEL);
> + if (!scp_cluster)
> + return -ENOMEM;
> +
> + scp_cluster->reg_base = devm_platform_ioremap_resource_byname(pdev, "cfg");
> + if (IS_ERR(scp_cluster->reg_base))
> + return dev_err_probe(dev, PTR_ERR(scp_cluster->reg_base),
> + "Failed to parse and map cfg memory\n");
> +
> + /* l1tcm is an optional memory region */
> + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "l1tcm");
> + scp_cluster->l1tcm_base = devm_ioremap_resource(dev, res);
> + if (IS_ERR(scp_cluster->l1tcm_base)) {
> + ret = PTR_ERR(scp_cluster->l1tcm_base);
> + if (ret != -EINVAL)
> + return dev_err_probe(dev, ret, "Failed to map l1tcm memory\n");
> +
> + scp_cluster->l1tcm_base = NULL;
> + } else {
> + scp_cluster->l1tcm_size = resource_size(res);
> + scp_cluster->l1tcm_phys = res->start;
> + }
> +
> + ret = scp_cluster_init(pdev, scp_cluster);
> + if (ret)
> + return ret;
> +
> + return 0;
> +}
> +
> static void scp_remove(struct platform_device *pdev)
> {
> struct mtk_scp *scp = platform_get_drvdata(pdev);
> diff --git a/drivers/remoteproc/mtk_scp_ipi.c b/drivers/remoteproc/mtk_scp_ipi.c
> index 9c7c17b9d181..cd0b60106ec2 100644
> --- a/drivers/remoteproc/mtk_scp_ipi.c
> +++ b/drivers/remoteproc/mtk_scp_ipi.c
> @@ -177,7 +177,7 @@ int scp_ipi_send(struct mtk_scp *scp, u32 id, void *buf, unsigned int len,
> mutex_lock(&scp->send_lock);
>
> /* Wait until SCP receives the last command */
> - ret = readl_poll_timeout_atomic(scp->reg_base + scp->data->host_to_scp_reg,
> + ret = readl_poll_timeout_atomic(scp->cluster->reg_base + scp->data->host_to_scp_reg,
> val, !val, 0, SCP_TIMEOUT_US);
> if (ret) {
> dev_err(scp->dev, "%s: IPI timeout!\n", __func__);
> @@ -192,7 +192,7 @@ int scp_ipi_send(struct mtk_scp *scp, u32 id, void *buf, unsigned int len,
> scp->ipi_id_ack[id] = false;
> /* send the command to SCP */
> writel(scp->data->host_to_scp_int_bit,
> - scp->reg_base + scp->data->host_to_scp_reg);
> + scp->cluster->reg_base + scp->data->host_to_scp_reg);
>
> if (wait) {
> /* wait for SCP's ACK */
> --
> 2.18.0
>
