[src/trunk]: src/sys/dev/pci Adds hw quirk for SUN firewire controllers. Fro...

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

details:   https://anonhg.NetBSD.org/src/rev/babc7cc3c03a
branches:  trunk
changeset: 754374:babc7cc3c03a
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Thu Apr 29 06:41:27 2010 +0000

description:
Adds hw quirk for SUN firewire controllers.  From FreeBSD.
  Thanks for cegger@.

diffstat:

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

diffs (47 lines):

diff -r 28936f0cfb8d -r babc7cc3c03a sys/dev/pci/fwohci_pci.c
--- a/sys/dev/pci/fwohci_pci.c  Thu Apr 29 06:32:19 2010 +0000
+++ b/sys/dev/pci/fwohci_pci.c  Thu Apr 29 06:41:27 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fwohci_pci.c,v 1.38 2010/04/24 11:26:15 kiyohara Exp $ */
+/*     $NetBSD: fwohci_pci.c,v 1.39 2010/04/29 06:41:27 kiyohara 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.38 2010/04/24 11:26:15 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.39 2010/04/29 06:41:27 kiyohara Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -99,7 +99,7 @@
        char devinfo[256];
        char const *intrstr;
        pci_intr_handle_t ih;
-       u_int32_t csr;
+       uint32_t csr;
 
        aprint_naive(": IEEE 1394 Controller\n");
 
@@ -125,8 +125,17 @@
 
        /* Enable the device. */
        csr = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
-       pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG,
-           csr | PCI_COMMAND_MASTER_ENABLE);
+       csr |= PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_MEM_ENABLE;
+       pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, csr);
+
+       /*
+        * Some Sun FireWire controllers have their intpin register
+        * bogusly set to 0, although it should be 3. Correct that.
+        */
+       if ((PCI_VENDOR(pa->pa_id) == PCI_VENDOR_SUN) &&
+           (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_SUN_FIREWIRE))
+               if (pa->pa_intrpin == 0)
+                       pa->pa_intrpin = 3;
 
        /* Map and establish the interrupt. */
        if (pci_intr_map(pa, &ih)) {