diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2020-07-26 17:44:16 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2020-07-26 17:44:16 +0000 |
| commit | 3b03ff0c33d9bcfb2f9c74c915a5a544caaa65e8 (patch) | |
| tree | 76f324e541d90026c5626f5ddd4f9be352568295 /sys | |
| parent | 35af3879a803bc52e8a54668f78817c3c9bf5640 (diff) | |
Avoid nvram lock timeout on sparc64 systems with onboard BCM5704 instances
that come without a fitted EEPROM/NVRAM.
ok deraadt@, kn@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_bge.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index 337a9795dd4..7cc69d902b9 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bge.c,v 1.391 2020/07/10 13:26:37 patrick Exp $ */ +/* $OpenBSD: if_bge.c,v 1.392 2020/07/26 17:44:15 kettenis Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -3235,7 +3235,8 @@ bge_reset(struct bge_softc *sc) write_op = bge_writereg_ind; if (BGE_ASICREV(sc->bge_chipid) != BGE_ASICREV_BCM5700 && - BGE_ASICREV(sc->bge_chipid) != BGE_ASICREV_BCM5701) { + BGE_ASICREV(sc->bge_chipid) != BGE_ASICREV_BCM5701 && + !(sc->bge_flags & BGE_NO_EEPROM)) { CSR_WRITE_4(sc, BGE_NVRAM_SWARB, BGE_NVRAMSWARB_SET1); for (i = 0; i < 8000; i++) { if (CSR_READ_4(sc, BGE_NVRAM_SWARB) & |