From: Michael Kao <michael.kao@mediatek.com>
To: Zhang Rui <rui.zhang@intel.com>,
Eduardo Valentin <edubezval@gmail.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Matthias Brugger <matthias.bgg@gmail.com>, <hsinyi@chromium.org>,
<linux-pm@vger.kernel.org>, <srv_heupstream@mediatek.com>
Cc: devicetree@vger.kernel.org, linux-mediatek@lists.infradead.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
"michael.kao" <michael.kao@mediatek.com>
Subject: [PATCH v3,8/8] thermal: mediatek: use spinlock to protect PTPCORESEL
Date: Fri, 3 Jan 2020 14:44:07 +0800 [thread overview]
Message-ID: <20200103064407.19861-9-michael.kao@mediatek.com> (raw)
In-Reply-To: <20200103064407.19861-1-michael.kao@mediatek.com>
From: "michael.kao" <michael.kao@mediatek.com>
The driver of thermal and svs will use the
same register for the project which should select
bank before reading sensor value.
Signed-off-by: Michael Kao <michael.kao@mediatek.com>
---
drivers/thermal/mtk_thermal.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c
index 9be9fcb18d9e..639d34ed223b 100644
--- a/drivers/thermal/mtk_thermal.c
+++ b/drivers/thermal/mtk_thermal.c
@@ -22,6 +22,7 @@
#include <linux/thermal.h>
#include <linux/reset.h>
#include <linux/types.h>
+#include <linux/power/mtk_svs.h>
/* AUXADC Registers */
#define AUXADC_CON1_SET_V 0x008
@@ -262,7 +263,7 @@ struct mtk_thermal {
struct clk *clk_peri_therm;
struct clk *clk_auxadc;
/* lock: for getting and putting banks */
- struct mutex lock;
+ unsigned long flags;
/* Calibration values */
s32 adc_ge;
@@ -561,7 +562,7 @@ static void mtk_thermal_get_bank(struct mtk_thermal_bank *bank)
u32 val;
if (mt->conf->need_switch_bank) {
- mutex_lock(&mt->lock);
+ mt->flags = claim_mtk_svs_lock();
val = readl(mt->thermal_base + PTPCORESEL);
val &= ~0xf;
@@ -581,7 +582,7 @@ static void mtk_thermal_put_bank(struct mtk_thermal_bank *bank)
struct mtk_thermal *mt = bank->mt;
if (mt->conf->need_switch_bank)
- mutex_unlock(&mt->lock);
+ release_mtk_svs_lock(mt->flags);
}
/**
@@ -936,8 +937,6 @@ static int mtk_thermal_probe(struct platform_device *pdev)
if (ret)
return ret;
- mutex_init(&mt->lock);
-
mt->dev = &pdev->dev;
auxadc = of_parse_phandle(np, "mediatek,auxadc", 0);
--
2.18.0
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
prev parent reply other threads:[~2020-01-03 6:53 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-03 6:43 [PATCH v3,0/8] Add Mediatek thermal dirver and dtsi Michael Kao
2020-01-03 6:44 ` [PATCH v3,1/8] arm64: dts: mt8183: add thermal zone node Michael Kao
2020-01-09 11:31 ` Daniel Lezcano
2020-02-11 3:17 ` Michael Kao
2020-02-20 11:52 ` Daniel Lezcano
2020-02-20 20:57 ` Matthias Brugger
2020-02-26 1:58 ` Michael Kao
2020-02-20 20:56 ` Matthias Brugger
2020-01-03 6:44 ` [PATCH v3, 2/8] arm64: dts: mt8183: add/update dynamic power coefficients Michael Kao
2020-01-10 14:40 ` [PATCH v3,2/8] " Matthias Brugger
2020-02-11 2:05 ` Michael Kao
2020-02-20 21:06 ` Matthias Brugger
2020-01-03 6:44 ` [PATCH v3,3/8] arm64: dts: mt8183: Add #cooling-cells to CPU nodes Michael Kao
2020-02-20 21:59 ` Matthias Brugger
2020-01-03 6:44 ` [PATCH v3,4/8] arm64: dts: mt8183: Configure CPU cooling Michael Kao
2020-02-25 9:34 ` Michael Kao
2020-01-03 6:44 ` [PATCH v3, 5/8] arm64: dts: mt8183: Increase polling frequency for CPU thermal zone Michael Kao
2020-01-03 6:44 ` [PATCH v3,6/8] thermal: mediatek: mt8183: fix bank number settings Michael Kao
2020-01-08 9:58 ` [PATCH v3, 6/8] " Hsin-Yi Wang
2020-01-03 6:44 ` [PATCH v3, 7/8] thermal: mediatek: add another get_temp ops for thermal sensors Michael Kao
2020-01-03 6:44 ` Michael Kao [this message]
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=20200103064407.19861-9-michael.kao@mediatek.com \
--to=michael.kao@mediatek.com \
--cc=daniel.lezcano@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=edubezval@gmail.com \
--cc=hsinyi@chromium.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=mark.rutland@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=robh+dt@kernel.org \
--cc=rui.zhang@intel.com \
--cc=srv_heupstream@mediatek.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).