diff options
| author | Gerhard Roth <gerhard@cvs.openbsd.org> | 2012-09-18 14:49:45 +0000 |
|---|---|---|
| committer | Gerhard Roth <gerhard@cvs.openbsd.org> | 2012-09-18 14:49:45 +0000 |
| commit | 562a1c010a38a90ebaa16b32fc212eb73b1c1c80 (patch) | |
| tree | b4469570bc343f7b8fc58359eca05d1adf2c2e91 /sys | |
| parent | 9c2027d84e17e5ebe5f48d8d85236efe74e23c7b (diff) | |
Wait until all xfers have finished before giving up DMA buffer mappings.
ok deraadt@, mikeb@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_vr.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index 2d86021014d..723382c57b4 100644 --- a/sys/dev/pci/if_vr.c +++ b/sys/dev/pci/if_vr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vr.c,v 1.114 2012/01/30 09:11:30 sthen Exp $ */ +/* $OpenBSD: if_vr.c,v 1.115 2012/09/18 14:49:44 gerhard Exp $ */ /* * Copyright (c) 1997, 1998 @@ -1542,6 +1542,17 @@ vr_stop(struct vr_softc *sc) VR_SETBIT16(sc, VR_COMMAND, VR_CMD_STOP); VR_CLRBIT16(sc, VR_COMMAND, (VR_CMD_RX_ON|VR_CMD_TX_ON)); + + /* wait for xfers to shutdown */ + for (i = VR_TIMEOUT; i > 0; i--) { + DELAY(10); + if (!(CSR_READ_2(sc, VR_COMMAND) & (VR_CMD_TX_ON|VR_CMD_RX_ON))) + break; + } +#ifdef VR_DEBUG + if (i == 0) + printf("%s: rx shutdown error!\n", sc->sc_dev.dv_xname); +#endif CSR_WRITE_2(sc, VR_IMR, 0x0000); CSR_WRITE_4(sc, VR_TXADDR, 0x00000000); CSR_WRITE_4(sc, VR_RXADDR, 0x00000000); |