diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2004-12-17 03:14:00 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2004-12-17 03:14:00 +0000 |
| commit | 4bce6db1ff2ba60d4beed75c1faeb702c25f9876 (patch) | |
| tree | 4ddddee51682f10b364d73ea9bf5700f9129d121 /sys/dev/pci/if_bge.c | |
| parent | 23b9033345d4e6f69b43263c883ed9e27e333c28 (diff) | |
rev 1.62
Possibloe fix for some bge chip revisions taking a long time to reset
(e.g., polling for a half-second or more at splnet(), blocking most
interrupts, durin an ifconfig down/ifconfig up).
Appears to help for a 5704C rev A3, which is the only chip I've
ever seen that had even a mild version of the reported problem.
rev 1.61
Check for BGE_PCI_PCISTATE register failing to revert on reset.
if it occurs, print a message indicating why the reset took so long.
From NetBSD
Diffstat (limited to 'sys/dev/pci/if_bge.c')
| -rw-r--r-- | sys/dev/pci/if_bge.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index 12a9fbe8d62..8fe793ca27d 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.44 2004/12/16 14:30:31 brad Exp $ */ +/* $OpenBSD: if_bge.c,v 1.45 2004/12/17 03:13:59 brad Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2001 @@ -2053,7 +2053,7 @@ bge_reset(sc) struct bge_softc *sc; { struct pci_attach_args *pa = &sc->bge_pa; - u_int32_t cachesize, command, pcistate, reset; + u_int32_t cachesize, command, pcistate, new_pcistate, reset; int i, val = 0; /* Save some important PCI state. */ @@ -2113,6 +2113,7 @@ bge_reset(sc) * general communications memory at 0xB50. */ bge_writemem_ind(sc, BGE_SOFTWARE_GENCOMM, BGE_MAGIC_NUMBER); + /* * Poll the value location we just wrote until * we see the 1's complement of the magic number. @@ -2141,11 +2142,18 @@ bge_reset(sc) * results. */ for (i = 0; i < BGE_TIMEOUT; i++) { - if (pci_conf_read(pa->pa_pc, pa->pa_tag, BGE_PCI_PCISTATE) == - pcistate) + new_pcistate = pci_conf_read(pa->pa_pc, pa->pa_tag, + BGE_PCI_PCISTATE); + if ((new_pcistate & ~BGE_PCISTATE_RESERVED) == + (pcistate & ~BGE_PCISTATE_RESERVED)) break; DELAY(10); } + if ((new_pcistate & ~BGE_PCISTATE_RESERVED) != + (pcistate & ~BGE_PCISTATE_RESERVED)) { + printf("%s: pcistate failed to revert\n", + sc->bge_dev.dv_xname); + } /* Fix up byte swapping */ CSR_WRITE_4(sc, BGE_MODE_CTL, BGE_MODECTL_BYTESWAP_NONFRAME| |