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

Commit fbc729a4 authored by Andre Przywara's avatar Andre Przywara Committed by Guenter Roeck
Browse files

hwmon: (k10temp) Add support for AMD Trinity CPUs 



The on-chip northbridge's temperature sensor of the upcoming
AMD Trinity CPUs works the same as for the previous CPUs.
Since it has a different PCI-ID, we just add the new one to the list
supported by k10temp.
This allows to use the k10temp driver on those CPUs.

Signed-off-by: default avatarAndre Przywara <andre.przywara@amd.com>
Cc: stable@vger.kernel.org # 3.0+
Signed-off-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
parent 6f7805a8

Documentation/hwmon/k10temp

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ Supported chips: 
  Socket S1G2: Athlon (X2), Sempron (X2), Turion X2 (Ultra)

* AMD Family 12h processors: "Llano" (E2/A4/A6/A8-Series)

* AMD Family 14h processors: "Brazos" (C/E/G/Z-Series)

* AMD Family 15h processors: "Bulldozer"

* AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity"



  Prefix: 'k10temp'

  Addresses scanned: PCI space

drivers/hwmon/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -253,7 +253,8 @@ config SENSORS_K10TEMP 
	  If you say yes here you get support for the temperature

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

	  the AMD Family 10h and all revisions of the AMD Family 11h,

	  12h (Llano), 14h (Brazos) and 15h (Bulldozer) microarchitectures.

	  12h (Llano), 14h (Brazos) and 15h (Bulldozer/Trinity)

	  microarchitectures.



	  This driver can also be built as a module.  If so, the module

	  will be called k10temp.

drivers/hwmon/k10temp.c

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ static bool force; 
module_param(force, bool, 0444);

MODULE_PARM_DESC(force, "force loading on processors with erratum 319");



/* PCI-IDs for Northbridge devices not used anywhere else */

#define PCI_DEVICE_ID_AMD_15H_M10H_NB_F3	0x1403



/* CPUID function 0x80000001, ebx */

#define CPUID_PKGTYPE_MASK	0xf0000000

#define CPUID_PKGTYPE_F		0x00000000
@@ -210,6 +213,7 @@ static DEFINE_PCI_DEVICE_TABLE(k10temp_id_table) = { 
	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_11H_NB_MISC) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_NB_F3) },

	{}

};

MODULE_DEVICE_TABLE(pci, k10temp_id_table);