[src/trunk]: src/sys/dev/pci do not attach to Powrbook G3 onboard Firewire co...

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6cb59072b93b
branches:  trunk
changeset: 751422:6cb59072b93b
user:      macallan <macallan%NetBSD.org@localhost>
date:      Wed Feb 03 19:32:40 2010 +0000

description:
do not attach to Powrbook G3 onboard Firewire controllers until someone with
access to the hardware can figure out why it deadlocks during device
discovery

diffstat:

 sys/dev/pci/fwohci_pci.c |  14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diffs (42 lines):

diff -r fa76b0f87652 -r 6cb59072b93b sys/dev/pci/fwohci_pci.c
--- a/sys/dev/pci/fwohci_pci.c  Wed Feb 03 19:31:49 2010 +0000
+++ b/sys/dev/pci/fwohci_pci.c  Wed Feb 03 19:32:40 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fwohci_pci.c,v 1.34 2010/01/08 19:56:51 dyoung Exp $   */
+/*     $NetBSD: fwohci_pci.c,v 1.35 2010/02/03 19:32:40 macallan Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.34 2010/01/08 19:56:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.35 2010/02/03 19:32:40 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -43,6 +43,7 @@
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
+#include <dev/pci/pcidevs.h>
 #include <dev/ieee1394/fw_port.h>
 #include <dev/ieee1394/firewire.h>
 #include <dev/ieee1394/firewirereg.h>
@@ -74,6 +75,15 @@
 {
        struct pci_attach_args *pa = (struct pci_attach_args *) aux;
 
+       /*
+        * XXX
+        * Firewire controllers used in some G3 PowerBooks hang the system
+        * when trying to discover devices - don't attach to those for now
+        * until someone with the right hardware can investigate
+        */
+       if ((PCI_VENDOR(pa->pa_id) == PCI_VENDOR_APPLE) &&
+           (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_APPLE_PBG3_FW))
+           return 0;
        if (PCI_CLASS(pa->pa_class) == PCI_CLASS_SERIALBUS &&
            PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_SERIALBUS_FIREWIRE &&
            PCI_INTERFACE(pa->pa_class) == PCI_INTERFACE_OHCI)