diff options
| author | mav <mav@FreeBSD.org> | 2009-11-17 21:00:02 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2009-11-17 21:00:02 +0000 |
| commit | 3a0f5977351f0a587f6cbe30ac15d8f28595feb4 (patch) | |
| tree | 0b674f96f9cd26734691992f97b32f82d7fa41f0 /sys/dev/siis | |
| parent | 184b7edf2319e75d49b1ed211077522ab13c6cc4 (diff) | |
| download | FreeBSD-src-3a0f5977351f0a587f6cbe30ac15d8f28595feb4.zip FreeBSD-src-3a0f5977351f0a587f6cbe30ac15d8f28595feb4.tar.gz | |
MFC r198896:
Do not unarm callout on request completion and change slot selection
algorithm as done in ahci(4). This saves some CPU time on high request
rates.
Diffstat (limited to 'sys/dev/siis')
| -rw-r--r-- | sys/dev/siis/siis.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/sys/dev/siis/siis.c b/sys/dev/siis/siis.c index 8bd813e..adc68e4 100644 --- a/sys/dev/siis/siis.c +++ b/sys/dev/siis/siis.c @@ -641,6 +641,7 @@ siis_slotsfree(device_t dev) for (i = 0; i < SIIS_MAX_SLOTS; i++) { struct siis_slot *slot = &ch->slot[i]; + callout_drain(&slot->timeout); if (slot->dma.data_map) { bus_dmamap_destroy(ch->dma.data_tag, slot->dma.data_map); slot->dma.data_map = NULL; @@ -838,15 +839,11 @@ siis_begin_transaction(device_t dev, union ccb *ccb) mtx_assert(&ch->mtx, MA_OWNED); /* Choose empty slot. */ tag = ch->lastslot; - do { - tag++; - if (tag >= SIIS_MAX_SLOTS) + while (ch->slot[tag].state != SIIS_SLOT_EMPTY) { + if (++tag >= SIIS_MAX_SLOTS) tag = 0; - if (ch->slot[tag].state == SIIS_SLOT_EMPTY) - break; - } while (tag != ch->lastslot); - if (ch->slot[tag].state != SIIS_SLOT_EMPTY) - device_printf(ch->dev, "ALL SLOTS BUSY!\n"); + KASSERT(tag != ch->lastslot, ("siis: ALL SLOTS BUSY!")); + } ch->lastslot = tag; /* Occupy chosen slot. */ slot = &ch->slot[tag]; @@ -999,6 +996,9 @@ siis_timeout(struct siis_slot *slot) struct siis_channel *ch = device_get_softc(dev); mtx_assert(&ch->mtx, MA_OWNED); + /* Check for stale timeout. */ + if (slot->state < SIIS_SLOT_RUNNING) + return; device_printf(dev, "Timeout on slot %d\n", slot->slot); device_printf(dev, "%s is %08x ss %08x rs %08x es %08x sts %08x serr %08x\n", __func__, ATA_INL(ch->r_mem, SIIS_P_IS), ATA_INL(ch->r_mem, SIIS_P_SS), ch->rslots, @@ -1024,8 +1024,6 @@ siis_end_transaction(struct siis_slot *slot, enum siis_err_type et) union ccb *ccb = slot->ccb; mtx_assert(&ch->mtx, MA_OWNED); - /* Cancel command execution timeout */ - callout_stop(&slot->timeout); bus_dmamap_sync(ch->dma.work_tag, ch->dma.work_map, BUS_DMASYNC_POSTWRITE); /* Read result registers to the result struct |
