Date: Tue, 6 Nov 2012 21:54:45 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r242678 - stable/9/sys/powerpc/powermac Message-ID: <201211062154.qA6LsjlM061656@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nwhitehorn Date: Tue Nov 6 21:54:45 2012 New Revision: 242678 URL: http://svnweb.freebsd.org/changeset/base/242678 Log: MFC r242315: Work around broken device tree on last-generation PowerPC iMacs (PowerMac12,1), which have a mac-io MPIC cell that indifies itself as the root PIC despite the actual root PIC being on the northbridge. No CPC945 systems have a mac-io PIC that does anything so just don't attach on CPC945 (U4) systems. Modified: stable/9/sys/powerpc/powermac/openpic_macio.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/powerpc/powermac/openpic_macio.c ============================================================================== --- stable/9/sys/powerpc/powermac/openpic_macio.c Tue Nov 6 21:53:17 2012 (r242677) +++ stable/9/sys/powerpc/powermac/openpic_macio.c Tue Nov 6 21:54:45 2012 (r242678) @@ -94,6 +94,10 @@ openpic_macio_probe(device_t dev) if (strcmp(type, "open-pic") != 0) return (ENXIO); + /* On some U4 systems, there is a phantom MPIC in the mac-io cell */ + if (OF_finddevice("/u4") != (phandle_t)-1) + return (ENXIO); + device_set_desc(dev, OPENPIC_DEVSTR); return (0); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211062154.qA6LsjlM061656>