Author: nwhitehorn
Date: Mon Oct 29 14:27:28 2012
New Revision: 242315
URL: http://svn.freebsd.org/changeset/base/242315

Log:
  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.
  
  MFC after:    3 days

Modified:
  head/sys/powerpc/powermac/openpic_macio.c

Modified: head/sys/powerpc/powermac/openpic_macio.c
==============================================================================
--- head/sys/powerpc/powermac/openpic_macio.c   Mon Oct 29 14:18:54 2012        
(r242314)
+++ head/sys/powerpc/powermac/openpic_macio.c   Mon Oct 29 14:27:28 2012        
(r242315)
@@ -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);
 }
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to