[src/trunk]: src/sys/dev/pci the BCM5785 is a PCIe chip but does not report P...

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

details:   https://anonhg.NetBSD.org/src/rev/4e131a24d159
branches:  trunk
changeset: 765891:4e131a24d159
user:      cegger <cegger%NetBSD.org@localhost>
date:      Thu Jun 09 12:04:29 2011 +0000

description:
the BCM5785 is a PCIe chip but does not report PCIe capabilities.
Check for this chip explicitely and enable PCIe.
Fixes 'firmware handshake timeout'. Tested with root on nfs.

patch from msaitoh@

diffstat:

 sys/dev/pci/if_bge.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 570ceaa56798 -r 4e131a24d159 sys/dev/pci/if_bge.c
--- a/sys/dev/pci/if_bge.c      Thu Jun 09 07:17:02 2011 +0000
+++ b/sys/dev/pci/if_bge.c      Thu Jun 09 12:04:29 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bge.c,v 1.197 2011/06/03 09:51:40 cegger Exp $      */
+/*     $NetBSD: if_bge.c,v 1.198 2011/06/09 12:04:29 cegger Exp $      */
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.197 2011/06/03 09:51:40 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.198 2011/06/09 12:04:29 cegger Exp $");
 
 #include "vlan.h"
 #include "rnd.h"
@@ -2617,8 +2617,9 @@
                            BGE_PCI_PRODID_ASICREV);
        }
 
-       if (pci_get_capability(sc->sc_pc, sc->sc_pcitag, PCI_CAP_PCIEXPRESS,
-               &sc->bge_pciecap, NULL) != 0) {
+       if ((pci_get_capability(sc->sc_pc, sc->sc_pcitag, PCI_CAP_PCIEXPRESS,
+               &sc->bge_pciecap, NULL) != 0)
+           || (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5785)) {
                /* PCIe */
                sc->bge_flags |= BGE_PCIE;
                bge_set_max_readrq(sc);