[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240913103933.30895-2-chun-jen.tseng@mediatek.com>
Date: Fri, 13 Sep 2024 18:39:32 +0800
From: Mark Tseng <chun-jen.tseng@...iatek.com>
To: "Rafael J . Wysocki" <rafael@...nel.org>, Viresh Kumar
<viresh.kumar@...aro.org>, MyungJoo Ham <myungjoo.ham@...sung.com>, "Kyungmin
Park" <kyungmin.park@...sung.com>, Chanwoo Choi <cw00.choi@...sung.com>,
Matthias Brugger <matthias.bgg@...il.com>, AngeloGioacchino Del Regno
<angelogioacchino.delregno@...labora.com>
CC: <linux-pm@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>, <linux-mediatek@...ts.infradead.org>,
<Project_Global_Chrome_Upstream_Group@...iatek.com>,
<chun-jen.tseng@...iatek.com>
Subject: [PATCH v1 1/2] PM / devfreq: mediatek: protect oop in critical session
mtk_ccifreq_target() & mtk_ccifreq_opp_notifier() is re-enter funtion
when cpufreq governor is more than one. It should add global mutex to
protect OPP , avoid get wrong frequency & voltage.
Signed-off-by: Mark Tseng <chun-jen.tseng@...iatek.com>
---
drivers/devfreq/mtk-cci-devfreq.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/devfreq/mtk-cci-devfreq.c b/drivers/devfreq/mtk-cci-devfreq.c
index 7ad5225b0381..293cf81e53fe 100644
--- a/drivers/devfreq/mtk-cci-devfreq.c
+++ b/drivers/devfreq/mtk-cci-devfreq.c
@@ -29,13 +29,14 @@ struct mtk_ccifreq_drv {
struct clk *inter_clk;
int inter_voltage;
unsigned long pre_freq;
- /* Avoid race condition for regulators between notify and policy */
- struct mutex reg_lock;
struct notifier_block opp_nb;
const struct mtk_ccifreq_platform_data *soc_data;
int vtrack_max;
};
+/* Avoid race condition for regulators between notify and policy */
+static DEFINE_MUTEX(reg_lock);
+
static int mtk_ccifreq_set_voltage(struct mtk_ccifreq_drv *drv, int new_voltage)
{
const struct mtk_ccifreq_platform_data *soc_data = drv->soc_data;
@@ -125,22 +126,20 @@ static int mtk_ccifreq_set_voltage(struct mtk_ccifreq_drv *drv, int new_voltage)
static int mtk_ccifreq_target(struct device *dev, unsigned long *freq,
u32 flags)
{
- struct mtk_ccifreq_drv *drv = dev_get_drvdata(dev);
+ struct mtk_ccifreq_drv *drv;
struct clk *cci_pll;
struct dev_pm_opp *opp;
unsigned long opp_rate;
int voltage, pre_voltage, inter_voltage, target_voltage, ret;
+ mutex_lock(®_lock);
+
+ drv = dev_get_drvdata(dev);
if (!drv)
return -EINVAL;
- if (drv->pre_freq == *freq)
- return 0;
-
- mutex_lock(&drv->reg_lock);
-
- inter_voltage = drv->inter_voltage;
cci_pll = clk_get_parent(drv->cci_clk);
+ inter_voltage = drv->inter_voltage;
opp_rate = *freq;
opp = devfreq_recommended_opp(dev, &opp_rate, 1);
@@ -206,7 +205,7 @@ static int mtk_ccifreq_target(struct device *dev, unsigned long *freq,
}
drv->pre_freq = *freq;
- mutex_unlock(&drv->reg_lock);
+ mutex_unlock(®_lock);
return 0;
@@ -214,21 +213,23 @@ static int mtk_ccifreq_target(struct device *dev, unsigned long *freq,
mtk_ccifreq_set_voltage(drv, pre_voltage);
out_unlock:
- mutex_unlock(&drv->reg_lock);
+ mutex_unlock(®_lock);
return ret;
}
static int mtk_ccifreq_opp_notifier(struct notifier_block *nb,
unsigned long event, void *data)
{
- struct dev_pm_opp *opp = data;
+ struct dev_pm_opp *opp;
struct mtk_ccifreq_drv *drv;
unsigned long freq, volt;
+ mutex_lock(®_lock);
+
+ opp = data;
drv = container_of(nb, struct mtk_ccifreq_drv, opp_nb);
if (event == OPP_EVENT_ADJUST_VOLTAGE) {
- mutex_lock(&drv->reg_lock);
freq = dev_pm_opp_get_freq(opp);
/* current opp item is changed */
@@ -236,8 +237,8 @@ static int mtk_ccifreq_opp_notifier(struct notifier_block *nb,
volt = dev_pm_opp_get_voltage(opp);
mtk_ccifreq_set_voltage(drv, volt);
}
- mutex_unlock(&drv->reg_lock);
}
+ mutex_unlock(®_lock);
return 0;
}
@@ -262,7 +263,6 @@ static int mtk_ccifreq_probe(struct platform_device *pdev)
drv->dev = dev;
drv->soc_data = (const struct mtk_ccifreq_platform_data *)
of_device_get_match_data(&pdev->dev);
- mutex_init(&drv->reg_lock);
platform_set_drvdata(pdev, drv);
drv->cci_clk = devm_clk_get(dev, "cci");
--
2.45.2
Powered by blists - more mailing lists