svn commit: r195907 - in head/sys: amd64/amd64 i386/i386

[John Baldwin]

On Friday 31 July 2009 1:00:29 pm Sam Leffler wrote:
> Ed Schouten wrote:
> > * Rui Paulo <rpaulo at 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