Commit 02a2484c authored by Mario Limonciello's avatar Mario Limonciello Committed by Guenter Roeck
Browse files

hwmon: (k10temp) Don't show Tdie for all Zen/Zen2/Zen3 CPU/APU 



Tdie is an offset calculation that should only be shown when temp_offset
is actually put into a table.  This is useless to show for all CPU/APU.
Show it only when necessary.

Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 128066c8

drivers/hwmon/k10temp.c

+1 −2
Original line number Diff line number Diff line
@@ -426,7 +426,6 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	} else if (boot_cpu_data.x86 == 0x17 || boot_cpu_data.x86 == 0x18) {

		data->temp_adjust_mask = ZEN_CUR_TEMP_RANGE_SEL_MASK;

		data->read_tempreg = read_tempreg_nb_zen;

		data->show_temp |= BIT(TDIE_BIT);	/* show Tdie */

		data->is_zen = true;



		switch (boot_cpu_data.x86_model) {
@@ -446,7 +445,6 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	} else if (boot_cpu_data.x86 == 0x19) {

		data->temp_adjust_mask = ZEN_CUR_TEMP_RANGE_SEL_MASK;

		data->read_tempreg = read_tempreg_nb_zen;

		data->show_temp |= BIT(TDIE_BIT);

		data->is_zen = true;



		switch (boot_cpu_data.x86_model) {
@@ -466,6 +464,7 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


		if (boot_cpu_data.x86 == entry->model &&

		    strstr(boot_cpu_data.x86_model_id, entry->id)) {

			data->show_temp |= BIT(TDIE_BIT);	/* show Tdie */

			data->temp_offset = entry->offset;

			break;

		}