2018-03-30 01:12:01

by David Wang

Subject: [PATCH v3] hwmon, via-cputem: support new centaur CPUs

New centaur CPUs(Familiy == 7) also support this cpu temperature sensor.

Change from v2 to v3:
*replace "goto" with "if...else.." according to suggestion from Guenter

Change from v1 to v2:
*fixed the wrong if condition in patch v1.

Signed-off-by: David Wang <[email protected]>
---
drivers/hwmon/via-cputemp.c | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)

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

- switch (c->x86_model) {
- case 0xA:
- /* C7 A */
- case 0xD:
- /* C7 D */
- data->msr_temp = 0x1169;
- data->msr_vid = 0x198;
- break;
- case 0xF:
- /* Nano */
+ if (c->x86 == 7) {
data->msr_temp = 0x1423;
- break;
- default:
- return -ENODEV;
+ } else {
+ switch (c->x86_model) {
+ case 0xA:
+ /* C7 A */
+ case 0xD:
+ /* C7 D */
+ data->msr_temp = 0x1169;
+ data->msr_vid = 0x198;
+ break;
+ case 0xF:
+ /* Nano */
+ data->msr_temp = 0x1423;
+ break;
+ default:
+ return -ENODEV;
+ }
}

/* test if we can access the TEMPERATURE MSR */
@@ -283,6 +287,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

2018-03-30 15:20:50

by Guenter Roeck

Subject: Re: [v3] hwmon, via-cputem: support new centaur CPUs

On Fri, Mar 30, 2018 at 09:04:48AM +0800, davidwang wrote:
> New centaur CPUs(Familiy == 7) also support this cpu temperature sensor.
>
> Change from v2 to v3:
> *replace "goto" with "if...else.." according to suggestion from Guenter
>
> Change from v1 to v2:
> *fixed the wrong if condition in patch v1.
>
> Signed-off-by: David Wang <[email protected]>

Applied to hwmon-next.

Thanks,
Guenter

> ---
> drivers/hwmon/via-cputemp.c | 31 ++++++++++++++++++-------------
> 1 file changed, 18 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
> index 07a0cb0..0e81f28 100644
> --- a/drivers/hwmon/via-cputemp.c
> +++ b/drivers/hwmon/via-cputemp.c
> @@ -136,20 +136,24 @@ static int via_cputemp_probe(struct platform_device *pdev)
> data->id = pdev->id;
> data->name = "via_cputemp";
>
> - switch (c->x86_model) {
> - case 0xA:
> - /* C7 A */
> - case 0xD:
> - /* C7 D */
> - data->msr_temp = 0x1169;
> - data->msr_vid = 0x198;
> - break;
> - case 0xF:
> - /* Nano */
> + if (c->x86 == 7) {
> data->msr_temp = 0x1423;
> - break;
> - default:
> - return -ENODEV;
> + } else {
> + switch (c->x86_model) {
> + case 0xA:
> + /* C7 A */
> + case 0xD:
> + /* C7 D */
> + data->msr_temp = 0x1169;
> + data->msr_vid = 0x198;
> + break;
> + case 0xF:
> + /* Nano */
> + data->msr_temp = 0x1423;
> + break;
> + default:
> + return -ENODEV;
> + }
> }
>
> /* test if we can access the TEMPERATURE MSR */
> @@ -283,6 +287,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);