diff options
| author | msaitoh <msaitoh@NetBSD.org> | 2013-04-02 12:27:02 +0000 |
|---|---|---|
| committer | msaitoh <msaitoh@NetBSD.org> | 2013-04-02 12:27:02 +0000 |
| commit | 8171ff3fc6a0a15ea181c2bfb36706951d10c873 (patch) | |
| tree | 9c875e92fbc8542cee009b5710d10fd89055ae7d /sys/dev | |
| parent | 375b6dffbef3b498092397e3c68c64698ddc515f (diff) | |
Fix a bug that the NVRAM lock timeout occured on sparc64 onboard bge.
Tested by martin.
- Don't acquire NVRAM lock if no EEPROM(or NVRAM?).
- Reset NVRAM before bge_reset(). It's required to acquire NVRAM lock in
bge_reset().
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_bge.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index 1bb55bba160..1e715f7dcfd 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.231 2013/04/02 10:12:22 msaitoh Exp $ */ +/* $NetBSD: if_bge.c,v 1.232 2013/04/02 12:27:02 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.231 2013/04/02 10:12:22 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.232 2013/04/02 12:27:02 msaitoh Exp $"); #include "vlan.h" @@ -3539,6 +3539,15 @@ bge_attach(device_t parent, device_t self, void *aux) } } + /* + * Reset NVRAM before bge_reset(). It's required to acquire NVRAM + * lock in bge_reset(). + */ + CSR_WRITE_4(sc, BGE_EE_ADDR, + BGE_EEADDR_RESET | BGE_EEHALFCLK(BGE_HALFCLK_384SCL)); + delay(1000); + BGE_SETBIT(sc, BGE_MISC_LOCAL_CTL, BGE_MLC_AUTO_EEPROM); + bge_stop_fw(sc); bge_sig_pre_reset(sc, BGE_RESET_START); if (bge_reset(sc)) @@ -3890,7 +3899,8 @@ bge_reset(struct bge_softc *sc) } else write_op = bge_writereg_ind; - if (BGE_ASICREV(sc->bge_chipid) != BGE_ASICREV_BCM5700 && + if ((sc->bge_flags & BGE_NO_EEPROM) == 0 && + BGE_ASICREV(sc->bge_chipid) != BGE_ASICREV_BCM5700 && BGE_ASICREV(sc->bge_chipid) != BGE_ASICREV_BCM5701) { CSR_WRITE_4(sc, BGE_NVRAM_SWARB, BGE_NVRAMSWARB_SET1); for (i = 0; i < 8000; i++) { |
