diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2000-11-17 17:38:33 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2000-11-17 17:38:33 +0000 |
| commit | 2b74c79fee78cb336722779bf7bf4cf9eb3d1a82 (patch) | |
| tree | 2d5e03733467188349a53c8b99c93486ba15e398 /sys/arch/sparc/dev | |
| parent | b9b79a8b630af0b7eaa264898faa182f895f3605 (diff) | |
seems the qe/mace combination needs a delay between accesses to the
two chips. Better fix for the NMI problem.
Diffstat (limited to 'sys/arch/sparc/dev')
| -rw-r--r-- | sys/arch/sparc/dev/qe.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/arch/sparc/dev/qe.c b/sys/arch/sparc/dev/qe.c index ee6d01da48f..2404679e761 100644 --- a/sys/arch/sparc/dev/qe.c +++ b/sys/arch/sparc/dev/qe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qe.c,v 1.12 2000/11/16 19:31:10 jason Exp $ */ +/* $OpenBSD: qe.c,v 1.13 2000/11/17 17:38:32 jason Exp $ */ /* * Copyright (c) 1998, 2000 Jason L. Wright. @@ -734,11 +734,12 @@ qeinit(sc) cr->rxwbufptr = cr->rxrbufptr = sc->sc_channel * qec->sc_msize; cr->txwbufptr = cr->txrbufptr = cr->rxrbufptr + qec->sc_rsize; - for (i = 500; i > 0; i--) { - if ((mr->biucc & QE_MR_BIUCC_SWRST) == 0) - break; - DELAY(10); - } + /* + * When switching from mace<->qec always guarantee an sbus + * turnaround (if last op was read, perform a dummy write, and + * vice versa). + */ + i = cr->qmask; /* dummy */ mr->biucc = QE_MR_BIUCC_BSWAP | QE_MR_BIUCC_64TS; mr->fifofc = QE_MR_FIFOCC_TXF16 | QE_MR_FIFOCC_RXF32 | @@ -766,7 +767,7 @@ qeinit(sc) qe_mcreset(sc); mr->iac = 0; - i = mr->mpc; + i = mr->mpc; /* cleared on read */ ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; |