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

Commit aa4790a6 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Guenter Roeck
Browse files

hwmon: (k10temp) add support for AMD Family 12h/14h CPUs 



Add the PCI ID to support the internal temperature sensor of the
AMD "Llano" and "Brazos" processor families.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Cc: stable@kernel.org # ca86828c: x86, AMD, PCI: Add AMD northbridge PCI device
Cc: stable@kernel.org
Signed-off-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
parent 2c6315da

Documentation/hwmon/k10temp

+7 −1
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ Supported chips: 
  Socket S1G3: Athlon II, Sempron, Turion II

* AMD Family 11h processors:

  Socket S1G2: Athlon (X2), Sempron (X2), Turion X2 (Ultra)

* AMD Family 12h processors: "Llano"

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



  Prefix: 'k10temp'

  Addresses scanned: PCI space
@@ -17,10 +19,14 @@ Supported chips: 
    http://support.amd.com/us/Processor_TechDocs/31116.pdf

  BIOS and Kernel Developer's Guide (BKDG) for AMD Family 11h Processors:

    http://support.amd.com/us/Processor_TechDocs/41256.pdf

  BIOS and Kernel Developer's Guide (BKDG) for AMD Family 14h Models 00h-0Fh Processors:

    http://support.amd.com/us/Processor_TechDocs/43170.pdf

  Revision Guide for AMD Family 10h Processors:

    http://support.amd.com/us/Processor_TechDocs/41322.pdf

  Revision Guide for AMD Family 11h Processors:

    http://support.amd.com/us/Processor_TechDocs/41788.pdf

  Revision Guide for AMD Family 14h Models 00h-0Fh Processors:

    http://support.amd.com/us/Processor_TechDocs/47534.pdf

  AMD Family 11h Processor Power and Thermal Data Sheet for Notebooks:

    http://support.amd.com/us/Processor_TechDocs/43373.pdf

  AMD Family 10h Server and Workstation Processor Power and Thermal Data Sheet:
@@ -34,7 +40,7 @@ Description 
-----------



This driver permits reading of the internal temperature sensor of AMD

Family 10h and 11h processors.

Family 10h/11h/12h/14h processors.



All these processors have a sensor, but on those for Socket F or AM2+,

the sensor may return inconsistent values (erratum 319).  The driver

drivers/hwmon/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -238,13 +238,13 @@ config SENSORS_K8TEMP 
	  will be called k8temp.



config SENSORS_K10TEMP

	tristate "AMD Phenom/Sempron/Turion/Opteron temperature sensor"

	tristate "AMD Family 10h/11h/12h/14h temperature sensor"

	depends on X86 && PCI

	help

	  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

	  microarchitectures.

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

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



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

	  will be called k10temp.

drivers/hwmon/k10temp.c

+3 −2
Original line number Diff line number Diff line 
/*

 * k10temp.c - AMD Family 10h/11h processor hardware monitoring

 * k10temp.c - AMD Family 10h/11h/12h/14h processor hardware monitoring

 *

 * Copyright (c) 2009 Clemens Ladisch <clemens@ladisch.de>

 *
@@ -25,7 +25,7 @@ 
#include <linux/pci.h>

#include <asm/processor.h>



MODULE_DESCRIPTION("AMD Family 10h/11h CPU core temperature monitor");

MODULE_DESCRIPTION("AMD Family 10h/11h/12h/14h CPU core temperature monitor");

MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");

MODULE_LICENSE("GPL");
@@ -208,6 +208,7 @@ static void __devexit k10temp_remove(struct pci_dev *pdev) 
static const struct pci_device_id k10temp_id_table[] = {

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_11H_NB_MISC) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },

	{}

};

MODULE_DEVICE_TABLE(pci, k10temp_id_table);