Skip to content

Commit 5dcc00a

Browse files
weihuang-amdjackpot51
authored andcommitted
hwmon: (k10temp) Add support for Zen3 CPUs
Zen3 thermal info is supported via a new PCI device ID. Also the voltage telemetry registers and the current factors need to be defined. k10temp driver then searches for CPU family 0x19 and configures k10temp_data accordingly. Signed-off-by: Wei Huang <wei.huang2@amd.com> Link: https://lore.kernel.org/r/20200914200715.1997757-1-wei.huang2@amd.com Signed-off-by: Guenter Roeck <linux@roeck-us.net>
1 parent 20cb8c2 commit 5dcc00a

File tree

1 file changed

+24
-0
lines changed

1 file changed

+24
-0
lines changed

drivers/hwmon/k10temp.c

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,13 @@ static DEFINE_MUTEX(nb_smu_ind_mutex);
9696
#define F17H_M31H_CFACTOR_ICORE 1000000 /* 1A / LSB */
9797
#define F17H_M31H_CFACTOR_ISOC 310000 /* 0.31A / LSB */
9898

99+
/* F19h thermal registers through SMN */
100+
#define F19H_M01_SVI_TEL_PLANE0 (ZEN_SVI_BASE + 0x14)
101+
#define F19H_M01_SVI_TEL_PLANE1 (ZEN_SVI_BASE + 0x10)
102+
103+
#define F19H_M01H_CFACTOR_ICORE 1000000 /* 1A / LSB */
104+
#define F19H_M01H_CFACTOR_ISOC 310000 /* 0.31A / LSB */
105+
99106
struct k10temp_data {
100107
struct pci_dev *pdev;
101108
void (*read_htcreg)(struct pci_dev *pdev, u32 *regval);
@@ -598,6 +605,22 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id)
598605
k10temp_get_ccd_support(pdev, data, 8);
599606
break;
600607
}
608+
} else if (boot_cpu_data.x86 == 0x19) {
609+
data->temp_adjust_mask = ZEN_CUR_TEMP_RANGE_SEL_MASK;
610+
data->read_tempreg = read_tempreg_nb_zen;
611+
data->show_temp |= BIT(TDIE_BIT);
612+
data->is_zen = true;
613+
614+
switch (boot_cpu_data.x86_model) {
615+
case 0x0 ... 0x1: /* Zen3 */
616+
data->show_current = true;
617+
data->svi_addr[0] = F19H_M01_SVI_TEL_PLANE0;
618+
data->svi_addr[1] = F19H_M01_SVI_TEL_PLANE1;
619+
data->cfactor[0] = F19H_M01H_CFACTOR_ICORE;
620+
data->cfactor[1] = F19H_M01H_CFACTOR_ISOC;
621+
k10temp_get_ccd_support(pdev, data, 8);
622+
break;
623+
}
601624
} else {
602625
data->read_htcreg = read_htcreg_pci;
603626
data->read_tempreg = read_tempreg_pci;
@@ -640,6 +663,7 @@ static const struct pci_device_id k10temp_id_table[] = {
640663
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) },
641664
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F3) },
642665
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) },
666+
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_DF_F3) },
643667
{ PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) },
644668
{}
645669
};

0 commit comments

Comments
 (0)