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

Commit 3b031622 authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: (k10temp) Use API function to access System Management Network 



The SMN (System Management Network) on Family 17h AMD CPUs is also accessed
from other drivers, specifically EDAC. Accessing it directly is racy.
On top of that, accessing the SMN through root bridge 00:00 is wrong on
multi-die CPUs and may result in reading the temperature from the wrong
die. Use available API functions to fix the problem.

For this to work, add dependency on AMD_NB. Also change the Raven Ridge
PCI device ID to point to Data Fabric Function 3, since this ID is used
by the API functions to find the CPU node.

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 f9bc6b2d

drivers/hwmon/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ config SENSORS_K8TEMP 


config SENSORS_K10TEMP

	tristate "AMD Family 10h+ temperature sensor"

	depends on X86 && PCI

	depends on X86 && PCI && AMD_NB

	help

	  If you say yes here you get support for the temperature

	  sensor(s) inside your CPU. Supported are later revisions of

drivers/hwmon/k10temp.c

+6 −5
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/init.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <asm/amd_nb.h>

#include <asm/processor.h>



MODULE_DESCRIPTION("AMD Family 10h+ CPU core temperature monitor");
@@ -40,8 +41,8 @@ static DEFINE_MUTEX(nb_smu_ind_mutex); 
#define PCI_DEVICE_ID_AMD_17H_DF_F3	0x1463

#endif



#ifndef PCI_DEVICE_ID_AMD_17H_RR_NB

#define PCI_DEVICE_ID_AMD_17H_RR_NB	0x15d0

#ifndef PCI_DEVICE_ID_AMD_17H_M10H_DF_F3

#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3	0x15eb

#endif



/* CPUID function 0x80000001, ebx */
@@ -136,7 +137,7 @@ static void read_tempreg_nb_f15(struct pci_dev *pdev, u32 *regval) 


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

{

	amd_nb_index_read(pdev, PCI_DEVFN(0, 0), 0x60,

	amd_smn_read(amd_pci_dev_to_node_id(pdev),

		     F17H_M01H_REPORTED_TEMP_CTRL_OFFSET, regval);

}
@@ -322,7 +323,7 @@ static const struct pci_device_id k10temp_id_table[] = { 
	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_RR_NB) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) },

	{}

};

MODULE_DEVICE_TABLE(pci, k10temp_id_table);