Patch "soc: mediatek: mtk-svs: reset svs when svs_resume() fail" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    soc: mediatek: mtk-svs: reset svs when svs_resume() fail

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     soc-mediatek-mtk-svs-reset-svs-when-svs_resume-fail.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit c438158b5adf14faed58a940af4dfacc8c8d7120
Author: Roger Lu <roger.lu@xxxxxxxxxxxx>
Date:   Wed Jan 11 15:45:16 2023 +0800

    soc: mediatek: mtk-svs: reset svs when svs_resume() fail
    
    [ Upstream commit f4f8ad204a15d57c1a3e8ea7eca62157b44cbf59 ]
    
    Add svs reset when svs_resume() fail.
    
    Fixes: a825d72f74a3 ("soc: mediatek: fix missing clk_disable_unprepare() on err in svs_resume()")
    Signed-off-by: Roger Lu <roger.lu@xxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20230111074528.29354-3-roger.lu@xxxxxxxxxxxx
    Signed-off-by: Matthias Brugger <matthias.bgg@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/soc/mediatek/mtk-svs.c b/drivers/soc/mediatek/mtk-svs.c
index 9859e6cf6b8f9..e0b8aa75c84b6 100644
--- a/drivers/soc/mediatek/mtk-svs.c
+++ b/drivers/soc/mediatek/mtk-svs.c
@@ -1614,12 +1614,16 @@ static int svs_resume(struct device *dev)
 
 	ret = svs_init02(svsp);
 	if (ret)
-		goto out_of_resume;
+		goto svs_resume_reset_assert;
 
 	svs_mon_mode(svsp);
 
 	return 0;
 
+svs_resume_reset_assert:
+	dev_err(svsp->dev, "assert reset: %d\n",
+		reset_control_assert(svsp->rst));
+
 out_of_resume:
 	clk_disable_unprepare(svsp->main_clk);
 	return ret;