 @@ -1,14 +1,14 @@
-/*      $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 $   */
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christoph Egger.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -38,27 +38,27 @@
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #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>
 #include <sys/cpu.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 #include <machine/specialreg.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 @@ -186,27 +186,27 @@ static int
 amdtemp_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct pci_attach_args *pa = aux;
 	pcireg_t cpu_signature;
 	uint32_t family;
 	if (PCI_VENDOR(pa->pa_id) != PCI_VENDOR_AMD)
 		return 0;
 	switch (PCI_PRODUCT(pa->pa_id)) {
 	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;
+	}
 	cpu_signature = pci_conf_read(pa->pa_pc,
 	    pa->pa_tag, CPUID_FAMILY_MODEL_R);
 	/* This CPUID northbridge register has been introduced
 	 * in Revision F */
 	if (cpu_signature == 0x0)
 		return 0;
 @@ -258,27 +258,28 @@ amdtemp_attach(device_t parent, device_t
 	sc->sc_sensor = NULL;
 	sc->sc_pc = pa->pa_pc;
 	sc->sc_pcitag = pa->pa_tag;
 	sc->sc_adjustment = 0;
 	switch (sc->sc_family) {
 	case 0xf:  /* AMD K8 NPT */
 		amdtemp_k8_init(sc, cpu_signature);
 		break;
 	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;
 	default:
 		aprint_normal(", family 0x%x not supported\n",
 			     sc->sc_family);
 		return;
+	}
 	aprint_normal("\n");
 	if (sc->sc_adjustment != 0)
 		aprint_debug_dev(self, "Workaround enabled\n");
 @@ -286,52 +287,54 @@ amdtemp_attach(device_t parent, device_t
 	sc->sc_sme = sysmon_envsys_create();
 	sc->sc_sensor_len = sizeof(envsys_data_t) * sc->sc_numsensors;
 	sc->sc_sensor = kmem_zalloc(sc->sc_sensor_len, KM_SLEEP);
 	if (sc->sc_sensor == NULL)
 		goto bad;
 	switch (sc->sc_family) {
 	case 0xf:
 		amdtemp_k8_setup_sensors(sc, device_unit(self));
 		break;
 	case 0x10:
 	case 0x11:
 	case 0x12:
 	case 0x14:
 		amdtemp_family10_setup_sensors(sc, device_unit(self));
 		break;
+	}
 	/*
 	 * Set properties in sensors.
 	 */
 	for (i = 0; i < sc->sc_numsensors; i++) {
 		if (sysmon_envsys_sensor_attach(sc->sc_sme,
 						&sc->sc_sensor[i]))
 			goto bad;
+	}
 	/*
 	 * Register the sysmon_envsys device.
 	 */
 	sc->sc_sme->sme_name = device_xname(self);
 	sc->sc_sme->sme_cookie = sc;
 	switch (sc->sc_family) {
 	case 0xf:
 		sc->sc_sme->sme_refresh = amdtemp_k8_refresh;
 		break;
 	case 0x10:
 	case 0x11:
 	case 0x12:
 	case 0x14:
 		sc->sc_sme->sme_refresh = amdtemp_family10_refresh;
 		break;
+	}
 	error = sysmon_envsys_register(sc->sc_sme);
 	if (error) {
 		aprint_error_dev(self, "unable to register with sysmon "
 			"(error=%d)\n", error);
 		goto bad;
+	}
 	(void)pmf_device_register(self, NULL, NULL);

 @@ -1,14 +1,14 @@
-.\" $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.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 @@ -16,49 +16,49 @@
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\" $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
 .Nm amdtemp
 .Nd AMD CPU on-die digital thermal sensor
 .Sh SYNOPSIS
 .Cd "amdtemp* at pchb?"
 .Sh DESCRIPTION
 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.
 Precision was improved in Revision
 G chips, which provide two more bits for 0.25 degC steppings.
 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
+AMD Barcelona, AMD Phenom, AMD Griffin, and AMD Fusion provide 0.125 degC
-and provide one temperature sensor for each CPU socket.
+accuracy and provide one temperature sensor for each CPU socket.
 .Pp
 The
 .Nm
 driver reports temperatures through the
 .Xr envsys 4
 API.
 .Bl -column "Sensor    " "Units" "Typical" -offset indent
 .It Sy "Sensor     " Ta Sy "Units" Ta Sy "Typical Use"
 .It Li "CPUN sensor0" Ta "uK" Ta "cpuN temperature"
 .El
 .Sh SEE ALSO
 .Xr envsys 4 ,
 .Xr envstat 8 ,