diff options
| author | mjacob <mjacob@FreeBSD.org> | 2006-02-26 07:44:31 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 2006-02-26 07:44:31 +0000 |
| commit | cca241c522a48822ec36d9bcfd5bf8d65821fccf (patch) | |
| tree | b93809731cd88d8303a2eb6d239c1da1ca045e8a /sys | |
| parent | 7dec5978c15992be13c830f1fe18eb0eacd7b2ca (diff) | |
| download | FreeBSD-src-cca241c522a48822ec36d9bcfd5bf8d65821fccf.zip FreeBSD-src-cca241c522a48822ec36d9bcfd5bf8d65821fccf.tar.gz | |
a) Delay for port enable to succeed should be 30 seconds (at least) for
*both* SAS and FC, not just SAS.
b) Don't tell the chip we want it to do FIFO signalling if we actually
don't set up the address where the FIFO signal is supposed to be written
(oops).
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/mpt/mpt.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/mpt/mpt.c b/sys/dev/mpt/mpt.c index f687cc1..86fe96b 100644 --- a/sys/dev/mpt/mpt.c +++ b/sys/dev/mpt/mpt.c @@ -1308,9 +1308,6 @@ mpt_send_ioc_init(struct mpt_softc *mpt, uint32_t who) init.HeaderVersion = htole16(MPI_HEADER_VERSION); init.ReplyFrameSize = htole16(MPT_REPLY_SIZE); init.MsgContext = htole32(MPT_REPLY_HANDLER_HANDSHAKE); - if (mpt->ioc_facts_flags & MPI_IOCFACTS_FLAGS_REPLY_FIFO_HOST_SIGNAL) { - init.Flags |= MPI_IOCINIT_FLAGS_REPLY_FIFO_HOST_SIGNAL; - } if ((error = mpt_send_handshake_cmd(mpt, sizeof init, &init)) != 0) { return(error); @@ -1886,7 +1883,8 @@ mpt_send_port_enable(struct mpt_softc *mpt, int port) mpt_send_cmd(mpt, req); error = mpt_wait_req(mpt, req, REQ_STATE_DONE, REQ_STATE_DONE, - /*sleep_ok*/FALSE, /*time_ms*/mpt->is_sas? 30000 : 3000); + /*sleep_ok*/FALSE, + /*time_ms*/(mpt->is_sas || mpt->is_fc)? 30000 : 3000); if (error != 0) { mpt_prt(mpt, "port enable timed out\n"); return (-1); |
