|
Jean Delvare |
804e6d |
From: Mario Limonciello <mario.limonciello@amd.com>
|
|
Jean Delvare |
804e6d |
Date: Thu, 26 Aug 2021 13:40:56 -0500
|
|
Jean Delvare |
804e6d |
Subject: hwmon: (k10temp) Don't show Tdie for all Zen/Zen2/Zen3 CPU/APU
|
|
Jean Delvare |
804e6d |
Git-commit: 02a2484cf8d17a2acf3b9b151147bafaa55ad38c
|
|
Jean Delvare |
804e6d |
Patch-mainline: v5.15
|
|
Jean Delvare |
804e6d |
References: jsc#SLE-17823 jsc#SLE-23139 jsc#ECO-3666
|
|
Jean Delvare |
804e6d |
|
|
Jean Delvare |
804e6d |
Tdie is an offset calculation that should only be shown when temp_offset
|
|
Jean Delvare |
804e6d |
is actually put into a table. This is useless to show for all CPU/APU.
|
|
Jean Delvare |
804e6d |
Show it only when necessary.
|
|
Jean Delvare |
804e6d |
|
|
Jean Delvare |
804e6d |
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
|
|
Jean Delvare |
804e6d |
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
|
|
Jean Delvare |
804e6d |
Acked-by: Jean Delvare <jdelvare@suse.de>
|
|
Jean Delvare |
804e6d |
---
|
|
Jean Delvare |
804e6d |
drivers/hwmon/k10temp.c | 3 +--
|
|
Jean Delvare |
804e6d |
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
Jean Delvare |
804e6d |
|
|
Jean Delvare |
804e6d |
--- a/drivers/hwmon/k10temp.c
|
|
Jean Delvare |
804e6d |
+++ b/drivers/hwmon/k10temp.c
|
|
Jean Delvare |
804e6d |
@@ -426,7 +426,6 @@ static int k10temp_probe(struct pci_dev
|
|
Jean Delvare |
804e6d |
} else if (boot_cpu_data.x86 == 0x17 || boot_cpu_data.x86 == 0x18) {
|
|
Jean Delvare |
804e6d |
data->temp_adjust_mask = ZEN_CUR_TEMP_RANGE_SEL_MASK;
|
|
Jean Delvare |
804e6d |
data->read_tempreg = read_tempreg_nb_zen;
|
|
Jean Delvare |
804e6d |
- data->show_temp |= BIT(TDIE_BIT); /* show Tdie */
|
|
Jean Delvare |
804e6d |
data->is_zen = true;
|
|
Jean Delvare |
804e6d |
|
|
Jean Delvare |
804e6d |
switch (boot_cpu_data.x86_model) {
|
|
Jean Delvare |
804e6d |
@@ -446,7 +445,6 @@ static int k10temp_probe(struct pci_dev
|
|
Jean Delvare |
804e6d |
} else if (boot_cpu_data.x86 == 0x19) {
|
|
Jean Delvare |
804e6d |
data->temp_adjust_mask = ZEN_CUR_TEMP_RANGE_SEL_MASK;
|
|
Jean Delvare |
804e6d |
data->read_tempreg = read_tempreg_nb_zen;
|
|
Jean Delvare |
804e6d |
- data->show_temp |= BIT(TDIE_BIT);
|
|
Jean Delvare |
804e6d |
data->is_zen = true;
|
|
Jean Delvare |
804e6d |
|
|
Jean Delvare |
804e6d |
switch (boot_cpu_data.x86_model) {
|
|
Jean Delvare |
804e6d |
@@ -466,6 +464,7 @@ static int k10temp_probe(struct pci_dev
|
|
Jean Delvare |
804e6d |
|
|
Jean Delvare |
804e6d |
if (boot_cpu_data.x86 == entry->model &&
|
|
Jean Delvare |
804e6d |
strstr(boot_cpu_data.x86_model_id, entry->id)) {
|
|
Jean Delvare |
804e6d |
+ data->show_temp |= BIT(TDIE_BIT); /* show Tdie */
|
|
Jean Delvare |
804e6d |
data->temp_offset = entry->offset;
|
|
Jean Delvare |
804e6d |
break;
|
|
Jean Delvare |
804e6d |
}
|