Skip to content

Commit 199e0de

Browse files
durgadossGuenter Roeck
authored andcommitted
hwmon: (coretemp) Merge pkgtemp with coretemp
This patch merges the pkgtemp with coretemp driver. The sysfs interfaces for all cores in the same pkg are shown under one directory, in hwmon. It also supports CONFIG_HOTPLUG_CPU. So, the sysfs interfaces are created when each core comes online and are removed when it goes offline. Signed-off-by: Durgadoss R <[email protected]> Cc: Fenghua Yu <[email protected]> [[email protected]: Fixed section reference errors] Signed-off-by: Guenter Roeck <[email protected]>
1 parent 83f7649 commit 199e0de

File tree

2 files changed

+469
-217
lines changed

2 files changed

+469
-217
lines changed

Documentation/hwmon/coretemp

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,13 @@ Author: Rudolf Marek
1515

1616
Description
1717
-----------
18+
This driver permits reading the DTS (Digital Temperature Sensor) embedded
19+
inside Intel CPUs. This driver can read both the per-core and per-package
20+
temperature using the appropriate sensors. The per-package sensor is new;
21+
as of now, it is present only in the SandyBridge platform. The driver will
22+
show the temperature of all cores inside a package under a single device
23+
directory inside hwmon.
1824

19-
This driver permits reading temperature sensor embedded inside Intel Core CPU.
2025
Temperature is measured in degrees Celsius and measurement resolution is
2126
1 degree C. Valid temperatures are from 0 to TjMax degrees C, because
2227
the actual value of temperature register is in fact a delta from TjMax.
@@ -27,13 +32,15 @@ mechanism will perform actions to forcibly cool down the processor. Alarm
2732
may be raised, if the temperature grows enough (more than TjMax) to trigger
2833
the Out-Of-Spec bit. Following table summarizes the exported sysfs files:
2934

30-
temp1_input - Core temperature (in millidegrees Celsius).
31-
temp1_max - All cooling devices should be turned on (on Core2).
32-
temp1_crit - Maximum junction temperature (in millidegrees Celsius).
33-
temp1_crit_alarm - Set when Out-of-spec bit is set, never clears.
35+
All Sysfs entries are named with their core_id (represented here by 'X').
36+
tempX_input - Core temperature (in millidegrees Celsius).
37+
tempX_max - All cooling devices should be turned on (on Core2).
38+
tempX_crit - Maximum junction temperature (in millidegrees Celsius).
39+
tempX_crit_alarm - Set when Out-of-spec bit is set, never clears.
3440
Correct CPU operation is no longer guaranteed.
35-
temp1_label - Contains string "Core X", where X is processor
36-
number.
41+
tempX_label - Contains string "Core X", where X is processor
42+
number. For Package temp, this will be "Physical id Y",
43+
where Y is the package number.
3744

3845
The TjMax temperature is set to 85 degrees C if undocumented model specific
3946
register (UMSR) 0xee has bit 30 set. If not the TjMax is 100 degrees C as

0 commit comments

Comments
 (0)