Module Name: src
Committed By: msaitoh
Date: Mon Apr 8 01:59:11 UTC 2013
Modified Files:
src/sys/dev/pci: if_bge.c
Log Message:
Temporary disable the NVRAM locking stuff for PR#47716.
I'll get PowerMac G5 in a few days and will fix correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.232 -r1.233 src/sys/dev/pci/if_bge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.232 src/sys/dev/pci/if_bge.c:1.233
--- src/sys/dev/pci/if_bge.c:1.232 Tue Apr 2 12:27:02 2013
+++ src/sys/dev/pci/if_bge.c Mon Apr 8 01:59:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.232 2013/04/02 12:27:02 msaitoh Exp $ */
+/* $NetBSD: if_bge.c,v 1.233 2013/04/08 01:59:11 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.232 2013/04/02 12:27:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.233 2013/04/08 01:59:11 msaitoh Exp $");
#include "vlan.h"
@@ -3539,6 +3539,7 @@ bge_attach(device_t parent, device_t sel
}
}
+#if 0
/*
* Reset NVRAM before bge_reset(). It's required to acquire NVRAM
* lock in bge_reset().
@@ -3547,6 +3548,7 @@ bge_attach(device_t parent, device_t sel
BGE_EEADDR_RESET | BGE_EEHALFCLK(BGE_HALFCLK_384SCL));
delay(1000);
BGE_SETBIT(sc, BGE_MISC_LOCAL_CTL, BGE_MLC_AUTO_EEPROM);
+#endif
bge_stop_fw(sc);
bge_sig_pre_reset(sc, BGE_RESET_START);
@@ -3899,6 +3901,7 @@ bge_reset(struct bge_softc *sc)
} else
write_op = bge_writereg_ind;
+#if 0
if ((sc->bge_flags & BGE_NO_EEPROM) == 0 &&
BGE_ASICREV(sc->bge_chipid) != BGE_ASICREV_BCM5700 &&
BGE_ASICREV(sc->bge_chipid) != BGE_ASICREV_BCM5701) {
@@ -3914,6 +3917,7 @@ bge_reset(struct bge_softc *sc)
device_xname(sc->bge_dev));
}
}
+#endif
/* Take APE lock when performing reset. */
bge_ape_lock(sc, BGE_APE_LOCK_GRC);
