linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] hwmon: (coretemp) Detect the thermal sensors by CPUID
@ 2010-05-07  9:54 Huaxu Wan
  2010-05-07 12:43 ` Jean Delvare
                   ` (2 more replies)
  0 siblings, 3 replies; 34+ messages in thread
From: Huaxu Wan @ 2010-05-07  9:54 UTC (permalink / raw)
  To: linux-kernel, lm-sensors; +Cc: huaxu.wan, khali


The thermal sensors of Intel(R) CPUs can be detected by CPUID instruction,
indicated by CPUID.06H.EAX[0].

Signed-off-by: Huaxu Wan <huaxu.wan@linux.intel.com>
---
 drivers/hwmon/coretemp.c |   24 +++++++-----------------
 1 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index e9b7fbc..237c68d 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -440,6 +440,7 @@ static int __init coretemp_init(void)
 {
        int i, err = -ENODEV;
        struct pdev_entry *p, *n;
+       u32 eax;

        /* quick check if we run Intel */
        if (cpu_data(0).x86_vendor != X86_VENDOR_INTEL)
@@ -450,23 +451,12 @@ static int __init coretemp_init(void)
                goto exit;

        for_each_online_cpu(i) {
-               struct cpuinfo_x86 *c = &cpu_data(i);
-
-               /* 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);
+               /* check if the CPU has thermal sensor */
+               eax = cpuid_eax(0x06);
+               if (!(eax & 0x01)) {
+                       struct cpuinfo_x86 *c = &cpu_data(i);
+                       printk_once(KERN_WARNING DRVNAME ": CPU (model=0x%x)"
+                               " has no thermal sensor!\n", c->x86_model);
                        continue;
                }

--
1.6.3.3.363.g725cf7

^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [PATCH 2/2] hwmon: (coretemp) Get TjMax value from MSR
@ 2010-05-07  9:59 Huaxu Wan
  2010-05-07 13:29 ` [lm-sensors] " Carsten Emde
                   ` (2 more replies)
  0 siblings, 3 replies; 34+ messages in thread
From: Huaxu Wan @ 2010-05-07  9:59 UTC (permalink / raw)
  To: linux-kernel, lm-sensors; +Cc: huaxu.wan, khali


The MSR IA32_TEMPERATURE_TARGET contains the TjMax value in the newer
processers.

Signed-off-by: Huaxu Wan <huaxu.wan@linux.intel.com>
---
 drivers/hwmon/coretemp.c |   45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 44 insertions(+), 1 deletions(-)

diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index 237c68d..7a01032 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -241,6 +241,49 @@ static int __devinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *
        return tjmax;
 }

+static int __devinit get_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
+{
+       /* The 100C is default for both mobile and non mobile CPUs */
+       int err;
+       u32 eax, edx;
+       u32 val;
+
+       /* A new feature of current Intel(R) processors, the
+          IA32_TEMPERATURE_TARGET(0x1a2) contains the TjMax value */
+       err = rdmsr_safe_on_cpu(id, 0x1a2, &eax, &edx);
+       if (err){
+               printk_once(KERN_WARNING DRVNAME  " : Unable to read TjMax from CPU.\n");
+       } else {
+               val = (eax >> 16 ) & 0xff;
+               /* If the TjMax is not reasonable, an assumption value
+                  will be used */
+               if (( val > 80) && (val < 120)){
+                       printk_once(KERN_INFO DRVNAME " : The TjMax is %d C. \n", val);
+                       return val * 1000;
+               }
+       }
+
+       /* For the early CPUs, an approximation is given.
+        NOTE: the given value may not be correct. */
+       switch(c->x86_model){
+       case 0xe :
+       case 0xf :
+       case 0x16 :
+       case 0x1a :
+               printk_once(KERN_WARNING DRVNAME  " : TjMax is assumed as 100 C! \n");
+               return 100000;
+               break;
+       case 0x17 :
+       case 0x1c :             /* Atom CPUs */
+               return adjust_tjmax(c, id, dev);
+               break;
+       default :
+               printk_once(KERN_WARNING DRVNAME " : Your CPU is not support yet,"
+                       "using the default TjMax: 100 C.\n");
+               return 100000;
+       }
+}
+
 static int __devinit coretemp_probe(struct platform_device *pdev)
 {
        struct coretemp_data *data;
@@ -283,7 +326,7 @@ static int __devinit coretemp_probe(struct platform_device *pdev)
                }
        }

