Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Make sure the interrupt-delay bit gets set on ALL descriptors,

Browse Source 
except for the one we want to force a Tx interrupt.
* Tweak the Tx descriptor accounting a little.
This commit is contained in:
thorpej 2002-05-08 21:22:20 +00:00
parent 3992641218
commit d680cf3220
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/dev/pci/if_wm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_wm.c,v 1.5 2002/05/08 19:00:27 thorpej Exp $ */
/* $NetBSD: if_wm.c,v 1.6 2002/05/08 21:22:20 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@ -1015,7 +1015,7 @@ wm_tx_cksum(struct wm_softc *sc, struct wm_txsoft *txs, uint32_t *cmdp,
t->tcpip_ipcs = ipcs;
t->tcpip_tucs = tucs;
t->tcpip_cmdlen =
htole32(WTX_CMD_DEXT | WTX_CMD_IDE | WTX_DTYP_C) | tcmd;
htole32(WTX_CMD_DEXT | WTX_DTYP_C) | tcmd;
t->tcpip_seg = 0;
WM_CDTXSYNC(sc, sc->sc_txnext, 1, BUS_DMASYNC_PREWRITE);
@ -1164,6 +1164,7 @@ wm_start(struct ifnet *ifp)
* is used to set the checksum context).
*/
txs->txs_mbuf = m0;
txs->txs_firstdesc = sc->sc_txnext;
txs->txs_ndesc = dmamap->dm_nsegs;
/*
@ -1185,6 +1186,8 @@ wm_start(struct ifnet *ifp)
cksumfields = 0;
}
cksumcmd |= htole32(WTX_CMD_IDE);
/*
* Initialize the transmit descriptor.
*/
@ -1241,6 +1244,8 @@ wm_start(struct ifnet *ifp)
}
#endif /* XXXJRT */
txs->txs_lastdesc = lasttx;
DPRINTF(WM_DEBUG_TX,
("%s: TX: desc %d: cmdlen 0x%08x\n", sc->sc_dev.dv_xname,
lasttx, sc->sc_txdescs[lasttx].wtx_cmdlen));
@ -1255,17 +1260,6 @@ wm_start(struct ifnet *ifp)
DPRINTF(WM_DEBUG_TX,
("%s: TX: TDT -> %d\n", sc->sc_dev.dv_xname, nexttx));
/*
* Remember that txdirty will be once the packet is
* done.
*
* Note: If we're doing checksum offload, we are actually
* using one descriptor before firstdesc, but it doesn't
* really matter.
*/
txs->txs_firstdesc = sc->sc_txnext;
txs->txs_lastdesc = lasttx;
DPRINTF(WM_DEBUG_TX,
("%s: TX: finished transmitting packet, job %d\n",
sc->sc_dev.dv_xname, sc->sc_txsnext));
@ -1284,7 +1278,7 @@ wm_start(struct ifnet *ifp)
#endif /* NBPFILTER > 0 */
}
if (sc->sc_txsfree == 0 || sc->sc_txfree == 0) {
if (sc->sc_txsfree == 0 || sc->sc_txfree <= 2) {
/* No more slots; notify upper layer. */
ifp->if_flags |= IFF_OACTIVE;
}