Re: [PATCH v2] remoteproc/mediatek: Add support for mt8192 SCP

[Matthias Brugger <matthias.bgg@gmail.com>]

On 18/09/2020 08:44, Pi-Hsun Shih wrote:
> Add support for mt8192 SCP.
> 
> Signed-off-by: Pi-Hsun Shih <pihsun@chromium.org>
> Reviewed-by: Tzung-Bi Shih <tzungbi@google.com>
> ---
> 
> Change since v1:
> * Remove unused register definitions.
> 
> ---
>   drivers/remoteproc/mtk_common.h  |  32 +++++
>   drivers/remoteproc/mtk_scp.c     | 207 ++++++++++++++++++++++++++-----
>   drivers/remoteproc/mtk_scp_ipi.c |   5 +-
>   3 files changed, 211 insertions(+), 33 deletions(-)
> 
> diff --git a/drivers/remoteproc/mtk_common.h b/drivers/remoteproc/mtk_common.h
> index 0066c83636d0..47b4561443a9 100644
> --- a/drivers/remoteproc/mtk_common.h
> +++ b/drivers/remoteproc/mtk_common.h
> @@ -32,6 +32,23 @@
>   #define MT8183_SCP_CACHESIZE_8KB	BIT(8)
>   #define MT8183_SCP_CACHE_CON_WAYEN	BIT(10)
>   
> +#define MT8192_L2TCM_SRAM_PD_0		0x210C0
> +#define MT8192_L2TCM_SRAM_PD_1		0x210C4
> +#define MT8192_L2TCM_SRAM_PD_2		0x210C8
> +#define MT8192_L1TCM_SRAM_PDN		0x2102C
> +#define MT8192_CPU0_SRAM_PD		0x21080
> +
> +#define MT8192_SCP2APMCU_IPC_SET	0x24080
> +#define MT8192_SCP2APMCU_IPC_CLR	0x24084
> +#define MT8192_SCP_IPC_INT_BIT		BIT(0)
> +#define MT8192_SCP2SPM_IPC_CLR		0x24094
> +#define MT8192_GIPC_IN_SET		0x24098
> +#define MT8192_HOST_IPC_INT_BIT		BIT(0)
> +
> +#define MT8192_CORE0_SW_RSTN_CLR	0x30000
> +#define MT8192_CORE0_SW_RSTN_SET	0x30004
> +#define MT8192_CORE0_WDT_CFG		0x30034
> +
>   #define SCP_FW_VER_LEN			32
>   #define SCP_SHARE_BUFFER_SIZE		288
>   
> @@ -50,6 +67,19 @@ struct scp_ipi_desc {
>   	void *priv;
>   };
>   
> +struct mtk_scp;
> +
> +struct mtk_scp_of_data {
> +	int (*scp_before_load)(struct mtk_scp *scp);
> +	void (*scp_irq_handler)(struct mtk_scp *scp);
> +	void (*scp_reset_assert)(struct mtk_scp *scp);
> +	void (*scp_reset_deassert)(struct mtk_scp *scp);
> +	void (*scp_stop)(struct mtk_scp *scp);
> +
> +	u32 host_to_scp_reg;
> +	u32 host_to_scp_int_bit;
> +};
> +
>   struct mtk_scp {
>   	struct device *dev;
>   	struct rproc *rproc;
> @@ -58,6 +88,8 @@ struct mtk_scp {
>   	void __iomem *sram_base;
>   	size_t sram_size;
>   
> +	const struct mtk_scp_of_data *data;
> +
>   	struct mtk_share_obj __iomem *recv_buf;
>   	struct mtk_share_obj __iomem *send_buf;
>   	struct scp_run run;
> diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
> index ac13e7b046a6..f5f226a7b34c 100644
> --- a/drivers/remoteproc/mtk_scp.c
> +++ b/drivers/remoteproc/mtk_scp.c
> @@ -124,9 +124,6 @@ static int scp_ipi_init(struct mtk_scp *scp)
>   	size_t send_offset = SCP_FW_END - sizeof(struct mtk_share_obj);
>   	size_t recv_offset = send_offset - sizeof(struct mtk_share_obj);
>   
> -	/* Disable SCP to host interrupt */
> -	writel(MT8183_SCP_IPC_INT_BIT, scp->reg_base + MT8183_SCP_TO_HOST);
> -
>   	/* shared buffer initialization */
>   	scp->recv_buf =
>   		(struct mtk_share_obj __iomem *)(scp->sram_base + recv_offset);
> @@ -138,7 +135,7 @@ static int scp_ipi_init(struct mtk_scp *scp)
>   	return 0;
>   }
>   
> -static void scp_reset_assert(const struct mtk_scp *scp)
> +static void mt8183_scp_reset_assert(struct mtk_scp *scp)
>   {
>   	u32 val;
>   
> @@ -147,7 +144,7 @@ static void scp_reset_assert(const struct mtk_scp *scp)
>   	writel(val, scp->reg_base + MT8183_SW_RSTN);
>   }
>   
> -static void scp_reset_deassert(const struct mtk_scp *scp)
> +static void mt8183_scp_reset_deassert(struct mtk_scp *scp)
>   {
>   	u32 val;
>   
> @@ -156,17 +153,29 @@ static void scp_reset_deassert(const struct mtk_scp *scp)
>   	writel(val, scp->reg_base + MT8183_SW_RSTN);
>   }
>   
> -static irqreturn_t scp_irq_handler(int irq, void *priv)
> +static void mt8192_scp_reset_assert(struct mtk_scp *scp)
>   {
> -	struct mtk_scp *scp = priv;
> -	u32 scp_to_host;
> -	int ret;
> +	writel(1, scp->reg_base + MT8192_CORE0_SW_RSTN_SET);
> +}
>   
> -	ret = clk_prepare_enable(scp->clk);
> -	if (ret) {
> -		dev_err(scp->dev, "failed to enable clocks\n");
> -		return IRQ_NONE;
> -	}
> +static void mt8192_scp_reset_deassert(struct mtk_scp *scp)
> +{
> +	writel(1, scp->reg_base + MT8192_CORE0_SW_RSTN_CLR);
> +}
> +
> +static void scp_reset_assert(struct mtk_scp *scp)
> +{
> +	scp->data->scp_reset_assert(scp);

I think we can call scp->data->scp_reset_assert(scp) directly.

> +}
> +
> +static void scp_reset_deassert(struct mtk_scp *scp)
> +{
> +	scp->data->scp_reset_deassert(scp);

Same here.

Regards,
Matthias