[src/trunk]: src/sys/dev/pci Stopgap: disable access to BGE_SRAM_DATA_SIG, it...

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

details:   https://anonhg.NetBSD.org/src/rev/c74ed72591d6
branches:  trunk
changeset: 786918:c74ed72591d6
user:      martin <martin%NetBSD.org@localhost>
date:      Tue May 21 06:59:28 2013 +0000

description:
Stopgap: disable access to BGE_SRAM_DATA_SIG, it is not implemented in all
variants and access may crash the kernel.
msaitoh: please fix properly, I have no idea how.

diffstat:

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

diffs (36 lines):

diff -r 89c38f0b8bc6 -r c74ed72591d6 sys/dev/pci/if_bge.c
--- a/sys/dev/pci/if_bge.c      Mon May 20 20:27:43 2013 +0000
+++ b/sys/dev/pci/if_bge.c      Tue May 21 06:59:28 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bge.c,v 1.244 2013/05/13 17:10:58 msaitoh Exp $     */
+/*     $NetBSD: if_bge.c,v 1.245 2013/05/21 06:59:28 martin Exp $      */
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.244 2013/05/13 17:10:58 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.245 2013/05/21 06:59:28 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -3584,7 +3584,7 @@
 
        sc->bge_asf_mode = 0;
        /* No ASF if APE present. */
-       if ((sc->bge_flags & BGE_APE) == 0) {
+       if (0 && (sc->bge_flags & BGE_APE) == 0) {
                if (bge_allow_asf && (bge_readmem_ind(sc, BGE_SRAM_DATA_SIG) ==
                        BGE_SRAM_DATA_SIG_MAGIC)) {
                        if (bge_readmem_ind(sc, BGE_SRAM_DATA_CFG) &
@@ -3609,7 +3609,7 @@
         * Note: on some BCM5700 cards, this value appears to be unset.
         */
        hwcfg = hwcfg2 = hwcfg3 = hwcfg4 = 0;
-       if (bge_readmem_ind(sc, BGE_SRAM_DATA_SIG) ==
+       if (0 && bge_readmem_ind(sc, BGE_SRAM_DATA_SIG) ==
            BGE_SRAM_DATA_SIG_MAGIC) {
                uint32_t tmp;