60 lines
1.7 KiB
Diff
60 lines
1.7 KiB
Diff
From: Andi Kleen <ak@linux.intel.com>
|
|
Date: Thu, 26 Jan 2012 00:09:10 +0100
|
|
Subject: HWMON: Convert coretemp to x86 cpuid autoprobing
|
|
|
|
commit 9b38096fde5f9b93c3657911c3be7892cc155cbd upstream.
|
|
|
|
Use the new x86 cpuid autoprobe interface for the Intel coretemp
|
|
driver.
|
|
|
|
Cc: Fenghua Yu <fenghua.yu@intel.com>
|
|
Cc: Jean Delvare <khali@linux-fr.org>
|
|
Cc: Guenter Roeck <guenter.roeck@ericsson.com>
|
|
Signed-off-by: Andi Kleen <ak@linux.intel.com>
|
|
Signed-off-by: Thomas Renninger <trenn@suse.de>
|
|
Acked-by: H. Peter Anvin <hpa@zytor.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
|
---
|
|
drivers/hwmon/coretemp.c | 17 ++++++++++++++---
|
|
1 file changed, 14 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
|
|
index a6c6ec3..249ac46 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"
|
|
|
|
@@ -759,13 +760,23 @@ static struct notifier_block coretemp_cpu_notifier __refdata = {
|
|
.notifier_call = coretemp_cpu_callback,
|
|
};
|
|
|
|
+static const 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;
|
|
|
|
err = platform_driver_register(&coretemp_driver);
|
|
if (err)
|