CVS commit: src/sys/arch/x86/pci

[Jared D. McNeill]

Module Name:    src
Committed By:   jmcneill
Date:           Sun Jul 31 22:04:07 UTC 2011

Modified Files:
        src/sys/arch/x86/pci: amdtemp.c

Log Message:
add Family14h (AMD Fusion) support


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 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/sys/arch/x86/pci/amdtemp.c
diff -u src/sys/arch/x86/pci/amdtemp.c:1.11 src/sys/arch/x86/pci/amdtemp.c:1.12
--- src/sys/arch/x86/pci/amdtemp.c:1.11	Wed Jun 15 03:30:15 2011
+++ src/sys/arch/x86/pci/amdtemp.c	Sun Jul 31 22:04:07 2011
@@ -1,4 +1,4 @@
-/*      $NetBSD: amdtemp.c,v 1.11 2011/06/15 03:30:15 jruoho Exp $ */
+/*      $NetBSD: amdtemp.c,v 1.12 2011/07/31 22:04:07 jmcneill 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.11 2011/06/15 03:30:15 jruoho Exp $ ");
+__KERNEL_RCSID(0, "$NetBSD: amdtemp.c,v 1.12 2011/07/31 22:04:07 jmcneill Exp $ ");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -81,7 +81,7 @@
  * http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/41256.pdf
  */
 
-/* AMD Proessors, Function 3 -- Miscellaneous Control
+/* AMD Processors, Function 3 -- Miscellaneous Control
  */
 
 /* Function 3 Registers */
@@ -106,7 +106,7 @@
 
 
 /*
- * AMD Family 10h Processorcs, Function 3 -- Miscellaneous Control
+ * AMD Family 10h Processors, Function 3 -- Miscellaneous Control
  */
 
 /* Function 3 Registers */
@@ -196,6 +196,7 @@
 	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:
 		break;
 	default:
 		return 0;
@@ -224,7 +225,7 @@
 
 
 	/* Not yet supported CPUs */
-	if (family >= 0x12)
+	if (family > 0x14)
 		return 0;
 
 	return 2;	/* supercede pchb(4) */
@@ -267,6 +268,7 @@
 
 	case 0x10: /* AMD Barcelona/Phenom */
 	case 0x11: /* AMD Griffin */
+	case 0x14: /* AMD Fusion */
 		amdtemp_family10_init(sc);
 		break;
 
@@ -294,6 +296,7 @@
 		break;
 	case 0x10:
 	case 0x11:
+	case 0x14:
 		amdtemp_family10_setup_sensors(sc, device_unit(self));
 		break;
 	}
@@ -319,6 +322,7 @@
 		break;
 	case 0x10:
 	case 0x11:
+	case 0x14:
 		sc->sc_sme->sme_refresh = amdtemp_family10_refresh;
 		break;
 	}
@@ -481,7 +485,7 @@
 static void
 amdtemp_family10_init(struct amdtemp_softc *sc)
 {
-	aprint_normal(" (Family10h / Family11h)");
+	aprint_normal(" (Family%02xh)", sc->sc_family);
 
 	sc->sc_numsensors = 1;
 }
@@ -500,7 +504,7 @@
 	sc->sc_sensor[0].state = ENVSYS_SVALID;
 
 	snprintf(sc->sc_sensor[0].desc, sizeof(sc->sc_sensor[0].desc),
-		"CPU%u Sensor0", dv_unit);
+		"cpu%u temperature", dv_unit);
 }