[PATCH] hwmon, via-cputemp: support new centaur CPUs

[PATCH] hwmon, via-cputemp: support new centaur CPUs

[David Wang]

Signed-off-by: David Wang <davidwang@zhaoxin.com>
---
 drivers/hwmon/via-cputemp.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
index 07a0cb0..aa0d040 100644
--- a/drivers/hwmon/via-cputemp.c
+++ b/drivers/hwmon/via-cputemp.c
@@ -136,6 +136,11 @@ static int via_cputemp_probe(struct platform_device *pdev)
 	data->id = pdev->id;
 	data->name = "via_cputemp";
 
+	if (c->x86_model == 7) {
+		data->msr_temp = 0x1423;
+		goto test_access;
+	}
+
 	switch (c->x86_model) {
 	case 0xA:
 		/* C7 A */
@@ -152,6 +157,7 @@ static int via_cputemp_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
+test_access:
 	/* test if we can access the TEMPERATURE MSR */
 	err = rdmsr_safe_on_cpu(data->id, data->msr_temp, &eax, &edx);
 	if (err) {
@@ -283,6 +289,7 @@ static int via_cputemp_down_prep(unsigned int cpu)
 	{ X86_VENDOR_CENTAUR, 6, 0xa, }, /* C7 A */
 	{ X86_VENDOR_CENTAUR, 6, 0xd, }, /* C7 D */
 	{ X86_VENDOR_CENTAUR, 6, 0xf, }, /* Nano */
+	{ X86_VENDOR_CENTAUR, 7, X86_MODEL_ANY, },
 	{}
 };
 MODULE_DEVICE_TABLE(x86cpu, cputemp_ids);
-- 
1.9.1

答复: [PATCH] hwmon, via-cputemp: support new centaur CPUs

[Tim Guo(BJ-RD)]

+if (c->x86_model == 7) {
Should be:

+if(c->x86 == 7)

-----邮件原件-----
发件人: David Wang
发送时间: 2018年3月29日 14:18
收件人: jdelvare@suse.com; linux@roeck-us.net; tglx@linutronix.de; mingo@redhat.com; rafel.j.wysocki@intel.com; linux-hwmon@vger.kernel.org; linux-kernel@vger.kernel.org
抄送: Bruce Chang (VAS) <BruceChang@via-alliance.com>; Cooper Yan(BJ-RD) <CooperYan@zhaoxin.com>; Qiyuan Wang(BJ-RD) <QiyuanWang@zhaoxin.com>; Benjamin Pan <BenjaminPan@viatech.com>; Luke Lin <LukeLin@viacpu.com>; Tim Guo(BJ-RD) <TimGuo@zhaoxin.com>; David Wang <DavidWang@zhaoxin.com>
主题: [PATCH] hwmon, via-cputemp: support new centaur CPUs

Signed-off-by: David Wang <davidwang@zhaoxin.com>
---
 drivers/hwmon/via-cputemp.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c index 07a0cb0..aa0d040 100644
--- a/drivers/hwmon/via-cputemp.c
+++ b/drivers/hwmon/via-cputemp.c
@@ -136,6 +136,11 @@ static int via_cputemp_probe(struct platform_device *pdev)
 data->id = pdev->id;
 data->name = "via_cputemp";

+if (c->x86_model == 7) {
+data->msr_temp = 0x1423;
+goto test_access;
+}
+
 switch (c->x86_model) {
 case 0xA:
 /* C7 A */
@@ -152,6 +157,7 @@ static int via_cputemp_probe(struct platform_device *pdev)
 return -ENODEV;
 }

+test_access:
 /* test if we can access the TEMPERATURE MSR */
 err = rdmsr_safe_on_cpu(data->id, data->msr_temp, &eax, &edx);
 if (err) {
@@ -283,6 +289,7 @@ static int via_cputemp_down_prep(unsigned int cpu)
 { X86_VENDOR_CENTAUR, 6, 0xa, }, /* C7 A */
 { X86_VENDOR_CENTAUR, 6, 0xd, }, /* C7 D */
 { X86_VENDOR_CENTAUR, 6, 0xf, }, /* Nano */
+{ X86_VENDOR_CENTAUR, 7, X86_MODEL_ANY, },
 {}
 };
 MODULE_DEVICE_TABLE(x86cpu, cputemp_ids);
--
1.9.1



保密声明：
本邮件含有保密或专有信息，仅供指定收件人使用。严禁对本邮件或其内容做任何未经授权的查阅、使用、复制或转发。
CONFIDENTIAL NOTE:
This email contains confidential or legally privileged information and is for the sole use of its intended recipient. Any unauthorized review, use, copying or forwarding of this email or the content of this email is strictly prohibited.