Module Name: src
Committed By: riz
Date: Thu Mar 8 17:38:03 UTC 2012
Modified Files:
src/share/man/man4 [netbsd-6]: amdtemp.4
src/sys/arch/x86/pci [netbsd-6]: amdtemp.c
Log Message:
Pull up following revision(s) (requested by nonaka):
share/man/man4/amdtemp.4: revision 1.6
share/man/man4/amdtemp.4: revision 1.7
sys/arch/x86/pci/amdtemp.c: revision 1.13
Added Family 12h support.
Mention AMD Fusion.
Bump date for previous.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.4.1 src/share/man/man4/amdtemp.4
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/arch/x86/pci/amdtemp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/amdtemp.4
diff -u src/share/man/man4/amdtemp.4:1.5 src/share/man/man4/amdtemp.4:1.5.4.1
--- src/share/man/man4/amdtemp.4:1.5 Thu Aug 18 20:55:21 2011
+++ src/share/man/man4/amdtemp.4 Thu Mar 8 17:38:03 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: amdtemp.4,v 1.5 2011/08/18 20:55:21 jakllsch Exp $
+.\" $NetBSD: amdtemp.4,v 1.5.4.1 2012/03/08 17:38:03 riz Exp $
.\"-
.\" Copyright (c) 2008 Christoph Egger
.\" All rights reserved.
@@ -26,7 +26,7 @@
.\"
.\" $FreeBSD: src/share/man/man4/coretemp.4,v 1.4 2007/10/15 20:00:19 netchild Exp $
.\"
-.Dd August 18, 2011
+.Dd March 2, 2012
.Dt AMDTEMP 4
.Os
.Sh NAME
@@ -38,7 +38,7 @@
The
.Nm
driver provides support for the on-die digital thermal sensor present
-on AMD K8, AMD Barcelona, AMD Phenoms, and AMD Griffin CPUs.
+on AMD K8, AMD Barcelona, AMD Phenom, AMD Griffin, and AMD Fusion CPUs.
.Pp
These sensors were officially introduced in AMD K8 Revision F processors,
and provide 0.5 degC accuracy.
@@ -47,8 +47,8 @@ G chips, which provide two more bits for
Each core
has two temperature sensors, and there are up to two cores per CPU socket.
.Pp
-AMD Barcelona, AMD Phenom, and AMD Griffin provide 0.125 degC accuracy
-and provide one temperature sensor for each CPU socket.
+AMD Barcelona, AMD Phenom, AMD Griffin, and AMD Fusion provide 0.125 degC
+accuracy and provide one temperature sensor for each CPU socket.
.Pp
The
.Nm
Index: src/sys/arch/x86/pci/amdtemp.c
diff -u src/sys/arch/x86/pci/amdtemp.c:1.12 src/sys/arch/x86/pci/amdtemp.c:1.12.8.1
--- src/sys/arch/x86/pci/amdtemp.c:1.12 Sun Jul 31 22:04:07 2011
+++ src/sys/arch/x86/pci/amdtemp.c Thu Mar 8 17:38:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: amdtemp.c,v 1.12 2011/07/31 22:04:07 jmcneill Exp $ */
+/* $NetBSD: amdtemp.c,v 1.12.8.1 2012/03/08 17:38:03 riz Exp $ */
/* $OpenBSD: kate.c,v 1.2 2008/03/27 04:52:03 cnst Exp $ */
/*
@@ -48,7 +48,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdtemp.c,v 1.12 2011/07/31 22:04:07 jmcneill Exp $ ");
+__KERNEL_RCSID(0, "$NetBSD: amdtemp.c,v 1.12.8.1 2012/03/08 17:38:03 riz Exp $ ");
#include <sys/param.h>
#include <sys/bus.h>
@@ -196,7 +196,7 @@ amdtemp_match(device_t parent, cfdata_t
case PCI_PRODUCT_AMD_AMD64_MISC:
case PCI_PRODUCT_AMD_AMD64_F10_MISC:
case PCI_PRODUCT_AMD_AMD64_F11_MISC:
- case PCI_PRODUCT_AMD_F14_NB:
+ case PCI_PRODUCT_AMD_F14_NB: /* Family12h too */
break;
default:
return 0;
@@ -268,7 +268,8 @@ amdtemp_attach(device_t parent, device_t
case 0x10: /* AMD Barcelona/Phenom */
case 0x11: /* AMD Griffin */
- case 0x14: /* AMD Fusion */
+ case 0x12: /* AMD Lynx/Sabine (Llano) */
+ case 0x14: /* AMD Brazos (Ontario/Zacate/Desna) */
amdtemp_family10_init(sc);
break;
@@ -296,6 +297,7 @@ amdtemp_attach(device_t parent, device_t
break;
case 0x10:
case 0x11:
+ case 0x12:
case 0x14:
amdtemp_family10_setup_sensors(sc, device_unit(self));
break;
@@ -322,6 +324,7 @@ amdtemp_attach(device_t parent, device_t
break;
case 0x10:
case 0x11:
+ case 0x12:
case 0x14:
sc->sc_sme->sme_refresh = amdtemp_family10_refresh;
break;
