From: Binbin Zhou <zhoubb.aaron@gmail.com>
To: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Binbin Zhou <zhoubinbin@loongson.cn>,
Huacai Chen <chenhuacai@loongson.cn>,
"Rafael J . Wysocki" <rafael@kernel.org>,
Amit Kucheria <amitk@kernel.org>, Zhang Rui <rui.zhang@intel.com>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>,
Huacai Chen <chenhuacai@kernel.org>,
loongson-kernel@lists.loongnix.cn, linux-pm@vger.kernel.org,
devicetree@vger.kernel.org, Yinbo Zhu <zhuyinbo@loongson.cn>,
WANG Xuerui <git@xen0n.name>,
loongarch@lists.linux.dev
Subject: Re: [PATCH v3 4/4] thermal: loongson2: Add Loongson-2K2000 support
Date: Mon, 22 Apr 2024 19:08:15 +0800 [thread overview]
Message-ID: <CAMpQs4JQq-umG9y0giwoa6mceeU7_Ltd2bSin=V1kY7-bbRcwA@mail.gmail.com> (raw)
In-Reply-To: <fc73c913-a6e5-418c-811c-57567a3115b8@linaro.org>
On Mon, Apr 22, 2024 at 6:42 PM Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
>
> On 20/04/2024 03:46, Binbin Zhou wrote:
> > The Loongson-2K2000 and Loongson-2K1000 have similar thermal sensors,
> > except that the temperature is read differently.
> >
> > In particular, the temperature output registers of the Loongson-2K2000
> > are defined in the chip configuration domain and are read in a different
> > way.
> >
> > Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn>
> > Acked-by: Huacai Chen <chenhuacai@loongson.cn>
> > ---
> > drivers/thermal/loongson2_thermal.c | 50 +++++++++++++++++++++++------
> > 1 file changed, 40 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/thermal/loongson2_thermal.c b/drivers/thermal/loongson2_thermal.c
> > index 7de01fbea801..8ecd8ed465ec 100644
> > --- a/drivers/thermal/loongson2_thermal.c
> > +++ b/drivers/thermal/loongson2_thermal.c
> > @@ -30,12 +30,20 @@
> > LOONGSON2_THSENS_INT_HIGH)
> > #define LOONGSON2_THSENS_OUT_MASK 0xFF
> >
> > +/*
> > + * This flag is used to indicate the temperature reading
> > + * method of the Loongson-2K2000
> > + */
> > +#define LS2K2000_THSENS_OUT_FLAG BIT(0)
> > +
> > struct loongson2_thermal_chip_data {
> > unsigned int thermal_sensor_sel;
> > + unsigned int flags;
> > };
> >
> > struct loongson2_thermal_data {
> > - void __iomem *regs;
> > + void __iomem *ctrl_reg;
> > + void __iomem *temp_reg;
> > const struct loongson2_thermal_chip_data *chip_data;
> > };
> >
> > @@ -48,7 +56,7 @@ static void loongson2_set_ctrl_regs(struct loongson2_thermal_data *data,
> >
> > reg_ctrl = ctrl_data + HECTO;
> > reg_ctrl |= enable ? 0x100 : 0;
> > - writew(reg_ctrl, data->regs + ctrl_reg + reg_off);
> > + writew(reg_ctrl, data->ctrl_reg + ctrl_reg + reg_off);
> > }
> >
> > static int loongson2_thermal_set(struct loongson2_thermal_data *data,
> > @@ -65,11 +73,16 @@ static int loongson2_thermal_set(struct loongson2_thermal_data *data,
> >
> > static int loongson2_thermal_get_temp(struct thermal_zone_device *tz, int *temp)
> > {
> > - u32 reg_val;
> > + int val;
> > struct loongson2_thermal_data *data = thermal_zone_device_priv(tz);
> >
> > - reg_val = readl(data->regs + LOONGSON2_THSENS_OUT_REG);
> > - *temp = ((reg_val & LOONGSON2_THSENS_OUT_MASK) - HECTO) * KILO;
> > + if (data->chip_data->flags) {
> > + val = readl(data->temp_reg);
> > + *temp = ((val & 0xffff) * 820 / 0x4000 - 311) * KILO;
> > + } else {
> > + val = readl(data->ctrl_reg + LOONGSON2_THSENS_OUT_REG);
> > + *temp = ((val & LOONGSON2_THSENS_OUT_MASK) - HECTO) * KILO;
> > + }
>
> Why not use a different ops. That will keep the code cleaner for the
> next sensor versions.
>
> For example:
>
> static int loongson2_2k2000_get_temp(...)
> {
> }
>
> static int loongson2_2k1000_get_temp(...)
> {
> }
>
> static struct thermal_zone_device_ops loongson2_of_thermal_ops = {
> .get_temp = loongson2_2k1000_get_temp,
> .set_trips = loongson2_thermal_set_trips,
> };
>
>
> loongson2_thermal_probe
> {
> ...
>
> if (data->chip_data->flags & LS2K2000_THSENS_OUT_FLAG)
> loongson2_of_thermal_ops.get_temp = loongson2_2k2000_get_temp;
> ...
>
> }
Hi Daniel:
Thanks for your advice.
I'll use a different ops to keep the code cleaner in the next version,
Thanks.
Binbin
>
> > return 0;
> > }
> > @@ -79,7 +92,7 @@ static irqreturn_t loongson2_thermal_irq_thread(int irq, void *dev)
> > struct thermal_zone_device *tzd = dev;
> > struct loongson2_thermal_data *data = thermal_zone_device_priv(tzd);
> >
> > - writeb(LOONGSON2_THSENS_INT_EN, data->regs + LOONGSON2_THSENS_STATUS_REG);
> > + writeb(LOONGSON2_THSENS_INT_EN, data->ctrl_reg + LOONGSON2_THSENS_STATUS_REG);
> >
> > thermal_zone_device_update(tzd, THERMAL_EVENT_UNSPECIFIED);
> >
> > @@ -111,15 +124,22 @@ static int loongson2_thermal_probe(struct platform_device *pdev)
> >
> > data->chip_data = device_get_match_data(dev);
> >
> > - data->regs = devm_platform_ioremap_resource(pdev, 0);
> > - if (IS_ERR(data->regs))
> > - return PTR_ERR(data->regs);
> > + data->ctrl_reg = devm_platform_ioremap_resource(pdev, 0);
> > + if (IS_ERR(data->ctrl_reg))
> > + return PTR_ERR(data->ctrl_reg);
> > +
> > + /* The temperature output register is separate for Loongson-2K2000 */
> > + if (data->chip_data->flags) {
> > + data->temp_reg = devm_platform_ioremap_resource(pdev, 1);
> > + if (IS_ERR(data->temp_reg))
> > + return PTR_ERR(data->temp_reg);
> > + }
> >
> > irq = platform_get_irq(pdev, 0);
> > if (irq < 0)
> > return irq;
> >
> > - writeb(LOONGSON2_THSENS_INT_EN, data->regs + LOONGSON2_THSENS_STATUS_REG);
> > + writeb(LOONGSON2_THSENS_INT_EN, data->ctrl_reg + LOONGSON2_THSENS_STATUS_REG);
> >
> > loongson2_thermal_set(data, 0, 0, false);
> >
> > @@ -146,6 +166,12 @@ static int loongson2_thermal_probe(struct platform_device *pdev)
> >
> > static const struct loongson2_thermal_chip_data loongson2_thermal_ls2k1000_data = {
> > .thermal_sensor_sel = 0,
> > + .flags = 0,
> > +};
> > +
> > +static const struct loongson2_thermal_chip_data loongson2_thermal_ls2k2000_data = {
> > + .thermal_sensor_sel = 0,
> > + .flags = LS2K2000_THSENS_OUT_FLAG,
> > };
> >
> > static const struct of_device_id of_loongson2_thermal_match[] = {
> > @@ -153,6 +179,10 @@ static const struct of_device_id of_loongson2_thermal_match[] = {
> > .compatible = "loongson,ls2k1000-thermal",
> > .data = &loongson2_thermal_ls2k1000_data,
> > },
> > + {
> > + .compatible = "loongson,ls2k2000-thermal",
> > + .data = &loongson2_thermal_ls2k2000_data,
> > + },
> > { /* end */ }
> > };
> > MODULE_DEVICE_TABLE(of, of_loongson2_thermal_match);
>
> --
> <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
>
> Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
> <http://twitter.com/#!/linaroorg> Twitter |
> <http://www.linaro.org/linaro-blog/> Blog
>
prev parent reply other threads:[~2024-04-22 11:08 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-20 1:45 [PATCH v3 0/4] thermal: loongson2: Add Loongson-2K0500 and Loongson-2K2000 thermal support Binbin Zhou
2024-04-20 1:45 ` [PATCH v3 1/4] thermal: loongson2: Trivial code style adjustment Binbin Zhou
2024-04-22 9:44 ` Daniel Lezcano
2024-04-22 11:04 ` Binbin Zhou
2024-04-20 1:45 ` [PATCH v3 2/4] dt-bindings: thermal: loongson,ls2k-thermal: Add Loongson-2K0500 compatible Binbin Zhou
2024-04-20 1:45 ` [PATCH v3 3/4] dt-bindings: thermal: loongson,ls2k-thermal: Fix incorrect compatible definition Binbin Zhou
2024-04-20 1:46 ` [PATCH v3 4/4] thermal: loongson2: Add Loongson-2K2000 support Binbin Zhou
2024-04-22 10:42 ` Daniel Lezcano
2024-04-22 11:08 ` Binbin Zhou [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='CAMpQs4JQq-umG9y0giwoa6mceeU7_Ltd2bSin=V1kY7-bbRcwA@mail.gmail.com' \
--to=zhoubb.aaron@gmail.com \
--cc=amitk@kernel.org \
--cc=chenhuacai@kernel.org \
--cc=chenhuacai@loongson.cn \
--cc=conor+dt@kernel.org \
--cc=daniel.lezcano@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=git@xen0n.name \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-pm@vger.kernel.org \
--cc=loongarch@lists.linux.dev \
--cc=loongson-kernel@lists.loongnix.cn \
--cc=rafael@kernel.org \
--cc=robh+dt@kernel.org \
--cc=rui.zhang@intel.com \
--cc=zhoubinbin@loongson.cn \
--cc=zhuyinbo@loongson.cn \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).