diff options
| -rw-r--r-- | Documentation/hwmon/k8temp | 17 | ||||
| -rw-r--r-- | Documentation/hwmon/w83793 | 129 |
2 files changed, 80 insertions, 66 deletions
diff --git a/Documentation/hwmon/k8temp b/Documentation/hwmon/k8temp index 716dc24c7237..72da12aa17e5 100644 --- a/Documentation/hwmon/k8temp +++ b/Documentation/hwmon/k8temp | |||
| @@ -2,12 +2,17 @@ Kernel driver k8temp | |||
| 2 | ==================== | 2 | ==================== |
| 3 | 3 | ||
| 4 | Supported chips: | 4 | Supported chips: |
| 5 | |||
| 5 | * AMD Athlon64/FX or Opteron CPUs | 6 | * AMD Athlon64/FX or Opteron CPUs |
| 7 | |||
| 6 | Prefix: 'k8temp' | 8 | Prefix: 'k8temp' |
| 9 | |||
| 7 | Addresses scanned: PCI space | 10 | Addresses scanned: PCI space |
| 11 | |||
| 8 | Datasheet: http://support.amd.com/us/Processor_TechDocs/32559.pdf | 12 | Datasheet: http://support.amd.com/us/Processor_TechDocs/32559.pdf |
| 9 | 13 | ||
| 10 | Author: Rudolf Marek | 14 | Author: Rudolf Marek |
| 15 | |||
| 11 | Contact: Rudolf Marek <r.marek@assembler.cz> | 16 | Contact: Rudolf Marek <r.marek@assembler.cz> |
| 12 | 17 | ||
| 13 | Description | 18 | Description |
| @@ -27,10 +32,12 @@ implemented sensors. | |||
| 27 | 32 | ||
| 28 | Mapping of /sys files is as follows: | 33 | Mapping of /sys files is as follows: |
| 29 | 34 | ||
| 30 | temp1_input - temperature of Core 0 and "place" 0 | 35 | ============= =================================== |
| 31 | temp2_input - temperature of Core 0 and "place" 1 | 36 | temp1_input temperature of Core 0 and "place" 0 |
| 32 | temp3_input - temperature of Core 1 and "place" 0 | 37 | temp2_input temperature of Core 0 and "place" 1 |
| 33 | temp4_input - temperature of Core 1 and "place" 1 | 38 | temp3_input temperature of Core 1 and "place" 0 |
| 39 | temp4_input temperature of Core 1 and "place" 1 | ||
| 40 | ============= =================================== | ||
| 34 | 41 | ||
| 35 | Temperatures are measured in degrees Celsius and measurement resolution is | 42 | Temperatures are measured in degrees Celsius and measurement resolution is |
| 36 | 1 degree C. It is expected that future CPU will have better resolution. The | 43 | 1 degree C. It is expected that future CPU will have better resolution. The |
| @@ -48,7 +55,7 @@ computed temperature called TControl, which must be lower than TControlMax. | |||
| 48 | 55 | ||
| 49 | The relationship is following: | 56 | The relationship is following: |
| 50 | 57 | ||
| 51 | temp1_input - TjOffset*2 < TControlMax, | 58 | temp1_input - TjOffset*2 < TControlMax, |
| 52 | 59 | ||
| 53 | TjOffset is not yet exported by the driver, TControlMax is usually | 60 | TjOffset is not yet exported by the driver, TControlMax is usually |
| 54 | 70 degrees C. The rule of the thumb -> CPU temperature should not cross | 61 | 70 degrees C. The rule of the thumb -> CPU temperature should not cross |
diff --git a/Documentation/hwmon/w83793 b/Documentation/hwmon/w83793 index 6cc5f639b721..83bb40c48645 100644 --- a/Documentation/hwmon/w83793 +++ b/Documentation/hwmon/w83793 | |||
| @@ -2,29 +2,34 @@ Kernel driver w83793 | |||
| 2 | ==================== | 2 | ==================== |
| 3 | 3 | ||
| 4 | Supported chips: | 4 | Supported chips: |
| 5 | |||
| 5 | * Winbond W83793G/W83793R | 6 | * Winbond W83793G/W83793R |
| 7 | |||
| 6 | Prefix: 'w83793' | 8 | Prefix: 'w83793' |
| 9 | |||
| 7 | Addresses scanned: I2C 0x2c - 0x2f | 10 | Addresses scanned: I2C 0x2c - 0x2f |
| 11 | |||
| 8 | Datasheet: Still not published | 12 | Datasheet: Still not published |
| 9 | 13 | ||
| 10 | Authors: | 14 | Authors: |
| 11 | Yuan Mu (Winbond Electronics) | 15 | - Yuan Mu (Winbond Electronics) |
| 12 | Rudolf Marek <r.marek@assembler.cz> | 16 | - Rudolf Marek <r.marek@assembler.cz> |
| 13 | 17 | ||
| 14 | 18 | ||
| 15 | Module parameters | 19 | Module parameters |
| 16 | ----------------- | 20 | ----------------- |
| 17 | 21 | ||
| 18 | * reset int | 22 | * reset int |
| 19 | (default 0) | 23 | (default 0) |
| 20 | This parameter is not recommended, it will lose motherboard specific | 24 | |
| 21 | settings. Use 'reset=1' to reset the chip when loading this module. | 25 | This parameter is not recommended, it will lose motherboard specific |
| 26 | settings. Use 'reset=1' to reset the chip when loading this module. | ||
| 22 | 27 | ||
| 23 | * force_subclients=bus,caddr,saddr1,saddr2 | 28 | * force_subclients=bus,caddr,saddr1,saddr2 |
| 24 | This is used to force the i2c addresses for subclients of | 29 | This is used to force the i2c addresses for subclients of |
| 25 | a certain chip. Typical usage is `force_subclients=0,0x2f,0x4a,0x4b' | 30 | a certain chip. Typical usage is `force_subclients=0,0x2f,0x4a,0x4b` |
| 26 | to force the subclients of chip 0x2f on bus 0 to i2c addresses | 31 | to force the subclients of chip 0x2f on bus 0 to i2c addresses |
| 27 | 0x4a and 0x4b. | 32 | 0x4a and 0x4b. |
| 28 | 33 | ||
| 29 | 34 | ||
| 30 | Description | 35 | Description |
| @@ -33,70 +38,72 @@ Description | |||
| 33 | This driver implements support for Winbond W83793G/W83793R chips. | 38 | This driver implements support for Winbond W83793G/W83793R chips. |
| 34 | 39 | ||
| 35 | * Exported features | 40 | * Exported features |
| 36 | This driver exports 10 voltage sensors, up to 12 fan tachometer inputs, | 41 | This driver exports 10 voltage sensors, up to 12 fan tachometer inputs, |
| 37 | 6 remote temperatures, up to 8 sets of PWM fan controls, SmartFan | 42 | 6 remote temperatures, up to 8 sets of PWM fan controls, SmartFan |
| 38 | (automatic fan speed control) on all temperature/PWM combinations, 2 | 43 | (automatic fan speed control) on all temperature/PWM combinations, 2 |
| 39 | sets of 6-pin CPU VID input. | 44 | sets of 6-pin CPU VID input. |
| 40 | 45 | ||
| 41 | * Sensor resolutions | 46 | * Sensor resolutions |
| 42 | If your motherboard maker used the reference design, the resolution of | 47 | If your motherboard maker used the reference design, the resolution of |
| 43 | voltage0-2 is 2mV, resolution of voltage3/4/5 is 16mV, 8mV for voltage6, | 48 | voltage0-2 is 2mV, resolution of voltage3/4/5 is 16mV, 8mV for voltage6, |
| 44 | 24mV for voltage7/8. Temp1-4 have a 0.25 degree Celsius resolution, | 49 | 24mV for voltage7/8. Temp1-4 have a 0.25 degree Celsius resolution, |
| 45 | temp5-6 have a 1 degree Celsiis resolution. | 50 | temp5-6 have a 1 degree Celsiis resolution. |
| 46 | 51 | ||
| 47 | * Temperature sensor types | 52 | * Temperature sensor types |
| 48 | Temp1-4 have 2 possible types. It can be read from (and written to) | 53 | Temp1-4 have 2 possible types. It can be read from (and written to) |
| 49 | temp[1-4]_type. | 54 | temp[1-4]_type. |
| 50 | - If the value is 3, it starts monitoring using a remote termal diode | 55 | |
| 51 | (default). | 56 | - If the value is 3, it starts monitoring using a remote termal diode |
| 52 | - If the value is 6, it starts monitoring using the temperature sensor | 57 | (default). |
| 53 | in Intel CPU and get result by PECI. | 58 | - If the value is 6, it starts monitoring using the temperature sensor |
| 54 | Temp5-6 can be connected to external thermistors (value of | 59 | in Intel CPU and get result by PECI. |
| 55 | temp[5-6]_type is 4). | 60 | |
| 61 | Temp5-6 can be connected to external thermistors (value of | ||
| 62 | temp[5-6]_type is 4). | ||
| 56 | 63 | ||
| 57 | * Alarm mechanism | 64 | * Alarm mechanism |
| 58 | For voltage sensors, an alarm triggers if the measured value is below | 65 | For voltage sensors, an alarm triggers if the measured value is below |
| 59 | the low voltage limit or over the high voltage limit. | 66 | the low voltage limit or over the high voltage limit. |
| 60 | For temperature sensors, an alarm triggers if the measured value goes | 67 | For temperature sensors, an alarm triggers if the measured value goes |
| 61 | above the high temperature limit, and wears off only after the measured | 68 | above the high temperature limit, and wears off only after the measured |
| 62 | value drops below the hysteresis value. | 69 | value drops below the hysteresis value. |
| 63 | For fan sensors, an alarm triggers if the measured value is below the | 70 | For fan sensors, an alarm triggers if the measured value is below the |
| 64 | low speed limit. | 71 | low speed limit. |
| 65 | 72 | ||
| 66 | * SmartFan/PWM control | 73 | * SmartFan/PWM control |
| 67 | If you want to set a pwm fan to manual mode, you just need to make sure it | 74 | If you want to set a pwm fan to manual mode, you just need to make sure it |
| 68 | is not controlled by any temp channel, for example, you want to set fan1 | 75 | is not controlled by any temp channel, for example, you want to set fan1 |
| 69 | to manual mode, you need to check the value of temp[1-6]_fan_map, make | 76 | to manual mode, you need to check the value of temp[1-6]_fan_map, make |
| 70 | sure bit 0 is cleared in the 6 values. And then set the pwm1 value to | 77 | sure bit 0 is cleared in the 6 values. And then set the pwm1 value to |
| 71 | control the fan. | 78 | control the fan. |
| 72 | 79 | ||
| 73 | Each temperature channel can control all the 8 PWM outputs (by setting the | 80 | Each temperature channel can control all the 8 PWM outputs (by setting the |
| 74 | corresponding bit in tempX_fan_map), you can set the temperature channel | 81 | corresponding bit in tempX_fan_map), you can set the temperature channel |
| 75 | mode using temp[1-6]_pwm_enable, 2 is Thermal Cruise mode and 3 | 82 | mode using temp[1-6]_pwm_enable, 2 is Thermal Cruise mode and 3 |
| 76 | is the SmartFanII mode. Temperature channels will try to speed up or | 83 | is the SmartFanII mode. Temperature channels will try to speed up or |
| 77 | slow down all controlled fans, this means one fan can receive different | 84 | slow down all controlled fans, this means one fan can receive different |
| 78 | PWM value requests from different temperature channels, but the chip | 85 | PWM value requests from different temperature channels, but the chip |
| 79 | will always pick the safest (max) PWM value for each fan. | 86 | will always pick the safest (max) PWM value for each fan. |
| 80 | 87 | ||
| 81 | In Thermal Cruise mode, the chip attempts to keep the temperature at a | 88 | In Thermal Cruise mode, the chip attempts to keep the temperature at a |
| 82 | predefined value, within a tolerance margin. So if tempX_input > | 89 | predefined value, within a tolerance margin. So if tempX_input > |
| 83 | thermal_cruiseX + toleranceX, the chip will increase the PWM value, | 90 | thermal_cruiseX + toleranceX, the chip will increase the PWM value, |
| 84 | if tempX_input < thermal_cruiseX - toleranceX, the chip will decrease | 91 | if tempX_input < thermal_cruiseX - toleranceX, the chip will decrease |
| 85 | the PWM value. If the temperature is within the tolerance range, the PWM | 92 | the PWM value. If the temperature is within the tolerance range, the PWM |
| 86 | value is left unchanged. | 93 | value is left unchanged. |
| 87 | 94 | ||
| 88 | SmartFanII works differently, you have to define up to 7 PWM, temperature | 95 | SmartFanII works differently, you have to define up to 7 PWM, temperature |
| 89 | trip points, defining a PWM/temperature curve which the chip will follow. | 96 | trip points, defining a PWM/temperature curve which the chip will follow. |
| 90 | While not fundamentally different from the Thermal Cruise mode, the | 97 | While not fundamentally different from the Thermal Cruise mode, the |
| 91 | implementation is quite different, giving you a finer-grained control. | 98 | implementation is quite different, giving you a finer-grained control. |
| 92 | 99 | ||
| 93 | * Chassis | 100 | * Chassis |
| 94 | If the case open alarm triggers, it will stay in this state unless cleared | 101 | If the case open alarm triggers, it will stay in this state unless cleared |
| 95 | by writing 0 to the sysfs file "intrusion0_alarm". | 102 | by writing 0 to the sysfs file "intrusion0_alarm". |
| 96 | 103 | ||
| 97 | * VID and VRM | 104 | * VID and VRM |
| 98 | The VRM version is detected automatically, don't modify the it unless you | 105 | The VRM version is detected automatically, don't modify the it unless you |
| 99 | *do* know the cpu VRM version and it's not properly detected. | 106 | *do* know the cpu VRM version and it's not properly detected. |
| 100 | 107 | ||
| 101 | 108 | ||
| 102 | Notes | 109 | Notes |
