d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFp4:

Browse Source 
After last running command completed, give commands in timeout state
second time.
This commit is contained in:
Alexander Motin 2010-02-14 12:24:12 +00:00
parent 6228bcd1ee
commit 20bbf2de82
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/dev/siis/siis.c
View File

@ -1056,6 +1056,28 @@ siis_process_timeout(device_t dev)
}
}
/* Must be called with channel locked. */
static void
siis_rearm_timeout(device_t dev)
{
struct siis_channel *ch = device_get_softc(dev);
int i;
mtx_assert(&ch->mtx, MA_OWNED);
for (i = 0; i < SIIS_MAX_SLOTS; i++) {
struct siis_slot *slot = &ch->slot[i];
/* Do we have a running request on slot? */
if (slot->state < SIIS_SLOT_RUNNING)
continue;
if ((ch->toslots & (1 << i)) == 0)
continue;
callout_reset(&slot->timeout,
(int)slot->ccb->ccb_h.timeout * hz / 1000,
(timeout_t*)siis_timeout, slot);
}
}
/* Locked by callout mechanism. */
static void
siis_timeout(struct siis_slot *slot)
@ -1216,8 +1238,9 @@ siis_end_transaction(struct siis_slot *slot, enum siis_err_type et)
siis_issue_read_log(dev);
}
/* If all the reset of commands are in timeout - abort them. */
} else if ((ch->rslots & ~ch->toslots) == 0)
siis_process_timeout(dev);
} else if ((ch->rslots & ~ch->toslots) == 0 &&
et != SIIS_ERR_TIMEOUT)
siis_rearm_timeout(dev);
}
static void