summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2011-05-31 00:19:54 +0000
committerderaadt <deraadt@openbsd.org>2011-05-31 00:19:54 +0000
commit80ecd5cfe76e1751d9c320b6d7ef25187b82de40 (patch)
treed11a327e21c2dc79576c3afc1dbef5d33c9768a7
parentForce full resets always for now. (diff)
downloadwireguard-openbsd-80ecd5cfe76e1751d9c320b6d7ef25187b82de40.tar.xz
wireguard-openbsd-80ecd5cfe76e1751d9c320b6d7ef25187b82de40.zip
Family 14h also supports the km(4) temperature sensor
from brad
-rw-r--r--share/man/man4/km.417
-rw-r--r--sys/dev/pci/km.c7
2 files changed, 16 insertions, 8 deletions
diff --git a/share/man/man4/km.4 b/share/man/man4/km.4
index 8676f7f631c..8f81f144b90 100644
--- a/share/man/man4/km.4
+++ b/share/man/man4/km.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: km.4,v 1.5 2009/07/23 17:19:07 cnst Exp $
+.\" $OpenBSD: km.4,v 1.6 2011/05/31 00:19:54 deraadt Exp $
.\"
.\" Copyright (c) 2008 Constantine A. Murenin <cnst+openbsd@bugmail.mojo.ru>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: July 23 2009 $
+.Dd $Mdocdate: May 31 2011 $
.Dt KM 4
.Os
.Sh NAME
@@ -26,7 +26,7 @@
The
.Nm
driver provides support for the temperature sensors available in the
-AMD Family 10h and 11h processors.
+AMD Family 10h, 11h and 14h processors.
.Pp
Each chip reports one temperature sensor.
Multiprocessor systems have one instance of
@@ -47,14 +47,21 @@ interface.
.%D March 26, 2008
.%R Publication # 31116
.%P pp. 236--237 and pp. 243--244
-.\" .%O http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/31116.PDF
+.\" .%O http://support.amd.com/us/Processor_TechDocs/31116.pdf
.Re
.Rs
.%T "BIOS and Kernel Developer's Guide for AMD Family 11h Processors"
.%D July 07, 2008
.%R Publication # 41256
.%P pp. 156--157 and pp. 159--160
-.\" .%O http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/41256.pdf
+.\" .%O http://support.amd.com/us/Processor_TechDocs/41256.pdf
+.Re
+.Rs
+.%T "BIOS and Kernel Developer's Guide for AMD Family 14h Models 00h-04h Processors"
+.%D May 02, 2011
+.%R Publication # 43170
+.%P pp. 277--278 and pp. 280--282
+.\" .%O http://support.amd.com/us/Processor_TechDocs/43170.pdf
.Re
.Sh HISTORY
The
diff --git a/sys/dev/pci/km.c b/sys/dev/pci/km.c
index 48589ff4cf6..ececd3cb955 100644
--- a/sys/dev/pci/km.c
+++ b/sys/dev/pci/km.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: km.c,v 1.4 2009/01/26 15:07:49 kettenis Exp $ */
+/* $OpenBSD: km.c,v 1.5 2011/05/31 00:19:55 deraadt Exp $ */
/*
* Copyright (c) 2008 Constantine A. Murenin <cnst+openbsd@bugmail.mojo.ru>
@@ -29,7 +29,7 @@
/*
- * AMD Family 10h/11h Processors, Function 3 -- Miscellaneous Control
+ * AMD Family 10h/11h/14h Processors, Function 3 -- Miscellaneous Control
*/
/* Function 3 Registers */
@@ -69,7 +69,8 @@ struct cfdriver km_cd = {
static const struct pci_matchid km_devices[] = {
{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_10_MISC },
- { PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_11_MISC }
+ { PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_11_MISC },
+ { PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_14_MISC }
};