lkml.org 
[lkml]   [2011]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 06/10] HWMON: Convert coretemp to x86 cpuid autoprobing
Andi,

On Wed, Dec 07, 2011 at 07:41:19PM -0500, Andi Kleen wrote:
> From: Andi Kleen <ak@linux.intel.com>
>
> Use the new x86 cpuid autoprobe interface for the Intel coretemp
> driver.
>
> Cc: fenghua.yu@intel.com
> Cc: khali@linux-fr.org
> Cc: guenter.roeck@ericsson.com
> Signed-off-by: Andi Kleen <ak@linux.intel.com>
> ---
> drivers/hwmon/coretemp.c | 17 ++++++++++++++---
> 1 files changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
> index 104b376..5de1579 100644
> --- a/drivers/hwmon/coretemp.c
> +++ b/drivers/hwmon/coretemp.c
> @@ -39,6 +39,7 @@
> #include <linux/moduleparam.h>
> #include <asm/msr.h>
> #include <asm/processor.h>
> +#include <asm/cpu_device_id.h>
>
> #define DRVNAME "coretemp"
>
> @@ -756,13 +757,23 @@ static struct notifier_block coretemp_cpu_notifier __refdata = {
> .notifier_call = coretemp_cpu_callback,
> };
>
> +static struct x86_cpu_id coretemp_ids[] = {
> + { X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_DTS },
> + {}
> +};
> +MODULE_DEVICE_TABLE(x86cpu, coretemp_ids);
> +
> static int __init coretemp_init(void)
> {
> int i, err = -ENODEV;
>
> - /* quick check if we run Intel */
> - if (cpu_data(0).x86_vendor != X86_VENDOR_INTEL)
> - goto exit;
> + /*
> + * 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 (!x86_match_cpu(coretemp_ids))
> + return -ENODEV;
>

X86_FEATURE_DTS is checked elsewhere in the driver, in function get_core_online().
Can that check be removed ?

Guenter

> err = platform_driver_register(&coretemp_driver);
> if (err)
> --
> 1.7.4.4
>


\
 
 \ /
  Last update: 2011-12-08 03:51    [W:0.253 / U:0.212 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site