From owner-freebsd-bugs@FreeBSD.ORG Wed Jan 23 04:20:00 2013 Return-Path: Delivered-To: freebsd-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 95CF9856 for ; Wed, 23 Jan 2013 04:20:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 7BAF2876 for ; Wed, 23 Jan 2013 04:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r0N4K0IM039162 for ; Wed, 23 Jan 2013 04:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r0N4K05J039161; Wed, 23 Jan 2013 04:20:00 GMT (envelope-from gnats) Resent-Date: Wed, 23 Jan 2013 04:20:00 GMT Resent-Message-Id: <201301230420.r0N4K05J039161@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Aleksandr Mishunin Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 9E128841 for ; Wed, 23 Jan 2013 04:16:03 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 7EA4386C for ; Wed, 23 Jan 2013 04:16:03 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r0N4G3pI079930 for ; Wed, 23 Jan 2013 04:16:03 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id r0N4G3cx079929; Wed, 23 Jan 2013 04:16:03 GMT (envelope-from nobody) Message-Id: <201301230416.r0N4G3cx079929@red.freebsd.org> Date: Wed, 23 Jan 2013 04:16:03 GMT From: Aleksandr Mishunin To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: kern/175522: VIA cpu's temperature monitoring module X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jan 2013 04:20:00 -0000 >Number: 175522 >Category: kern >Synopsis: VIA cpu's temperature monitoring module >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jan 23 04:20:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Aleksandr Mishunin >Release: >Organization: >Environment: >Description: /usr/src/sys/dev/viatemp/viatemp.c /usr/src/sys/dev/modules/viatemp/Makefile .PATH: ${.CURDIR}/../../dev/viatemp KMOD= viatemp SRCS= viatemp.c bus_if.h device_if.h .include >How-To-Repeat: >Fix: Patch attached with submission follows: /* Copyright (c) 2012, Aleksandr Mishunin 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. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 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 COPYRIGHT OWNER 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. The views and conclusions contained in the software and documentation are those of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ /* based on coretemp and linux via-cputemp */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #define THERM_VIA 0x1169 #define THERM_VIA_NANO 0x1423 struct viatemp_softc { device_t sc_dev; int sc_msr; }; static void viatemp_identify(driver_t *driver, device_t parent); static int viatemp_probe(device_t dev); static int viatemp_attach(device_t dev); static int viatemp_detach(device_t dev); static uint64_t viatemp_get_thermal_msr(int cpu,int msrreg); static int viatemp_get_val_sysctl(SYSCTL_HANDLER_ARGS); static device_method_t viatemp_methods[] = { DEVMETHOD(device_identify, viatemp_identify), DEVMETHOD(device_probe, viatemp_probe), DEVMETHOD(device_attach, viatemp_attach), DEVMETHOD(device_detach, viatemp_detach), {0, 0} }; static driver_t viatemp_driver = { "viatemp", viatemp_methods, sizeof(struct viatemp_softc), }; enum therm_info { viaTEMP_TEMP }; static devclass_t viatemp_devclass; DRIVER_MODULE(viatemp, cpu, viatemp_driver, viatemp_devclass, NULL, NULL); static void viatemp_identify(driver_t *driver, device_t parent) { device_t child; if (device_find_child(parent, "viatemp", -1) != NULL) return; if (CPUID_TO_MODEL(cpu_id) < 0xa || cpu_vendor_id != CPU_VENDOR_IDT) return; child = device_add_child(parent, "viatemp", -1); if (child == NULL) device_printf(parent, "add viatemp child failed\n"); } static int viatemp_probe(device_t dev) { if (resource_disabled("viatemp", 0)) return (ENXIO); device_set_desc(dev, "VIA CPU Thermal Sensor"); return (BUS_PROBE_GENERIC); } static int viatemp_attach(device_t dev) { struct viatemp_softc *sc = device_get_softc(dev); device_t pdev; int cpu_model; struct sysctl_oid *oid; struct sysctl_ctx_list *ctx; sc->sc_dev = dev; pdev = device_get_parent(dev); cpu_model = CPUID_TO_MODEL(cpu_id); switch (cpu_model) { case 0xA: case 0xD: sc->sc_msr = THERM_VIA; break; case 0xF: sc->sc_msr = THERM_VIA_NANO; break; default: return (ENXIO); break; } ctx = device_get_sysctl_ctx(dev); oid = SYSCTL_ADD_NODE(ctx, SYSCTL_CHILDREN(device_get_sysctl_tree(pdev)), OID_AUTO, "viatemp", CTLFLAG_RD, NULL, "VIA CPU temperature"); SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(device_get_sysctl_tree(pdev)), OID_AUTO, "temperature", CTLTYPE_INT | CTLFLAG_RD, dev, viaTEMP_TEMP, viatemp_get_val_sysctl, "IK", "Current temperature"); return (0); } static int viatemp_detach(device_t dev) { return (0); } static uint64_t viatemp_get_thermal_msr(int cpu,int msrreg) { uint64_t msr; thread_lock(curthread); sched_bind(curthread, cpu); thread_unlock(curthread); msr = rdmsr(msrreg); thread_lock(curthread); sched_unbind(curthread); thread_unlock(curthread); return (msr); } static int viatemp_get_val_sysctl(SYSCTL_HANDLER_ARGS) { device_t dev; uint64_t msr; int val , tmp; struct viatemp_softc *sc; enum therm_info type; dev = (device_t) arg1; sc = device_get_softc(dev); tmp = sc->sc_msr; msr = viatemp_get_thermal_msr(device_get_unit(dev), tmp); type = arg2; switch (type) { case viaTEMP_TEMP: val = msr * 10 + 2732; break; } return (sysctl_handle_int(oidp, &val, 0, req)); } >Release-Note: >Audit-Trail: >Unformatted: