linux-kernel - Re: [PATCH] hwmon: (k10temp) Support all Family 15h Model 6xh and Model 7xh processors

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <2b23f0d3-25cb-3bc2-949f-fdf1633d5245@ladisch.de>
Date:   Mon, 3 Sep 2018 19:38:18 +0200
From:   Clemens Ladisch <clemens@...isch.de>
To:     Guenter Roeck <linux@...ck-us.net>,
        Jean Delvare <jdelvare@...e.com>, linux-hwmon@...r.kernel.org
Cc:     linux-kernel@...r.kernel.org, Guglielmo Fanini <g.fanini@...il.com>
Subject: Re: [PATCH] hwmon: (k10temp) Support all Family 15h Model 6xh and
 Model 7xh processors

Guenter Roeck wrote:
> BIOS developer guides refer to Family 15h Models 60h-6fh and Family 15h
> Models 70h-7fh. So far the driver only checked for Modela 60h and 70h.
> However, there are now processors with other model numbers in the same
> family. Example is A10-9620P family 15h model 65h. Follow the developer
> guides and mask the lower 4 bit of the model number to determine the
> registers to use for reading temperatures and temperature limits.
>
> Reported-by: Guglielmo Fanini <g.fanini@...il.com>
> Cc: Guglielmo Fanini <g.fanini@...il.com>
> Signed-off-by: Guenter Roeck <linux@...ck-us.net>

Acked-by: Clemens Ladisch <clemens@...isch.de>

> ---
>  drivers/hwmon/k10temp.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
> index bb15d7816a29..2cef0c37ff6f 100644
> --- a/drivers/hwmon/k10temp.c
> +++ b/drivers/hwmon/k10temp.c
> @@ -325,8 +325,9 @@ static int k10temp_probe(struct pci_dev *pdev,
>
>  	data->pdev = pdev;
>
> -	if (boot_cpu_data.x86 == 0x15 && (boot_cpu_data.x86_model == 0x60 ||
> -					  boot_cpu_data.x86_model == 0x70)) {
> +	if (boot_cpu_data.x86 == 0x15 &&
> +	    ((boot_cpu_data.x86_model & 0xf0) == 0x60 ||
> +	     (boot_cpu_data.x86_model & 0xf0) == 0x70)) {
>  		data->read_htcreg = read_htcreg_nb_f15;
>  		data->read_tempreg = read_tempreg_nb_f15;
>  	} else if (boot_cpu_data.x86 == 0x17) {