This is a note to let you know that I've just added the patch titled
hwmon: (coretemp) Fix TjMax detection for older CPUs
to the 2.6.39-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
hwmon-coretemp-fix-tjmax-detection-for-older-cpus.patch
and it can be found in the queue-2.6.39 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 4f5f71a7abe329bdad81ee6a8e4545054a7cc30a Mon Sep 17 00:00:00 2001
From: Guenter Roeck <[email protected]>
Date: Tue, 31 May 2011 06:54:21 -0700
Subject: hwmon: (coretemp) Fix TjMax detection for older CPUs
From: Guenter Roeck <[email protected]>
commit 4f5f71a7abe329bdad81ee6a8e4545054a7cc30a upstream.
Commit a321cedb12904114e2ba5041a3673ca24deb09c9 excludes CPU models 0xe, 0xf,
0x16, and 0x1a from TjMax temperature adjustment, even though several of those
CPUs are known to have TiMax other than 100 degrees C, and even though the code
in adjust_tjmax() explicitly handles those CPUs and points to a Web document
listing several of the affected CPU IDs.
Reinstate original TjMax adjustment if TjMax can not be determined using the
IA32_TEMPERATURE_TARGET register.
https://bugzilla.kernel.org/show_bug.cgi?id=32582
Signed-off-by: Guenter Roeck <[email protected]>
Cc: Huaxu Wan <[email protected]>
Cc: Carsten Emde <[email protected]>
Cc: Valdis Kletnieks <[email protected]>
Cc: Henrique de Moraes Holschuh <[email protected]>
Cc: Yong Wang <[email protected]>
Cc: Rudolf Marek <[email protected]>
Cc: Fenghua Yu <[email protected]>
Tested-by: Jean Delvare <[email protected]>
Acked-by: Jean Delvare <[email protected]>
Acked-by: Fenghua Yu <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/hwmon/coretemp.c | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -271,24 +271,9 @@ static int __devinit get_tjmax(struct cp
/*
* An assumption is made for early CPUs and unreadable MSR.
- * NOTE: the given value may not be correct.
+ * NOTE: the calculated value may not be correct.
*/
-
- switch (c->x86_model) {
- case 0xe:
- case 0xf:
- case 0x16:
- case 0x1a:
- dev_warn(dev, "TjMax is assumed as 100 C!\n");
- return 100000;
- case 0x17:
- case 0x1c: /* Atom CPUs */
- return adjust_tjmax(c, id, dev);
- default:
- dev_warn(dev, "CPU (model=0x%x) is not supported yet,"
- " using default TjMax of 100C.\n", c->x86_model);
- return 100000;
- }
+ return adjust_tjmax(c, id, dev);
}
static void __devinit get_ucode_rev_on_cpu(void *edx)
Patches currently in stable-queue which might be from
[email protected] are
queue-2.6.39/hwmon-coretemp-fix-tjmax-detection-for-older-cpus.patch
queue-2.6.39/hwmon-coretemp-relax-target-temperature-range-check.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