-       data->tjmax = adjust_tjmax(c, data->id, &pdev->dev);
+       data->tjmax = get_tjmax(c, data->id, &pdev->dev);
        platform_set_drvdata(pdev, data);

        /* read the still undocumented IA32_TEMPERATURE_TARGET it exists
--
1.6.3.3.363.g725cf7

^ permalink raw reply related	[flat|nested] 34+ messages in thread

end of thread, other threads:[~2010-08-31 21:10 UTC | newest]

Thread overview: 34+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-07  9:54 [PATCH 1/2] hwmon: (coretemp) Detect the thermal sensors by CPUID Huaxu Wan
2010-05-07 12:43 ` Jean Delvare
2010-05-07 13:21 ` [lm-sensors] " Carsten Emde
2010-05-10  2:35   ` Huaxu Wan
2010-05-10  3:35 ` [PATCH 1/2 V2] " Huaxu Wan
2010-05-10 12:45   ` Valdis.Kletnieks
2010-05-11  3:41     ` Huaxu Wan
2010-05-11  8:01   ` [PATCH 1/2 V3] " Huaxu Wan
2010-05-11 21:45     ` Valdis.Kletnieks
2010-05-14  3:20     ` [lm-sensors] " Henrique de Moraes Holschuh
2010-05-14  6:58       ` [PATCH 1/2 V3 minor change] " Huaxu Wan
2010-05-17  9:41         ` [PATCH 0/2] hwmon: Update coretemp to current Intel processors Carsten Emde
2010-05-17  9:41           ` [PATCH 1/2] Detect the thermal sensors by CPUID Carsten Emde
2010-05-17  9:41           ` [PATCH 2/2] Get TjMax value from MSR Carsten Emde
     [not found]           ` <AANLkTinQlH7LhCAz00WaHqbbslcSqipzVx4tDoQKSqIL@mail.gmail.com>
2010-05-18  7:01             ` [lm-sensors] [PATCH 0/2] hwmon: Update coretemp to current Intel processors Carsten Emde
2010-05-18 12:03               ` Dmitry Gromov
2010-05-19  1:27               ` Huaxu Wan
     [not found]             ` <625BA99ED14B2D499DC4E29D8138F150181F574C31@shsmsx502.ccr.corp.intel.com>
     [not found]               ` <AANLkTimQnaUvXs75rpTOcW7CODXWgUfzekY9FCDa5S8P@mail.gmail.com>
2010-05-18  7:13                 ` Carsten Emde
2010-05-19  0:50                 ` Huaxu Wan
2010-05-19  3:12                   ` Dmitry Gromov
  -- strict thread matches above, loose matches on Subject: below --
2010-05-07  9:59 [PATCH 2/2] hwmon: (coretemp) Get TjMax value from MSR Huaxu Wan
2010-05-07 13:29 ` [lm-sensors] " Carsten Emde
2010-05-10  3:09   ` Huaxu Wan
2010-05-10  3:50 ` [PATCH 2/2 V2] " Huaxu Wan
2010-05-29  5:39 ` [PATCH 2/2] " Maxim Levitsky
2010-05-30 14:43   ` Maxim Levitsky
2010-05-31  1:39   ` Huaxu Wan
2010-06-02 16:34     ` Maxim Levitsky
2010-06-02 20:10       ` Maxim Levitsky
2010-06-12 13:03         ` Maxim Levitsky
2010-06-13  2:27           ` Wan, Huaxu
2010-07-26  8:16             ` Maxim Levitsky
2010-08-30  1:42               ` Huaxu Wan
2010-08-31 21:01                 ` Fenghua Yu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).