From owner-svn-src-all@FreeBSD.ORG Thu Mar 12 18:59:40 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3075C106564A; Thu, 12 Mar 2009 18:59:40 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 124138FC1C; Thu, 12 Mar 2009 18:59:40 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2CIxdXY038299; Thu, 12 Mar 2009 18:59:39 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2CIxdJM038298; Thu, 12 Mar 2009 18:59:39 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200903121859.n2CIxdJM038298@svn.freebsd.org> From: Rui Paulo Date: Thu, 12 Mar 2009 18:59:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189748 - head/sys/dev/k8temp X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2009 18:59:41 -0000 Author: rpaulo Date: Thu Mar 12 18:59:39 2009 New Revision: 189748 URL: http://svn.freebsd.org/changeset/base/189748 Log: Add support for 10h and 11h family of processors. Also, make the sysctl look like a temperature. This driver will most likely be renamed to something more meaningful in the near future. Submitted by: nork MFC after: 2 weeks Modified: head/sys/dev/k8temp/k8temp.c Modified: head/sys/dev/k8temp/k8temp.c ============================================================================== --- head/sys/dev/k8temp/k8temp.c Thu Mar 12 18:18:28 2009 (r189747) +++ head/sys/dev/k8temp/k8temp.c Thu Mar 12 18:59:39 2009 (r189748) @@ -48,6 +48,15 @@ __FBSDID("$FreeBSD$"); #include #include +typedef enum { + SENSOR0_CORE0, + SENSOR0_CORE1, + SENSOR1_CORE0, + SENSOR1_CORE1, + CORE0, + CORE1 +} k8sensor_t; + struct k8temp_softc { device_t sc_dev; int sc_temps[4]; @@ -55,36 +64,38 @@ struct k8temp_softc { struct sysctl_oid *sc_oid; struct sysctl_oid *sc_sysctl_cpu[2]; struct intr_config_hook sc_ich; + int32_t (*sc_gettemp)(device_t, k8sensor_t); }; #define VENDORID_AMD 0x1022 -#define DEVICEID_AMD_MISC 0x1103 +#define DEVICEID_AMD_MISC0F 0x1103 +#define DEVICEID_AMD_MISC10 0x1203 +#define DEVICEID_AMD_MISC11 0x1303 static struct k8temp_product { uint16_t k8temp_vendorid; uint16_t k8temp_deviceid; } k8temp_products[] = { - { VENDORID_AMD, DEVICEID_AMD_MISC }, + { VENDORID_AMD, DEVICEID_AMD_MISC0F }, + { VENDORID_AMD, DEVICEID_AMD_MISC10 }, + { VENDORID_AMD, DEVICEID_AMD_MISC11 }, { 0, 0 } }; /* * Register control */ -#define K8TEMP_REG 0xe4 +#define K8TEMP_REG0F 0xe4 #define K8TEMP_REG_SELSENSOR 0x40 #define K8TEMP_REG_SELCORE 0x04 -#define K8TEMP_MINTEMP 49 /* -49 C is the mininum temperature */ +#define K8TEMP_REG 0xa4 -typedef enum { - SENSOR0_CORE0, - SENSOR0_CORE1, - SENSOR1_CORE0, - SENSOR1_CORE1, - CORE0, - CORE1 -} k8sensor_t; +#define TZ_ZEROC 2732 + + /* -49 C is the mininum temperature */ +#define K8TEMP_OFFSET0F (TZ_ZEROC-490) +#define K8TEMP_OFFSET (TZ_ZEROC) /* * Device methods. @@ -95,6 +106,7 @@ static int k8temp_attach(device_t dev); static void k8temp_intrhook(void *arg); static int k8temp_detach(device_t dev); static int k8temp_match(device_t dev); +static int32_t k8temp_gettemp0f(device_t dev, k8sensor_t sensor); static int32_t k8temp_gettemp(device_t dev, k8sensor_t sensor); static int k8temp_sysctl(SYSCTL_HANDLER_ARGS); @@ -193,6 +205,13 @@ k8temp_attach(device_t dev) return (ENXIO); } + if (pci_get_device(dev) == DEVICEID_AMD_MISC0F) + sc->sc_gettemp = k8temp_gettemp0f; + else { + sc->sc_gettemp = k8temp_gettemp; + return (0); + } + /* * dev.k8temp.N tree. */ @@ -204,13 +223,13 @@ k8temp_attach(device_t dev) SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sysctlnode), OID_AUTO, "core0", CTLTYPE_INT | CTLFLAG_RD, - dev, SENSOR0_CORE0, k8temp_sysctl, "I", + dev, SENSOR0_CORE0, k8temp_sysctl, "IK", "Sensor 0 / Core 0 temperature"); SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sysctlnode), OID_AUTO, "core1", CTLTYPE_INT | CTLFLAG_RD, - dev, SENSOR0_CORE1, k8temp_sysctl, "I", + dev, SENSOR0_CORE1, k8temp_sysctl, "IK", "Sensor 0 / Core 1 temperature"); sysctlnode = SYSCTL_ADD_NODE(sysctlctx, @@ -220,13 +239,13 @@ k8temp_attach(device_t dev) SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sysctlnode), OID_AUTO, "core0", CTLTYPE_INT | CTLFLAG_RD, - dev, SENSOR1_CORE0, k8temp_sysctl, "I", + dev, SENSOR1_CORE0, k8temp_sysctl, "IK", "Sensor 1 / Core 0 temperature"); SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sysctlnode), OID_AUTO, "core1", CTLTYPE_INT | CTLFLAG_RD, - dev, SENSOR1_CORE1, k8temp_sysctl, "I", + dev, SENSOR1_CORE1, k8temp_sysctl, "IK", "Sensor 1 / Core 1 temperature"); return (0); @@ -258,7 +277,7 @@ k8temp_intrhook(void *arg) sc->sc_sysctl_cpu[i] = SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(device_get_sysctl_tree(cpu)), OID_AUTO, "temperature", CTLTYPE_INT | CTLFLAG_RD, - dev, CORE0, k8temp_sysctl, "I", + dev, CORE0, k8temp_sysctl, "IK", "Max of sensor 0 / 1"); } } @@ -285,22 +304,23 @@ static int k8temp_sysctl(SYSCTL_HANDLER_ARGS) { device_t dev = (device_t) arg1; + struct k8temp_softc *sc = device_get_softc(dev); int error; int32_t temp, auxtemp[2]; switch (arg2) { case CORE0: - auxtemp[0] = k8temp_gettemp(dev, SENSOR0_CORE0); - auxtemp[1] = k8temp_gettemp(dev, SENSOR1_CORE0); + auxtemp[0] = sc->sc_gettemp(dev, SENSOR0_CORE0); + auxtemp[1] = sc->sc_gettemp(dev, SENSOR1_CORE0); temp = imax(auxtemp[0], auxtemp[1]); break; case CORE1: - auxtemp[0] = k8temp_gettemp(dev, SENSOR0_CORE1); - auxtemp[1] = k8temp_gettemp(dev, SENSOR1_CORE1); + auxtemp[0] = sc->sc_gettemp(dev, SENSOR0_CORE1); + auxtemp[1] = sc->sc_gettemp(dev, SENSOR1_CORE1); temp = imax(auxtemp[0], auxtemp[1]); break; default: - temp = k8temp_gettemp(dev, arg2); + temp = sc->sc_gettemp(dev, arg2); break; } error = sysctl_handle_int(oidp, &temp, 0, req); @@ -309,12 +329,12 @@ k8temp_sysctl(SYSCTL_HANDLER_ARGS) } static int32_t -k8temp_gettemp(device_t dev, k8sensor_t sensor) +k8temp_gettemp0f(device_t dev, k8sensor_t sensor) { uint8_t cfg; uint32_t temp; - cfg = pci_read_config(dev, K8TEMP_REG, 1); + cfg = pci_read_config(dev, K8TEMP_REG0F, 1); switch (sensor) { case SENSOR0_CORE0: cfg &= ~(K8TEMP_REG_SELSENSOR | K8TEMP_REG_SELCORE); @@ -334,9 +354,20 @@ k8temp_gettemp(device_t dev, k8sensor_t cfg = 0; break; } - pci_write_config(dev, K8TEMP_REG, cfg, 1); - temp = pci_read_config(dev, K8TEMP_REG, 4); - temp = ((temp >> 16) & 0xff) - K8TEMP_MINTEMP; + pci_write_config(dev, K8TEMP_REG0F, cfg, 1); + temp = pci_read_config(dev, K8TEMP_REG0F, 4); + temp = ((temp >> 16) & 0xff) * 10 + K8TEMP_OFFSET0F; return (temp); } + +static int32_t +k8temp_gettemp(device_t dev, k8sensor_t sensor) +{ + uint32_t temp; + + temp = pci_read_config(dev, K8TEMP_REG, 4); + temp = ((temp >> 21) & 0x3ff) * 10 / 8 + K8TEMP_OFFSET; + + return (temp); +}