From owner-svn-src-all@FreeBSD.ORG Wed Dec 10 10:46:59 2008 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 19E4A1065676; Wed, 10 Dec 2008 10:46:59 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 097D38FC13; Wed, 10 Dec 2008 10:46:59 +0000 (UTC) (envelope-from sobomax@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 mBAAkwXG026231; Wed, 10 Dec 2008 10:46:58 GMT (envelope-from sobomax@svn.freebsd.org) Received: (from sobomax@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBAAkwcu026230; Wed, 10 Dec 2008 10:46:58 GMT (envelope-from sobomax@svn.freebsd.org) Message-Id: <200812101046.mBAAkwcu026230@svn.freebsd.org> From: Maxim Sobolev Date: Wed, 10 Dec 2008 10:46:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r185853 - stable/6/sys/i386/cpufreq 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: Wed, 10 Dec 2008 10:46:59 -0000 Author: sobomax Date: Wed Dec 10 10:46:58 2008 New Revision: 185853 URL: http://svn.freebsd.org/changeset/base/185853 Log: MFC: Add Pentium D cores into the list that can't handle 12.5% and 25% throttle. Also, fix logic error which makes detection always negative while I am here (already fixed in current). Modified: stable/6/sys/i386/cpufreq/p4tcc.c Modified: stable/6/sys/i386/cpufreq/p4tcc.c ============================================================================== --- stable/6/sys/i386/cpufreq/p4tcc.c Wed Dec 10 10:46:34 2008 (r185852) +++ stable/6/sys/i386/cpufreq/p4tcc.c Wed Dec 10 10:46:58 2008 (r185853) @@ -164,7 +164,7 @@ p4tcc_attach(device_t dev) */ sc->auto_mode = TRUE; - switch (cpu_id & 0xf) { + switch (cpu_id & 0xff) { case 0x22: case 0x24: case 0x25: @@ -180,9 +180,11 @@ p4tcc_attach(device_t dev) case 0x0a: case 0x12: case 0x13: - /* + case 0x62: /* Pentium D B1: errata AA21 */ + case 0x64: /* Pentium D C1: errata AA21 */ + case 0x65: /* Pentium D D0: errata AA21 */ /* * These CPU models hang when set to 12.5% or 25%. - * See Errata N44 and P18l. + * See Errata N44, P18l and AA21. */ sc->set_count -= 2; break;