From: Roger Lu <roger.lu@mediatek.com>
To: Matthias Brugger <matthias.bgg@gmail.com>,
Enric Balletbo Serra <eballetbo@gmail.com>,
Kevin Hilman <khilman@kernel.org>,
Nicolas Boichat <drinkcat@google.com>
Cc: Fan Chen <fan.chen@mediatek.com>,
Roger Lu <roger.lu@mediatek.com>,
Jia-wei Chang <jia-wei.chang@mediatek.com>,
<devicetree@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <linux-pm@vger.kernel.org>,
<Project_Global_Chrome_Upstream_Group@mediatek.com>
Subject: [PATCH v4 01/14] soc: mediatek: mtk-svs: restore default voltages when svs_init02() fail
Date: Wed, 11 Jan 2023 15:45:15 +0800 [thread overview]
Message-ID: <20230111074528.29354-2-roger.lu@mediatek.com> (raw)
In-Reply-To: <20230111074528.29354-1-roger.lu@mediatek.com>
If svs init02 fail, it means we cannot rely on svs bank voltages anymore.
We need to disable svs function and restore DVFS opp voltages back to the
default voltages for making sure we have enough DVFS voltages.
Fixes: 681a02e95000 ("soc: mediatek: SVS: introduce MTK SVS engine")
Fixes: 0bbb09b2af9d ("soc: mediatek: SVS: add mt8192 SVS GPU driver")
Signed-off-by: Roger Lu <roger.lu@mediatek.com>
---
drivers/soc/mediatek/mtk-svs.c | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/drivers/soc/mediatek/mtk-svs.c b/drivers/soc/mediatek/mtk-svs.c
index 0469c9dfeb04..2df30a6bca28 100644
--- a/drivers/soc/mediatek/mtk-svs.c
+++ b/drivers/soc/mediatek/mtk-svs.c
@@ -1461,6 +1461,7 @@ static int svs_init02(struct svs_platform *svsp)
{
struct svs_bank *svsb;
unsigned long flags, time_left;
+ int ret;
u32 idx;
for (idx = 0; idx < svsp->bank_max; idx++) {
@@ -1479,7 +1480,8 @@ static int svs_init02(struct svs_platform *svsp)
msecs_to_jiffies(5000));
if (!time_left) {
dev_err(svsb->dev, "init02 completion timeout\n");
- return -EBUSY;
+ ret = -EBUSY;
+ goto out_of_init02;
}
}
@@ -1497,12 +1499,30 @@ static int svs_init02(struct svs_platform *svsp)
if (svsb->type == SVSB_HIGH || svsb->type == SVSB_LOW) {
if (svs_sync_bank_volts_from_opp(svsb)) {
dev_err(svsb->dev, "sync volt fail\n");
- return -EPERM;
+ ret = -EPERM;
+ goto out_of_init02;
}
}
}
return 0;
+
+out_of_init02:
+ for (idx = 0; idx < svsp->bank_max; idx++) {
+ svsb = &svsp->banks[idx];
+
+ spin_lock_irqsave(&svs_lock, flags);
+ svsp->pbank = svsb;
+ svs_switch_bank(svsp);
+ svs_writel_relaxed(svsp, SVSB_PTPEN_OFF, SVSEN);
+ svs_writel_relaxed(svsp, SVSB_INTSTS_VAL_CLEAN, INTSTS);
+ spin_unlock_irqrestore(&svs_lock, flags);
+
+ svsb->phase = SVSB_PHASE_ERROR;
+ svs_adjust_pm_opp_volts(svsb);
+ }
+
+ return ret;
}
static void svs_mon_mode(struct svs_platform *svsp)
--
2.18.0
next prev parent reply other threads:[~2023-01-11 7:46 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-11 7:45 [PATCH v4 0/14] Enahance SVS's robustness Roger Lu
2023-01-11 7:45 ` Roger Lu [this message]
2023-01-31 13:22 ` [PATCH v4 01/14] soc: mediatek: mtk-svs: restore default voltages when svs_init02() fail Matthias Brugger
2023-01-11 7:45 ` [PATCH v4 02/14] soc: mediatek: mtk-svs: reset svs when svs_resume() fail Roger Lu
2023-01-31 13:22 ` Matthias Brugger
2023-01-11 7:45 ` [PATCH v4 03/14] soc: mediatek: mtk-svs: enable the IRQ later Roger Lu
2023-01-31 12:59 ` Matthias Brugger
2023-02-01 13:43 ` Roger Lu (陸瑞傑)
2023-02-01 13:47 ` Matthias Brugger
2023-01-11 7:45 ` [PATCH v4 04/14] soc: mediatek: mtk-svs: Use pm_runtime_resume_and_get() in svs_init01() Roger Lu
2023-01-31 13:23 ` Matthias Brugger
2023-01-11 7:45 ` [PATCH v4 05/14] soc: mediatek: mtk-svs: use svs clk control APIs Roger Lu
2023-01-31 13:19 ` Matthias Brugger
2023-02-01 12:28 ` Roger Lu (陸瑞傑)
2023-02-02 10:29 ` Matthias Brugger
2023-02-06 2:01 ` Roger Lu (陸瑞傑)
2023-02-06 12:09 ` Matthias Brugger
2023-02-11 11:34 ` Roger Lu (陸瑞傑)
2023-01-11 7:45 ` [PATCH v4 06/14] soc: mediatek: mtk-svs: add thermal voltage compensation if needed Roger Lu
2023-01-11 7:45 ` [PATCH v4 07/14] soc: mediatek: mtk-svs: keep svs alive if CONFIG_DEBUG_FS not supported Roger Lu
2023-01-31 13:24 ` Matthias Brugger
2023-01-11 7:45 ` [PATCH v4 08/14] soc: mediatek: mtk-svs: clean up platform probing Roger Lu
2023-01-31 13:24 ` Matthias Brugger
2023-01-11 7:45 ` [PATCH v4 09/14] soc: mediatek: mtk-svs: improve readability of platform_probe Roger Lu
2023-01-31 13:24 ` Matthias Brugger
2023-01-11 7:45 ` [PATCH v4 10/14] soc: mediatek: mtk-svs: move svs_platform_probe into probe Roger Lu
2023-01-31 13:25 ` Matthias Brugger
2023-01-11 7:45 ` [PATCH v4 11/14] soc: mediatek: mtk-svs: delete superfluous platform data entries Roger Lu
2023-01-31 13:30 ` Matthias Brugger
2023-01-11 7:45 ` [PATCH v4 12/14] soc: mediatek: mtk-svs: use svs get efuse common function Roger Lu
2023-01-31 13:37 ` Matthias Brugger
2023-02-01 8:15 ` Roger Lu (陸瑞傑)
2023-01-11 7:45 ` [PATCH v4 13/14] soc: mediatek: mtk-svs: use common function to disable restore voltages Roger Lu
2023-01-31 13:40 ` Matthias Brugger
2023-02-01 8:13 ` Roger Lu (陸瑞傑)
2023-01-11 7:45 ` [PATCH v4 14/14] soc: mtk-svs: mt8183: refactor o_slope calculation Roger Lu
2023-01-31 13:41 ` Matthias Brugger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230111074528.29354-2-roger.lu@mediatek.com \
--to=roger.lu@mediatek.com \
--cc=Project_Global_Chrome_Upstream_Group@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=drinkcat@google.com \
--cc=eballetbo@gmail.com \
--cc=fan.chen@mediatek.com \
--cc=jia-wei.chang@mediatek.com \
--cc=khilman@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-pm@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).