From owner-svn-src-head@FreeBSD.ORG  Fri Jul 31 17:30:20 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D557B106566C;
	Fri, 31 Jul 2009 17:30:20 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42])
	by mx1.freebsd.org (Postfix) with ESMTP id A5DE78FC1D;
	Fri, 31 Jul 2009 17:30:20 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net
	[66.111.2.69])
	by cyrus.watson.org (Postfix) with ESMTPSA id 5B7F346B46;
	Fri, 31 Jul 2009 13:30:20 -0400 (EDT)
Received: from jhbbsd.hudson-trading.com (unknown [209.249.190.8])
	by bigwig.baldwin.cx (Postfix) with ESMTPA id ACE2E8A0A5;
	Fri, 31 Jul 2009 13:30:19 -0400 (EDT)
From: John Baldwin <jhb@freebsd.org>
To: Sam Leffler <sam@errno.com>
Date: Fri, 31 Jul 2009 13:28:27 -0400
User-Agent: KMail/1.9.7
References: <200907271351.n6RDptNX002239@svn.freebsd.org>
	<20090731150328.GN1292@hoeg.nl> <4A73232D.8050605@errno.com>
In-Reply-To: <4A73232D.8050605@errno.com>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200907311328.28681.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1
	(bigwig.baldwin.cx); Fri, 31 Jul 2009 13:30:19 -0400 (EDT)
X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx
X-Virus-Status: Clean
X-Spam-Status: No, score=-2.5 required=4.2 tests=AWL,BAYES_00,RDNS_NONE
	autolearn=no version=3.2.5
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx
Cc: svn-src-head@freebsd.org, Ed Schouten <ed@80386.nl>,
	svn-src-all@freebsd.org, src-committers@freebsd.org,
	Rui Paulo <rpaulo@freebsd.org>
Subject: Re: svn commit: r195907 - in head/sys: amd64/amd64 i386/i386
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Jul 2009 17:30:21 -0000

On Friday 31 July 2009 1:00:29 pm Sam Leffler wrote:
> Ed Schouten wrote:
> > * Rui Paulo <rpaulo@FreeBSD.org> wrote:
> >> Refine the MacBook hack to only match early models that have Intel ICH.
> > ...
> >> -		if (strncmp(sysenv, "MacBook", 7) == 0) {
> >> +		if (strncmp(sysenv, "MacBook1,1", 10) == 0 ||
> >> +		    strncmp(sysenv, "MacBookPro1,1", 13) == 0 ||
> >> +		    strncmp(sysenv, "MacBookPro1,2", 13) == 0 ||
> >> +		    strncmp(sysenv, "Macmini1,1", 10) == 0) {
> > 
> > Yay -- this change broke FreeBSD on my MacBook3,1. Could we please add
> > MacBook3,1 to this list before releasing 8.0?
> > 
> 
> A hack like this deserves a loader tunable to set the list or, perhaps 
> easier, an extra model ID to allow workaround w/o rebuilding (e.g. for 
> doing an install).

Or just a tunable to force it on: 'machdep.disable_ich_smi' or some such.  
Note that different ICH store PMBASE in different places.  It's in a 
different register in the ICH10 for example (PCI config register 0x44 vs 0x40 
on older ICHs).

-- 
John Baldwin