Source: linux-2.6
Version: 2.6.32-43
Tags: upstream patch moreinfo
Severity: important
Justification: hardware support
Hi,
Trying to load coretemp with "modprobe coretemp", I get
FATAL: Error inserting coretemp
(/lib/modules/2.6.32-5-amd64/kernel/drivers/hwmon/coretemp.ko): No such device
The kernel log says
coretemp: Unknown CPU model 2f
This is with a newish Intel Xeon processor. I suspect the attached
patch (applied upstream during the 2.6.35 merge window) will fix it,
though I haven't checked yet. If you have any questions, feel free to
ask.
(Filing so it's not forgetten. Once this is tested I'll be happy to
pass it upstream.)
Thanks,
Jonathan
From: Carsten Emde <[email protected]>
Date: Mon, 24 May 2010 14:33:39 -0700
Subject: drivers/hwmon/coretemp.c: detect the thermal sensors by CPUID
commit 5db47b009d17d69a2f8d84357e7b24c3e3c2edec upstream.
The thermal sensors of Intel(R) CPUs can be detected by CPUID instruction,
indicated by CPUID.06H.EAX[0].
Signed-off-by: Huaxu Wan <[email protected]>
Signed-off-by: Carsten Emde <[email protected]>
Reviewed-by: Valdis Kletnieks <[email protected]>
Cc: Jean Delvare <[email protected]>
Cc: Henrique de Moraes Holschuh <[email protected]>
Cc: Yong Wang <[email protected]>
Cc: Rudolf Marek <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Signed-off-by: Jonathan Nieder <[email protected]>
---
drivers/hwmon/coretemp.c | 32 ++++++++++++--------------------
1 file changed, 12 insertions(+), 20 deletions(-)
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index 585219167fa7..3ab9a223eb53 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -479,28 +479,20 @@ static int __init coretemp_init(void)
for_each_online_cpu(i) {
struct cpuinfo_x86 *c = &cpu_data(i);
+ /*
+ * CPUID.06H.EAX[0] indicates whether the CPU has thermal
+ * sensors. We check this bit only, all the early CPUs
+ * without thermal sensors will be filtered out.
+ */
+ if (c->cpuid_level >= 6 && (cpuid_eax(0x06) & 0x01)) {
+ err = coretemp_device_add(i);
+ if (err)
+ goto exit_devices_unreg;
- /* check if family 6, models 0xe (Pentium M DC),
- 0xf (Core 2 DC 65nm), 0x16 (Core 2 SC 65nm),
- 0x17 (Penryn 45nm), 0x1a (Nehalem), 0x1c (Atom),
- 0x1e (Lynnfield) */
- if ((c->cpuid_level < 0) || (c->x86 != 0x6) ||
- !((c->x86_model == 0xe) || (c->x86_model == 0xf) ||
- (c->x86_model == 0x16) || (c->x86_model == 0x17) ||
- (c->x86_model == 0x1a) || (c->x86_model == 0x1c) ||
- (c->x86_model == 0x1e))) {
-
- /* supported CPU not found, but report the unknown
- family 6 CPU */
- if ((c->x86 == 0x6) && (c->x86_model > 0xf))
- printk(KERN_WARNING DRVNAME ": Unknown CPU "
- "model %x\n", c->x86_model);
- continue;
+ } else {
+ printk(KERN_INFO DRVNAME ": CPU (model=0x%x)"
+ " has no thermal sensor.\n", c->x86_model);
}
-
- err = coretemp_device_add(i);
- if (err)
- goto exit_devices_unreg;
}
if (list_empty(&pdev_list)) {
err = -ENODEV;
--
1.7.10
