Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40626a1b authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: (k10temp) Fix reading critical temperature register 



The HTC (Hardware Temperature Control) register has moved
for recent chips.

Cc: stable@vger.kernel.org # v4.16+
Tested-by: default avatarGabriel Craciunescu <nix.or.die@gmail.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 6da6c0db

drivers/hwmon/k10temp.c

+30 −10
Original line number Original line Diff line number Diff line
@@ -63,10 +63,12 @@ static DEFINE_MUTEX(nb_smu_ind_mutex); 
#define  NB_CAP_HTC			0x00000400

#define  NB_CAP_HTC			0x00000400





/*

/*

 * For F15h M60h, functionality of REG_REPORTED_TEMPERATURE

 * For F15h M60h and M70h, REG_HARDWARE_THERMAL_CONTROL

 * has been moved to D0F0xBC_xD820_0CA4 [Reported Temperature

 * and REG_REPORTED_TEMPERATURE have been moved to

 * Control]

 * D0F0xBC_xD820_0C64 [Hardware Temperature Control]

 * D0F0xBC_xD820_0CA4 [Reported Temperature Control]

 */

 */

#define F15H_M60H_HARDWARE_TEMP_CTRL_OFFSET	0xd8200c64

#define F15H_M60H_REPORTED_TEMP_CTRL_OFFSET	0xd8200ca4

#define F15H_M60H_REPORTED_TEMP_CTRL_OFFSET	0xd8200ca4





/* F17h M01h Access througn SMN */

/* F17h M01h Access througn SMN */
@@ -74,6 +76,7 @@ static DEFINE_MUTEX(nb_smu_ind_mutex); 




struct k10temp_data {

struct k10temp_data {

	struct pci_dev *pdev;

	struct pci_dev *pdev;

	void (*read_htcreg)(struct pci_dev *pdev, u32 *regval);

	void (*read_tempreg)(struct pci_dev *pdev, u32 *regval);

	void (*read_tempreg)(struct pci_dev *pdev, u32 *regval);

	int temp_offset;

	int temp_offset;

	u32 temp_adjust_mask;

	u32 temp_adjust_mask;
@@ -98,6 +101,11 @@ static const struct tctl_offset tctl_offset_table[] = { 
	{ 0x17, "AMD Ryzen Threadripper 1910", 10000 },

	{ 0x17, "AMD Ryzen Threadripper 1910", 10000 },

};

};





static void read_htcreg_pci(struct pci_dev *pdev, u32 *regval)

{

	pci_read_config_dword(pdev, REG_HARDWARE_THERMAL_CONTROL, regval);

}



static void read_tempreg_pci(struct pci_dev *pdev, u32 *regval)

static void read_tempreg_pci(struct pci_dev *pdev, u32 *regval)

{

{

	pci_read_config_dword(pdev, REG_REPORTED_TEMPERATURE, regval);

	pci_read_config_dword(pdev, REG_REPORTED_TEMPERATURE, regval);
@@ -114,6 +122,12 @@ static void amd_nb_index_read(struct pci_dev *pdev, unsigned int devfn, 
	mutex_unlock(&nb_smu_ind_mutex);

	mutex_unlock(&nb_smu_ind_mutex);

}

}





static void read_htcreg_nb_f15(struct pci_dev *pdev, u32 *regval)

{

	amd_nb_index_read(pdev, PCI_DEVFN(0, 0), 0xb8,

			  F15H_M60H_HARDWARE_TEMP_CTRL_OFFSET, regval);

}



static void read_tempreg_nb_f15(struct pci_dev *pdev, u32 *regval)

static void read_tempreg_nb_f15(struct pci_dev *pdev, u32 *regval)

{

{

	amd_nb_index_read(pdev, PCI_DEVFN(0, 0), 0xb8,

	amd_nb_index_read(pdev, PCI_DEVFN(0, 0), 0xb8,
@@ -160,8 +174,7 @@ static ssize_t show_temp_crit(struct device *dev, 
	u32 regval;

	u32 regval;

	int value;

	int value;





	pci_read_config_dword(data->pdev,

	data->read_htcreg(data->pdev, &regval);

			      REG_HARDWARE_THERMAL_CONTROL, &regval);

	value = ((regval >> 16) & 0x7f) * 500 + 52000;

	value = ((regval >> 16) & 0x7f) * 500 + 52000;

	if (show_hyst)

	if (show_hyst)

		value -= ((regval >> 24) & 0xf) * 500;

		value -= ((regval >> 24) & 0xf) * 500;
@@ -181,13 +194,18 @@ static umode_t k10temp_is_visible(struct kobject *kobj, 
	struct pci_dev *pdev = data->pdev;

	struct pci_dev *pdev = data->pdev;





	if (index >= 2) {

	if (index >= 2) {

		u32 reg_caps, reg_htc;

		u32 reg;



		if (!data->read_htcreg)

			return 0;





		pci_read_config_dword(pdev, REG_NORTHBRIDGE_CAPABILITIES,

		pci_read_config_dword(pdev, REG_NORTHBRIDGE_CAPABILITIES,

				      &reg_caps);

				      &reg);

		pci_read_config_dword(pdev, REG_HARDWARE_THERMAL_CONTROL,

		if (!(reg & NB_CAP_HTC))

				      &reg_htc);

			return 0;

		if (!(reg_caps & NB_CAP_HTC) || !(reg_htc & HTC_ENABLE))



		data->read_htcreg(data->pdev, &reg);

		if (!(reg & HTC_ENABLE))

			return 0;

			return 0;

	}

	}

	return attr->mode;

	return attr->mode;
@@ -268,11 +286,13 @@ static int k10temp_probe(struct pci_dev *pdev, 




	if (boot_cpu_data.x86 == 0x15 && (boot_cpu_data.x86_model == 0x60 ||

	if (boot_cpu_data.x86 == 0x15 && (boot_cpu_data.x86_model == 0x60 ||

					  boot_cpu_data.x86_model == 0x70)) {

					  boot_cpu_data.x86_model == 0x70)) {

		data->read_htcreg = read_htcreg_nb_f15;

		data->read_tempreg = read_tempreg_nb_f15;

		data->read_tempreg = read_tempreg_nb_f15;

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

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

		data->temp_adjust_mask = 0x80000;

		data->temp_adjust_mask = 0x80000;

		data->read_tempreg = read_tempreg_nb_f17;

		data->read_tempreg = read_tempreg_nb_f17;

	} else {

	} else {

		data->read_htcreg = read_htcreg_pci;

		data->read_tempreg = read_tempreg_pci;

		data->read_tempreg = read_tempreg_pci;

	}

	}