diff options
author | delphij <delphij@FreeBSD.org> | 2010-06-09 21:40:38 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2010-06-09 21:40:38 +0000 |
commit | c1095acf561cb6c7c8211dfcaa7e7d5c71bd054b (patch) | |
tree | 60c8bb8ffe52055f003054cbaac9ead81b48b520 /sys/dev/twa/tw_osl_externs.h | |
parent | 5d64b894b6296859e4c90f22c946659d7f71886c (diff) | |
download | FreeBSD-src-c1095acf561cb6c7c8211dfcaa7e7d5c71bd054b.zip FreeBSD-src-c1095acf561cb6c7c8211dfcaa7e7d5c71bd054b.tar.gz |
Apply driver update from LSI. Many thanks to LSI for continuing to
support FreeBSD.
1) Timeout ioctl command timeouts.
Do not reset the controller if ioctl command completed
successfully.
2) Remove G66_WORKAROUND code (this bug never shipped).
3) Remove unnecessary interrupt lock (intr_lock).
4) Timeout firmware handshake for PChip reset (don't wait forever).
5) Handle interrupts inline.
6) Unmask command interrupt ONLY when adding a command to the pending
queue.
7) Mask command interrupt ONLY after removing the last command from
the pending queue.
8) Remove TW_OSLI_DEFERRED_INTR_USED code.
9) Replace controller "state" with separate data fields to avoid races:
TW_CLI_CTLR_STATE_ACTIVE ctlr->active
TW_CLI_CTLR_STATE_INTR_ENABLED ctlr->interrupts_enabled
TW_CLI_CTLR_STATE_INTERNAL_REQ_BUSY ctlr->internal_req_busy
TW_CLI_CTLR_STATE_GET_MORE_AENS ctlr->get_more_aens
TW_CLI_CTLR_STATE_RESET_IN_PROGRESS ctlr->reset_in_progress
TW_CLI_CTLR_STATE_RESET_PHASE1_IN_PROGRESS ctlr->reset_phase1_in_progress
10) Fix "req" leak in twa_action() when simq is frozen and req is NOT
null.
11) Replace softc "state" with separate data fields to avoid races:
TW_OSLI_CTLR_STATE_OPEN sc->open
TW_OSLI_CTLR_STATE_SIMQ_FROZEN sc->simq_frozen
12) Fix reference to TW_OSLI_REQ_FLAGS_IN_PROGRESS in
tw_osl_complete_passthru()
13) Use correct CAM status values.
Change CAM_REQ_CMP_ERR to CAM_REQ_INVALID.
Remove use of CAM_RELEASE_SIMQ for physical data addresses.
14) Do not freeze/ release the simq with non I/O commands.
When it is appropriate to temporarily freeze the simq with an I/O
command use:
xpt_freeze_simq(sim, 1);
ccb->ccb_h.status |= CAM_RELEASE_SIMQ;
otherwise use:
xpt_freeze_simq(sim, 1);
xpt_release_simq(sim, 1);
Submitted by: Tom Couch <tom.couch lsi.com>
PR: kern/147695
MFC after: 3 days
Diffstat (limited to 'sys/dev/twa/tw_osl_externs.h')
-rw-r--r-- | sys/dev/twa/tw_osl_externs.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/twa/tw_osl_externs.h b/sys/dev/twa/tw_osl_externs.h index e46c2d2..08963e5 100644 --- a/sys/dev/twa/tw_osl_externs.h +++ b/sys/dev/twa/tw_osl_externs.h @@ -79,11 +79,9 @@ extern TW_VOID tw_osli_cam_detach(struct twa_softc *sc); /* Request CAM for a bus scan. */ extern TW_INT32 tw_osli_request_bus_scan(struct twa_softc *sc); -/* Unfreeze ccb flow from CAM. */ -extern TW_VOID tw_osli_allow_new_requests(struct twa_softc *sc, TW_VOID *ccb); - /* Freeze ccb flow from CAM. */ -extern TW_VOID tw_osli_disallow_new_requests(struct twa_softc *sc); +extern TW_VOID tw_osli_disallow_new_requests(struct twa_softc *sc, + struct tw_cl_req_handle *req_handle); /* OSL's completion routine for SCSI I/O's. */ extern TW_VOID tw_osl_complete_io(struct tw_cl_req_handle *req_handle); |