浏览代码

hwmon: (coretemp) Add Penryn CPU to coretemp

This patch adds support for family 0x17, which has Penryn Core. It should also
cover the 8 cores Xeons.

Can someone test please? I think it should work.

Signed-off-by: Rudolf Marek <r.marek@assembler.cz>
Acked-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
Rudolf Marek 17 年之前
父节点
当前提交
ae770152c8
共有 2 个文件被更改,包括 4 次插入3 次删除
  1. 2 1
      Documentation/hwmon/coretemp
  2. 2 2
      drivers/hwmon/coretemp.c

+ 2 - 1
Documentation/hwmon/coretemp

@@ -4,9 +4,10 @@ Kernel driver coretemp
 Supported chips:
 Supported chips:
   * All Intel Core family
   * All Intel Core family
     Prefix: 'coretemp'
     Prefix: 'coretemp'
-    CPUID: family 0x6, models 0xe, 0xf, 0x16
+    CPUID: family 0x6, models 0xe, 0xf, 0x16, 0x17
     Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual
     Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual
                Volume 3A: System Programming Guide
                Volume 3A: System Programming Guide
+               http://softwarecommunity.intel.com/Wiki/Mobility/720.htm
 
 
 Author: Rudolf Marek
 Author: Rudolf Marek
 
 

+ 2 - 2
drivers/hwmon/coretemp.c

@@ -413,10 +413,10 @@ static int __init coretemp_init(void)
 	for_each_online_cpu(i) {
 	for_each_online_cpu(i) {
 		struct cpuinfo_x86 *c = &cpu_data(i);
 		struct cpuinfo_x86 *c = &cpu_data(i);
 
 
-		/* check if family 6, models e, f, 16 */
+		/* check if family 6, models 0xe, 0xf, 0x16, 0x17 */
 		if ((c->cpuid_level < 0) || (c->x86 != 0x6) ||
 		if ((c->cpuid_level < 0) || (c->x86 != 0x6) ||
 		    !((c->x86_model == 0xe) || (c->x86_model == 0xf) ||
 		    !((c->x86_model == 0xe) || (c->x86_model == 0xf) ||
-			(c->x86_model == 0x16))) {
+			(c->x86_model == 0x16) || (c->x86_model == 0x17))) {
 
 
 			/* supported CPU not found, but report the unknown
 			/* supported CPU not found, but report the unknown
 			   family 6 CPU */
 			   family 6 CPU */