summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2013-05-21 06:59:28 +0000
committermartin <martin@NetBSD.org>2013-05-21 06:59:28 +0000
commitbfc5471276134ffbc5bf615a03df9eb96d83dc2a (patch)
tree26c2c19247a881e9ef593820244f3db1ecbb3b08 /sys/dev
parente0e05de990c1d1bde3d7b2290a6724d09ef213c2 (diff)
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 (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_bge.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index 22d30836464..1ddbd512fed 100644
--- a/sys/dev/pci/if_bge.c
+++ b/sys/dev/pci/if_bge.c
@@ -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 @@ bge_attach(device_t parent, device_t self, void *aux)
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 @@ bge_attach(device_t parent, device_t self, void *aux)
* 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;