[PATCH] firewire: ohci: do not bind to Pinnacle or Fujitsu HCI, prevent panic

[Stefan Richter <stefanr@s5r6.in-berlin.de>]

When firewire-ohci is bound to a Pinnacle MovieBoard, eventually a
"Register access failure" is logged and an interrupt storm or a kernel
panic happens.  https://bugzilla.kernel.org/show_bug.cgi?id=36622

Until this is sorted out (if that is going to succeed at all), let's
just prevent firewire-ohci from touching these devices.

This device with link layer PCI IDs 11bd:0015 and 1394 PHY IDs
00000e:086613 is apparently a Fujitsu MB86613 --- hence the PHY IDs.
Therefore, blacklist the MB86613 too (PCI IDs 10cf:200c).  We only check
the vendor ID because there is no other Fujitsu OHCI-1394 PCI device
known besides this one.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Cc: <stable@kernel.org>
---
Supersedes patch "firewire: ohci: do not bind to Pinnacle cards, prevent panic"

 drivers/firewire/ohci.c |    8 ++++++++
 1 file changed, 8 insertions(+)

Index: b/drivers/firewire/ohci.c
===================================================================
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -260,6 +260,8 @@ static inline struct fw_ohci *fw_ohci(st
 
 static char ohci_driver_name[] = KBUILD_MODNAME;
 
+#define PCI_VENDOR_ID_FUJITSU		0x10cf
+#define PCI_VENDOR_ID_PINNACLE_SYSTEMS	0x11bd
 #define PCI_DEVICE_ID_AGERE_FW643	0x5901
 #define PCI_DEVICE_ID_JMICRON_JMB38X_FW	0x2380
 #define PCI_DEVICE_ID_TI_TSB12LV22	0x8009
@@ -3202,6 +3204,12 @@ static int __devinit pci_probe(struct pc
 	int i, err;
 	size_t size;
 
+	if (dev->vendor == PCI_VENDOR_ID_FUJITSU ||
+	    dev->vendor == PCI_VENDOR_ID_PINNACLE_SYSTEMS) {
+		dev_err(&dev->dev, "Controller type is not yet supported\n");
+		return -ENOSYS;
+	}
+
 	ohci = kzalloc(sizeof(*ohci), GFP_KERNEL);
 	if (ohci == NULL) {
 		err = -ENOMEM;


-- 
Stefan Richter
-=====-==-== -=== -=-==
http://arcgraph.de/sr/