From: "Pali Rohár" <pali.rohar@gmail.com>
To: Guenter Roeck <linux@roeck-us.net>, Arnd Bergmann <arnd@arndb.de>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org,
"Steven Honeyman" <stevenhoneyman@gmail.com>,
"Pali Rohár" <pali.rohar@gmail.com>
Subject: [PATCH] i8k: Ignore temperature sensors which report invalid values
Date: Sun, 19 Oct 2014 16:46:54 +0200 [thread overview]
Message-ID: <1413730014-30945-1-git-send-email-pali.rohar@gmail.com> (raw)
On some machines some temperature sensors report too high values which are
invalid. When value is invalid function i8k_get_temp() returns previous
value and at next call it returns I8K_MAX_TEMP.
With this patch also firt i8k_get_temp() call returns I8K_MAX_TEMP and
i8k_init_hwmon() will ignore all sensor ids which report incorrect values.
Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
---
drivers/char/i8k.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
index 7272b08..bc327fa 100644
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@ -298,7 +298,7 @@ static int i8k_get_temp(int sensor)
int temp;
#ifdef I8K_TEMPERATURE_BUG
- static int prev[4];
+ static int prev[4] = { I8K_MAX_TEMP, I8K_MAX_TEMP, I8K_MAX_TEMP, I8K_MAX_TEMP };
#endif
regs.ebx = sensor & 0xff;
rc = i8k_smm(®s);
@@ -610,17 +610,17 @@ static int __init i8k_init_hwmon(void)
/* CPU temperature attributes, if temperature reading is OK */
err = i8k_get_temp(0);
- if (err >= 0)
+ if (err >= 0 && err < I8K_MAX_TEMP)
i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP1;
/* check for additional temperature sensors */
err = i8k_get_temp(1);
- if (err >= 0)
+ if (err >= 0 && err < I8K_MAX_TEMP)
i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP2;
err = i8k_get_temp(2);
- if (err >= 0)
+ if (err >= 0 && err < I8K_MAX_TEMP)
i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP3;
err = i8k_get_temp(3);
- if (err >= 0)
+ if (err >= 0 && err < I8K_MAX_TEMP)
i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP4;
/* Left fan attributes, if left fan is present */
--
1.7.9.5
next reply other threads:[~2014-10-19 14:47 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-19 14:46 Pali Rohár [this message]
2014-10-19 15:13 ` [PATCH] i8k: Ignore temperature sensors which report invalid values Guenter Roeck
2014-10-20 16:46 ` Pali Rohár
2014-10-21 4:27 ` Guenter Roeck
2014-10-22 12:29 ` Pali Rohár
2014-10-22 16:19 ` Guenter Roeck
2014-10-22 16:35 ` Pali Rohár
2014-10-22 17:10 ` Guenter Roeck
2014-10-23 10:37 ` Pali Rohár
2014-10-23 16:45 ` Guenter Roeck
2014-11-17 8:35 ` Pali Rohár
2014-11-18 5:56 ` Guenter Roeck
2014-11-18 14:46 ` Pali Rohár
2014-11-18 14:56 ` [PATCH] i8k: Fix temperature bug handling in i8k_get_temp() Pali Rohár
2014-11-30 0:12 ` Guenter Roeck
2014-11-30 14:44 ` Pali Rohár
2014-11-30 9:00 ` Guenter Roeck
2014-11-30 14:48 ` Pali Rohár
2014-11-30 15:56 ` Guenter Roeck
2014-11-30 16:00 ` Pali Rohár
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=1413730014-30945-1-git-send-email-pali.rohar@gmail.com \
--to=pali.rohar@gmail.com \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=stevenhoneyman@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).