hwmon: (k10temp) add support for AMD Family 12h/14h CPUs
Clemens Ladisch
maintainerPATCH 1/1 hwmon: (k10temp) add support for AMD Family 12h/14h CPUs
Add the PCI ID to support the internal temperature sensor of the AMD "Llano" and "Brazos" processor families.
--- Documentation/hwmon/k10temp | 8 +++++++- drivers/hwmon/Kconfig | 6 +++--- drivers/hwmon/k10temp.c | 5 +++-- 3 files changed, 13 insertions(+), 6 deletions(-)
Documentation/hwmon/k10temp +7 -1
@@ -9,6 +9,8 @@ Supported chips: Socket S1G3: Athlon II, Sempron, Turion II * AMD Family 11h processors: Socket S1G2: Athlon (X2), Sempron (X2), Turion X2 (Ultra) +* AMD Family 12h processors: "Llano" +* AMD Family 14h processors: "Brazos" (C/E/G-Series) Prefix: 'k10temp' Addresses scanned: PCI space
@@ -17,10 +19,14 @@ Supported chips: http://support.amd.com/us/Processor_TechDocs/31116.pdf BIOS and Kernel Developer's Guide (BKDG) for AMD Family 11h Processors: http://support.amd.com/us/Processor_TechDocs/41256.pdf + BIOS and Kernel Developer's Guide (BKDG) for AMD Family 14h Models 00h-0Fh Processors: + http://support.amd.com/us/Processor_TechDocs/43170.pdf Revision Guide for AMD Family 10h Processors: http://support.amd.com/us/Processor_TechDocs/41322.pdf Revision Guide for AMD Family 11h Processors: http://support.amd.com/us/Processor_TechDocs/41788.pdf + Revision Guide for AMD Family 14h Models 00h-0Fh Processors: + http://support.amd.com/us/Processor_TechDocs/47534.pdf AMD Family 11h Processor Power and Thermal Data Sheet for Notebooks: http://support.amd.com/us/Processor_TechDocs/43373.pdf AMD Family 10h Server and Workstation Processor Power and Thermal Data Sheet:
@@ -34,7 +40,7 @@ Description ----------- This driver permits reading of the internal temperature sensor of AMD -Family 10h and 11h processors. +Family 10h/11h/12h/14h processors. All these processors have a sensor, but on those for Socket F or AM2+, the sensor may return inconsistent values (erratum 319). The driver
drivers/hwmon/Kconfig +3 -3
@@ -238,13 +238,13 @@ config SENSORS_K8TEMP will be called k8temp. config SENSORS_K10TEMP - tristate "AMD Phenom/Sempron/Turion/Opteron temperature sensor" + tristate "AMD Family 10h/11h/12h/14h temperature sensor" depends on X86 && PCI help If you say yes here you get support for the temperature sensor(s) inside your CPU. Supported are later revisions of - the AMD Family 10h and all revisions of the AMD Family 11h - microarchitectures. + the AMD Family 10h and all revisions of the AMD Family 11h, + 12h (Llano), and 14h (Brazos) microarchitectures. This driver can also be built as a module. If so, the module will be called k10temp.
drivers/hwmon/k10temp.c +3 -2
@@ -1,5 +1,5 @@/* -* k10temp.c - AMD Family 10h/11h processor hardware monitoring +* k10temp.c - AMD Family 10h/11h/12h/14h processor hardware monitoring * * Copyright (c) 2009 Clemens Ladisch <[email protected]> *
@@ -25,7 +25,7 @@#include <linux/pci.h> #include <asm/processor.h> -MODULE_DESCRIPTION ("AMD Family 10h/11h CPU core temperature monitor" ); +MODULE_DESCRIPTION ("AMD Family 10h/11h/12h/14h CPU core temperature monitor" );MODULE_AUTHOR ("Clemens Ladisch <[email protected]>" );MODULE_LICENSE ("GPL" );
@@ -208,6 +208,7 @@ static void __devexit k10temp_remove(strstatic const struct pci_device_id k10temp_id_table[] = { {PCI_VDEVICE (AMD ,PCI_DEVICE_ID_AMD_10H_NB_MISC ) }, {PCI_VDEVICE (AMD ,PCI_DEVICE_ID_AMD_11H_NB_MISC ) }, + {PCI_VDEVICE (AMD ,PCI_DEVICE_ID_AMD_CNB17H_F3 ) }, {} };MODULE_DEVICE_TABLE (pci, k10temp_id_table);
Guenter Roeck
AppliedQuoted 4 lines · Clemens Ladisch
Add the PCI ID to support the internal temperature sensor of the AMD "Llano" and "Brazos" processor families.
Signed-off-by Clemens Ladisch <[email protected]>
Applied, thanks.
Since it meets the requirements for a stable patch, I applied it to the patch list for 2.6.38 and added Cc: [email protected].
Guenter
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Quoted 10 lines · Guenter Roeck
Quoted 4 lines · Clemens Ladisch
Add the PCI ID to support the internal temperature sensor of the AMD "Llano" and "Brazos" processor families.
Signed-off-by Clemens Ladisch <[email protected]>Applied, thanks.
Since it meets the requirements for a stable patch, I applied it to the patch list for 2.6.38 and added Cc: [email protected].
Can we have a sensors-detect patch too?
Thanks,
Signature · 6 lines
Jean Delvare _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Quoted 5 lines · Jean Delvare
Quoted 4 lines · Guenter Roeck
Quoted 3 lines · Clemens Ladisch
Add the PCI ID to support the internal temperature sensor of the AMD "Llano" and "Brazos" processor families.
Quoted 9 lines
Quoted 6 lines
Quoted 1 line
Signed-off-by Clemens Ladisch <[email protected]>Applied, thanks.
Since it meets the requirements for a stable patch, I applied it to the patch list for 2.6.38 and added Cc: [email protected].
Can we have a sensors-detect patch too?
Prepared that, but I am getting the following from the ddr3 patch.
prog/detect/sensors-detect
Useless use of private variable in void context at prog/detect/sensors-detect line 5287.
Code is
} elsif ($device_type => 9 && $device_type <= 11) {Should that be
} elsif ($device_type >= 9 && $device_type <= 11) {instead ?
Odd, I didn't notice that before when I tried the ddr3 patch.
Guenter
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Quoted 20 lines · Guenter Roeck
Quoted 5 lines · Jean Delvare
Quoted 4 lines · Guenter Roeck
Quoted 3 lines · Clemens Ladisch
Add the PCI ID to support the internal temperature sensor of the AMD "Llano" and "Brazos" processor families.
Quoted 9 lines
Quoted 6 lines
Quoted 1 line
Signed-off-by Clemens Ladisch <[email protected]>Applied, thanks.
Since it meets the requirements for a stable patch, I applied it to the patch list for 2.6.38 and added Cc: [email protected].
Can we have a sensors-detect patch too?
Prepared that, but I am getting the following from the ddr3 patch.
prog/detect/sensors-detect
Useless use of private variable in void context at prog/detect/sensors-detect line 5287.
Quoted 6 lines
Code is
} elsif ($device_type => 9 && $device_type <= 11) {Should that be
} elsif ($device_type >= 9 && $device_type <= 11) {instead ?
Yes, you're totally right.
Quoted 1 line
Odd, I didn't notice that before when I tried the ddr3 patch.
This is the part I modified from Clemens' original patch. What's really odd is that I didn't notice the warning on my end. I see it now... Sorry, I've just fixed it.
Signature · 6 lines
Jean Delvare _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors