From decbcf0efc0bcdfc45bec1fbb8f2b3066d644330 Mon Sep 17 00:00:00 2001
From: cnst <cnst@openbsd.org>
Date: Fri, 29 Aug 2008 03:38:31 +0000
Subject: [PATCH] support AMD Family 11h (Turion X2 Ultra et al);  discussed
 with jsg@ and jmc@

---
 share/man/man4/km.4  | 15 +++++++++++----
 share/man/man4/pci.4 |  6 +++---
 sys/dev/pci/km.c     |  5 +++--
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/share/man/man4/km.4 b/share/man/man4/km.4
index bfbe2d737ba..3771cdbee50 100644
--- a/share/man/man4/km.4
+++ b/share/man/man4/km.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: km.4,v 1.2 2008/04/29 06:50:04 jmc Exp $
+.\"	$OpenBSD: km.4,v 1.3 2008/08/29 03:38:31 cnst Exp $
 .\"
 .\" Copyright (c) 2008 Constantine A. Murenin <cnst+openbsd@bugmail.mojo.ru>
 .\"
@@ -14,19 +14,19 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 29 2008 $
+.Dd $Mdocdate: August 29 2008 $
 .Dt KM 4
 .Os
 .Sh NAME
 .Nm km
-.Nd AMD K10 temperature sensor
+.Nd AMD K10/K11 temperature sensor
 .Sh SYNOPSIS
 .Cd "km* at pci?"
 .Sh DESCRIPTION
 The
 .Nm
 driver provides support for the temperature sensors available in the
-AMD Family 10h processors.
+AMD Family 10h and 11h processors.
 .Pp
 Each chip reports one temperature sensor.
 Multiprocessor systems have one instance of
@@ -48,6 +48,13 @@ interface.
 .%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
 .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
+.Re
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4
index 81fdde888d9..7197bf7150b 100644
--- a/share/man/man4/pci.4
+++ b/share/man/man4/pci.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pci.4,v 1.256 2008/08/28 13:09:02 jmc Exp $
+.\"	$OpenBSD: pci.4,v 1.257 2008/08/29 03:38:31 cnst Exp $
 .\"	$NetBSD: pci.4,v 1.29 2000/04/01 00:32:23 tsarna Exp $
 .\"
 .\" Copyright (c) 2000 Theo de Raadt.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 28 2008 $
+.Dd $Mdocdate: August 29 2008 $
 .Dt PCI 4
 .Os
 .Sh NAME
@@ -392,7 +392,7 @@ Intel 6300ESB ICH watchdog timer device
 .It Xr kate 4
 AMD K8 temperature sensor
 .It Xr km 4
-AMD K10 temperature sensor
+AMD K10/K11 temperature sensor
 .It Xr pwdog 4
 Quancom PWDOG1 watchdog timer device
 .It Xr viaenv 4
diff --git a/sys/dev/pci/km.c b/sys/dev/pci/km.c
index 555bc4426d6..43662aaa845 100644
--- a/sys/dev/pci/km.c
+++ b/sys/dev/pci/km.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: km.c,v 1.1 2008/04/29 05:29:59 cnst Exp $	*/
+/*	$OpenBSD: km.c,v 1.2 2008/08/29 03:38:31 cnst Exp $	*/
 
 /*
  * Copyright (c) 2008 Constantine A. Murenin <cnst+openbsd@bugmail.mojo.ru>
@@ -68,7 +68,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_10_MISC},
+	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_AMD64_11_MISC}
 };
 
 
-- 
2.20.1