[PATCH] UBUNTU: hwmon: (coretemp) Add Penryn CPU to coretemp OriginalAuthor: Rudolf Marek <r.marek at assembler.cz> Bug: #235119

Colin Ian King colin.king at canonical.com
Fri Sep 5 08:20:53 BST 2008


Cherry-pick of 2.6.25 commit ae770152c801f10a91e5e86597a39b5f9ccf2d0d
to detect the model 17 cpus (intel 45nms q9300/q9450/etc.). Quoting original
patch:

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

Signed-off-by: Rudolf Marek <r.marek at assembler.cz>
Acked-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
Signed-off-by: Colin Ian King <colin.king at canonical.com>
---
 Documentation/hwmon/coretemp |    3 ++-
 drivers/hwmon/coretemp.c     |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Documentation/hwmon/coretemp b/Documentation/hwmon/coretemp
index 170bf86..c7b56b2 100644
--- a/Documentation/hwmon/coretemp
+++ b/Documentation/hwmon/coretemp
@@ -4,9 +4,10 @@ Kernel driver coretemp
 Supported chips:
   * All Intel Core family
     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
                Volume 3A: System Programming Guide
+               http://softwarecommunity.intel.com/Wiki/Mobility/720.htm
 
 Author: Rudolf Marek
 
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index 3ee60d2..d45cfba 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -368,10 +368,10 @@ static int __init coretemp_init(void)
 	for_each_online_cpu(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) ||
 		    !((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
 			   family 6 CPU */
-- 
1.5.6.3


--=-/71KoNyxCsxWgxZFlOvC--




More information about the kernel-team mailing list