lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.11 515/775] remoteproc/mediatek: acknowledge watchdog IRQ after handled
    Date
    From: Tzung-Bi Shih <tzungbi@google.com>

    [ Upstream commit 8c545f52dce44368fff524e13116e696e005c074 ]

    Acknowledges watchdog IRQ after handled or kernel keeps receiving the
    interrupt.

    Fixes: fd0b6c1ff85a ("remoteproc/mediatek: Add support for mt8192 SCP")
    Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
    Link: https://lore.kernel.org/r/20210127082046.3735157-1-tzungbi@google.com
    Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/remoteproc/mtk_common.h | 1 +
    drivers/remoteproc/mtk_scp.c | 20 +++++++++++---------
    2 files changed, 12 insertions(+), 9 deletions(-)

    diff --git a/drivers/remoteproc/mtk_common.h b/drivers/remoteproc/mtk_common.h
    index 988edb4977c31..bcab38511bf31 100644
    --- a/drivers/remoteproc/mtk_common.h
    +++ b/drivers/remoteproc/mtk_common.h
    @@ -47,6 +47,7 @@

    #define MT8192_CORE0_SW_RSTN_CLR 0x10000
    #define MT8192_CORE0_SW_RSTN_SET 0x10004
    +#define MT8192_CORE0_WDT_IRQ 0x10030
    #define MT8192_CORE0_WDT_CFG 0x10034

    #define SCP_FW_VER_LEN 32
    diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
    index e0c2356903616..eba825b46696e 100644
    --- a/drivers/remoteproc/mtk_scp.c
    +++ b/drivers/remoteproc/mtk_scp.c
    @@ -197,17 +197,19 @@ static void mt8192_scp_irq_handler(struct mtk_scp *scp)

    scp_to_host = readl(scp->reg_base + MT8192_SCP2APMCU_IPC_SET);

    - if (scp_to_host & MT8192_SCP_IPC_INT_BIT)
    + if (scp_to_host & MT8192_SCP_IPC_INT_BIT) {
    scp_ipi_handler(scp);
    - else
    - scp_wdt_handler(scp, scp_to_host);

    - /*
    - * SCP won't send another interrupt until we clear
    - * MT8192_SCP2APMCU_IPC.
    - */
    - writel(MT8192_SCP_IPC_INT_BIT,
    - scp->reg_base + MT8192_SCP2APMCU_IPC_CLR);
    + /*
    + * SCP won't send another interrupt until we clear
    + * MT8192_SCP2APMCU_IPC.
    + */
    + writel(MT8192_SCP_IPC_INT_BIT,
    + scp->reg_base + MT8192_SCP2APMCU_IPC_CLR);
    + } else {
    + scp_wdt_handler(scp, scp_to_host);
    + writel(1, scp->reg_base + MT8192_CORE0_WDT_IRQ);
    + }
    }

    static irqreturn_t scp_irq_handler(int irq, void *priv)
    --
    2.27.0


    \
     
     \ /
      Last update: 2021-03-02 05:10    [W:2.223 / U:0.500 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site