AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-02-17 13:27:03 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

hwmon: (k8temp) Fix wrong sensor selection for AMD K8 RevF/RevG CPUs

Browse Source 
Meaning of ThermSenseCoreSel bit was inverted beginning with K8 RevF.
That means with current driver temp1/temp2 belong to core 1 and
temp3/temp4 belong to core 0 on a K8 RevF/RevG CPU.

This patch ensures that temp1/temp2 always belong to core 0 and
temp3/temp4 to core 1 for all K8 revisions.

Cc: Rudolf Marek <r.marek@assembler.cz>
Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
This commit is contained in:
Andreas Herrmann 2009-01-15 22:27:47 +01:00 committed by Jean Delvare
parent bb9a35f293
commit a2e066bba2
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/hwmon/k8temp.c
View File

@ -48,6 +48,7 @@ struct k8temp_data {
/* registers values */ /* registers values */
u8 sensorsp; /* sensor presence bits - SEL_CORE & SEL_PLACE */ u8 sensorsp; /* sensor presence bits - SEL_CORE & SEL_PLACE */
u32 temp[2][2]; /* core, place */ u32 temp[2][2]; /* core, place */
u8 swap_core_select; /* meaning of SEL_CORE is inverted */
}; };
static struct k8temp_data *k8temp_update_device(struct device *dev) static struct k8temp_data *k8temp_update_device(struct device *dev)
@ -117,6 +118,9 @@ static ssize_t show_temp(struct device *dev,
int place = attr->index; int place = attr->index;
struct k8temp_data *data = k8temp_update_device(dev); struct k8temp_data *data = k8temp_update_device(dev);
if (data->swap_core_select)
core = core ? 0 : 1;
return sprintf(buf, "%d\n", return sprintf(buf, "%d\n",
TEMP_FROM_REG(data->temp[core][place])); TEMP_FROM_REG(data->temp[core][place]));
} }
@ -162,7 +166,12 @@ static int __devinit k8temp_probe(struct pci_dev *pdev,
goto exit_free; goto exit_free;
} }
/*
* AMD NPT family 0fh, i.e. RevF and RevG:
* meaning of SEL_CORE bit is inverted
*/
if (model >= 0x40) { if (model >= 0x40) {
data->swap_core_select = 1;
dev_warn(&pdev->dev, "Temperature readouts might be " dev_warn(&pdev->dev, "Temperature readouts might be "
"wrong - check erratum #141\n"); "wrong - check erratum #141\n");
} }