Commit 20fc2c6e authored by Avadhut Naik's avatar Avadhut Naik Committed by PvsNarasimha
Browse files

hwmon: (k10temp) Add thermal support for AMD Family 1Ah-based models 

mainline inclusion
from mainline-v6.6-rc1
commit 3cd9da41
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IAU6ZD

Reference: https://github.com/torvalds/linux/commit/3cd9da416d5b625d52053c816ee91daf4e97007c



--------------------------------

commit 3cd9da41 upstream

Add thermal info support for AMD Family 1Ah-based models. Support is
provided on a per-socket granularity.

Co-developed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAvadhut Naik <Avadhut.Naik@amd.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20230809035244.2722455-3-avadhut.naik@amd.com


Signed-off-by: default avatarHemanth Selam <Hemanth.Selam@amd.com>
Signed-off-by: default avatarPvsNarasimha <PVS.NarasimhaRao@amd.com>
parent a86cc765

drivers/hwmon/k10temp.c

+7 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static DEFINE_MUTEX(nb_smu_ind_mutex); 
#define F15H_M60H_HARDWARE_TEMP_CTRL_OFFSET	0xd8200c64

#define F15H_M60H_REPORTED_TEMP_CTRL_OFFSET	0xd8200ca4



/* Common for Zen CPU families (Family 17h and 18h and 19h) */

/* Common for Zen CPU families (Family 17h and 18h and 19h and 1Ah) */

#define ZEN_REPORTED_TEMP_CTRL_BASE		0x00059800



#define ZEN_CCD_TEMP(offset, x)			(ZEN_REPORTED_TEMP_CTRL_BASE + \
@@ -532,6 +532,10 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
			k10temp_get_ccd_support(pdev, data, 12);

			break;

		}

	} else if (boot_cpu_data.x86 == 0x1a) {

		data->temp_adjust_mask = ZEN_CUR_TEMP_RANGE_SEL_MASK;

		data->read_tempreg = read_tempreg_nb_zen;

		data->is_zen = true;

	} else {

		data->read_htcreg = read_htcreg_pci;

		data->read_tempreg = read_tempreg_pci;
@@ -574,6 +578,8 @@ static const struct pci_device_id k10temp_id_table[] = { 
	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M10H_DF_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M40H_DF_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3) },

	{ PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) },

	{ PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) },

	{ PCI_VDEVICE(HYGON, PCI_DEVICE_ID_HYGON_18H_M05H_DF_F3) },