system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-15 12:54:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Break out atse_intr() into two separate routines, one for each of the two

Browse source 
interrupt sources: receive and transmit.  For now, retain an
atse_start_locked() in the receive-interrupt path to reduce latency in
certain cases.  After we adjust FIFO behaviour, we can hopefully drop
this.
This commit is contained in:
Robert N. M. Watson 2014-07-21 21:28:11 +00:00
parent 20b39086cc
commit e18953174a
1 changed files with 42 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
sys/dev/altera/atse/if_atse.c
View file

@ -1318,11 +1318,11 @@ atse_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
}
static void
atse_intr(void *arg)
atse_rx_intr(void *arg)
{
struct atse_softc *sc;
struct ifnet *ifp;
uint32_t rx, tx;
uint32_t rx;
sc = (struct atse_softc *)arg;
ifp = sc->atse_ifp;
@ -1336,10 +1336,8 @@ atse_intr(void *arg)
#endif
ATSE_RX_INTR_DISABLE(sc);
ATSE_TX_INTR_DISABLE(sc);
rx = ATSE_RX_EVENT_READ(sc);
tx = ATSE_TX_EVENT_READ(sc);
if (rx != 0) {
if (rx & (A_ONCHIP_FIFO_MEM_CORE_EVENT_OVERFLOW|
A_ONCHIP_FIFO_MEM_CORE_EVENT_UNDERFLOW)) {
@ -1356,6 +1354,42 @@ atse_intr(void *arg)
atse_rx_locked(sc);
}
}
/*
* XXXRW: What is the correct race-free way to interact with the
* event / interrupt masks in atse here? It seems likely that at
* least atse_start_locked() should be pre-clear/enable?
*/
/* Clear events before re-enabling intrs. */
ATSE_RX_EVENT_CLEAR(sc);
/* Re-enable interrupts. */
if (ifp->if_drv_flags & IFF_DRV_RUNNING)
ATSE_RX_INTR_ENABLE(sc);
ATSE_UNLOCK(sc);
}
static void
atse_tx_intr(void *arg)
{
struct atse_softc *sc;
struct ifnet *ifp;
uint32_t tx;
sc = (struct atse_softc *)arg;
ifp = sc->atse_ifp;
ATSE_LOCK(sc);
#ifdef DEVICE_POLLING
if (ifp->if_capenable & IFCAP_POLLING) {
ATSE_UNLOCK(sc);
return;
}
#endif
ATSE_TX_INTR_DISABLE(sc);
tx = ATSE_TX_EVENT_READ(sc);
if (tx != 0) {
/* XXX-BZ build histogram. */
if (tx & (A_ONCHIP_FIFO_MEM_CORE_EVENT_OVERFLOW|
@ -1379,17 +1413,12 @@ atse_intr(void *arg)
*/
/* Clear events before re-enabling intrs. */
ATSE_TX_EVENT_CLEAR(sc);
ATSE_RX_EVENT_CLEAR(sc);
/* Re-enable interrupts. */
if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
/* Re-enable interrupts. */
ATSE_RX_INTR_ENABLE(sc);
atse_start_locked(ifp);
ATSE_TX_INTR_ENABLE(sc);
if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
atse_start_locked(ifp);
}
ATSE_UNLOCK(sc);
}
@ -1727,7 +1756,7 @@ atse_attach(device_t dev)
/* Hook up interrupts. */
if (sc->atse_rx_irq_res != NULL) {
error = bus_setup_intr(dev, sc->atse_rx_irq_res, INTR_TYPE_NET |
INTR_MPSAFE, NULL, atse_intr, sc, &sc->atse_rx_intrhand);
INTR_MPSAFE, NULL, atse_rx_intr, sc, &sc->atse_rx_intrhand);
if (error != 0) {
device_printf(dev, "enabling RX IRQ failed\n");
ether_ifdetach(ifp);
@ -1737,7 +1766,7 @@ atse_attach(device_t dev)
if (sc->atse_tx_irq_res != NULL) {
error = bus_setup_intr(dev, sc->atse_tx_irq_res, INTR_TYPE_NET |
INTR_MPSAFE, NULL, atse_intr, sc, &sc->atse_tx_intrhand);
INTR_MPSAFE, NULL, atse_tx_intr, sc, &sc->atse_tx_intrhand);
if (error != 0) {
bus_teardown_intr(dev, sc->atse_rx_irq_res,
sc->atse_rx_intrhand);