Skip to content

Commit d906fa7

Browse files
superm1suryasaimadhu
authored andcommitted
hwmon: (k10temp): Add support for new family 17h and 19h models
Add the support for CCD offsets used on family 17h models A0h-AFh, and family 19h models 60h-7Fh. [ bp: Merge into a single patch. ] Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> Signed-off-by: Borislav Petkov <bp@suse.de> Acked-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/20220719195256.1516-1-mario.limonciello@amd.com
1 parent f8faf34 commit d906fa7

1 file changed

Lines changed: 12 additions & 0 deletions

File tree

drivers/hwmon/k10temp.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,10 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id)
428428
data->ccd_offset = 0x154;
429429
k10temp_get_ccd_support(pdev, data, 8);
430430
break;
431+
case 0xa0 ... 0xaf:
432+
data->ccd_offset = 0x300;
433+
k10temp_get_ccd_support(pdev, data, 8);
434+
break;
431435
}
432436
} else if (boot_cpu_data.x86 == 0x19) {
433437
data->temp_adjust_mask = ZEN_CUR_TEMP_RANGE_SEL_MASK;
@@ -445,6 +449,11 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id)
445449
data->ccd_offset = 0x300;
446450
k10temp_get_ccd_support(pdev, data, 8);
447451
break;
452+
case 0x60 ... 0x6f:
453+
case 0x70 ... 0x7f:
454+
data->ccd_offset = 0x308;
455+
k10temp_get_ccd_support(pdev, data, 8);
456+
break;
448457
case 0x10 ... 0x1f:
449458
case 0xa0 ... 0xaf:
450459
data->ccd_offset = 0x300;
@@ -489,10 +498,13 @@ static const struct pci_device_id k10temp_id_table[] = {
489498
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) },
490499
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F3) },
491500
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) },
501+
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_MA0H_DF_F3) },
492502
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_DF_F3) },
493503
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M10H_DF_F3) },
494504
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M40H_DF_F3) },
495505
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) },
506+
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M60H_DF_F3) },
507+
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F3) },
496508
{ PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) },
497509
{}
498510
};

0 commit comments

Comments
 (0)