From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932247Ab0ENGsu (ORCPT ); Fri, 14 May 2010 02:48:50 -0400 Received: from mga05.intel.com ([192.55.52.89]:65081 "EHLO fmsmga101.fm.intel.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932141Ab0ENGsq (ORCPT ); Fri, 14 May 2010 02:48:46 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.53,227,1272870000"; d="scan'208";a="567101477" Date: Fri, 14 May 2010 14:58:08 +0800 From: Huaxu Wan To: linux-kernel@vger.kernel.org, lm-sensors@lm-sensors.org Cc: huaxu.wan@intel.com, Valdis.Kletnieks@vt.edu, Henrique de Moraes Holschuh Subject: [PATCH 1/2 V3 minor change] hwmon: (coretemp) Detect the thermal sensors by CPUID Message-ID: <20100514065808.GA11598@owl> References: <20100507095459.GA12190@owl> <20100510033525.GC9181@owl> <20100511080112.GB19762@owl> <20100514032000.GB17786@khazad-dum.debian.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100514032000.GB17786@khazad-dum.debian.net> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The thermal sensors of Intel(R) CPUs can be detected by CPUID instruction, indicated by CPUID.06H.EAX[0]. Signed-off-by: Huaxu Wan Signed-off-by: Carsten Emde Reviewed-By: Valdis Kletnieks --- drivers/hwmon/coretemp.c | 34 +++++++++++++--------------------- 1 files changed, 13 insertions(+), 21 deletions(-) diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index e9b7fbc..885da2b 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c @@ -451,28 +451,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 0x%x\n", c->x86_model); - continue; - } - - err = coretemp_device_add(i); - if (err) - goto exit_devices_unreg; + } else { + printk(KERN_INFO DRVNAME ": CPU (model=0x%x)" + " has no thermal sensor.\n", c->x86_model); + } } if (list_empty(&pdev_list)) { err = -ENODEV; -- 1.6.3.3.363.g725cf7