From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
To: linux@roeck-us.net, linux-hwmon@vger.kernel.org
Cc: jdelvare@suse.com, linux-kernel@vger.kernel.org,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Subject: [PATCH] hwmon: (jc42) Restore the min/max/critical temperatures on resume
Date: Wed, 19 Oct 2022 23:41:08 +0200 [thread overview]
Message-ID: <20221019214108.220319-1-martin.blumenstingl@googlemail.com> (raw)
The JC42 compatible thermal sensor on Kingston KSM32ES8/16ME DIMMs
(using Micron E-Die) is an ST Microelectronics STTS2004 (manufacturer
0x104a, device 0x2201). It does not keep the previously programmed
minimum, maximum and critical temperatures after system suspend and
resume (which is a shutdown / startup cycle for the JC42 temperature
sensor). This results in an alarm on system resume because the hardware
default for these values is 0°C (so any environment temperature greater
than 0°C will trigger the alarm).
Example before system suspend:
jc42-i2c-0-1a
Adapter: SMBus PIIX4 adapter port 0 at 0b00
temp1: +34.8°C (low = +0.0°C)
(high = +85.0°C, hyst = +85.0°C)
(crit = +95.0°C, hyst = +95.0°C)
Example after system resume (without this change):
jc42-i2c-0-1a
Adapter: SMBus PIIX4 adapter port 0 at 0b00
temp1: +34.8°C (low = +0.0°C) ALARM (HIGH, CRIT)
(high = +0.0°C, hyst = +0.0°C)
(crit = +0.0°C, hyst = +0.0°C)
Apply the previously read or previously programmed temperature limits on
system resume. This fixes the alarm due to the hardware defaults of 0°C
because the previously applied limits (from a userspace setting) are
re-applied on system resume.
Fixes: 175c490c9e7f ("hwmon: (jc42) Add support for STTS2004 and AT30TSE004")
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
This is my first change to jc42. I tried to be defensive with applying
the previous values by only configuring them if they are known valid. I
only have this one set of JC42 compatible sensors but I can adapt the
code here based on your suggestions.
drivers/hwmon/jc42.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/drivers/hwmon/jc42.c b/drivers/hwmon/jc42.c
index 30888feaf589..f98b28ff10ad 100644
--- a/drivers/hwmon/jc42.c
+++ b/drivers/hwmon/jc42.c
@@ -558,6 +558,19 @@ static int jc42_resume(struct device *dev)
data->config &= ~JC42_CFG_SHUTDOWN;
i2c_smbus_write_word_swapped(data->client, JC42_REG_CONFIG,
data->config);
+
+ if (data->valid || data->temp[t_min])
+ i2c_smbus_write_word_swapped(data->client, temp_regs[t_min],
+ data->temp[t_min]);
+
+ if (data->valid || data->temp[t_max])
+ i2c_smbus_write_word_swapped(data->client, temp_regs[t_max],
+ data->temp[t_max]);
+
+ if (data->valid || data->temp[t_crit])
+ i2c_smbus_write_word_swapped(data->client, temp_regs[t_crit],
+ data->temp[t_crit]);
+
return 0;
}
--
2.38.1
next reply other threads:[~2022-10-19 21:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-19 21:41 Martin Blumenstingl [this message]
2022-10-19 21:51 ` Guenter Roeck
2022-10-19 22:03 ` Martin Blumenstingl
2022-10-19 22:50 ` Guenter Roeck
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=20221019214108.220319-1-martin.blumenstingl@googlemail.com \
--to=martin.blumenstingl@googlemail.com \
--cc=jdelvare@suse.com \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
/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
all inboxes | Powered by JetHome®