summaryrefslogtreecommitdiffstats
path: root/Documentation/hwmon
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2011-09-16 21:24:02 +0200
committerGuenter Roeck <guenter.roeck@ericsson.com>2011-09-21 17:25:18 -0700
commita45a8c8571c0be6a6bd72ae5a14255c26b14b504 (patch)
tree47593c6b73c9a68dce03b57e7a387f94f441b8bb /Documentation/hwmon
parent6bf9e9b09c3abb5447bbbf16c2d0cbe721e44f3f (diff)
downloadlinux-stable-a45a8c8571c0be6a6bd72ae5a14255c26b14b504.tar.gz
linux-stable-a45a8c8571c0be6a6bd72ae5a14255c26b14b504.tar.bz2
linux-stable-a45a8c8571c0be6a6bd72ae5a14255c26b14b504.zip
hwmon: (coretemp) Let the user force TjMax
On old CPUs (and even some recent Atom CPUs) TjMax can't be read from the CPU registers, so it is guessed by the driver using a complex heuristic which isn't reliable. So let users who know their CPU's TjMax pass it as a module parameter. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: "R, Durgadoss" <durgadoss.r@intel.com> Cc: Guenter Roeck <guenter.roeck@ericsson.com> Cc: Alexander Stein <alexander.stein@systec-electronic.com> Acked-by: Fenghua Yu <fenghua.yu@intel.com> Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Diffstat (limited to 'Documentation/hwmon')
-rw-r--r--Documentation/hwmon/coretemp7
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/hwmon/coretemp b/Documentation/hwmon/coretemp
index fa8776ab9b18..49c0d42dde86 100644
--- a/Documentation/hwmon/coretemp
+++ b/Documentation/hwmon/coretemp
@@ -49,9 +49,10 @@ tempX_label - Contains string "Core X", where X is processor
number. For Package temp, this will be "Physical id Y",
where Y is the package number.
-The TjMax temperature is set to 85 degrees C if undocumented model specific
-register (UMSR) 0xee has bit 30 set. If not the TjMax is 100 degrees C as
-(sometimes) documented in processor datasheet.
+On CPU models which support it, TjMax is read from a model-specific register.
+On other models, it is set to an arbitrary value based on weak heuristics.
+If these heuristics don't work for you, you can pass the correct TjMax value
+as a module parameter (tjmax).
Appendix A. Known TjMax lists (TBD):
Some information comes from ark.intel.com