diff options
author | mav <mav@FreeBSD.org> | 2015-11-30 21:30:56 +0000 |
---|---|---|
committer | mav <mav@FreeBSD.org> | 2015-11-30 21:30:56 +0000 |
commit | e12b26f1bf9c91199bf6554843d62f045d0cbc3e (patch) | |
tree | b5b950642c89a2194b5d29eda34f8fab3227f498 /sys/dev | |
parent | 3ba9f5d050ff37c66f41240b50f21e498c5de1eb (diff) | |
download | FreeBSD-src-e12b26f1bf9c91199bf6554843d62f045d0cbc3e.zip FreeBSD-src-e12b26f1bf9c91199bf6554843d62f045d0cbc3e.tar.gz |
MFC r290159: Remove reset delays for which I see neither explanation nor need.
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/isp/isp.c | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c index fb8e717..2ca5504 100644 --- a/sys/dev/isp/isp.c +++ b/sys/dev/isp/isp.c @@ -1011,33 +1011,15 @@ isp_reset(ispsoftc_t *isp, int do_load_defaults) } } - /* - * Give it a chance to finish starting up. - * Give the 24XX more time. - */ - if (IS_24XX(isp)) { - ISP_DELAY(500000); + if (IS_SCSI(isp)) { /* - * Check to see if the 24XX firmware really started. + * Set CLOCK RATE, but only if asked to. */ - if (mbs.param[1] == 0xdead) { - isp_prt(isp, ISP_LOGERR, "f/w didn't *really* start"); - ISP_RESET0(isp); - return; - } - } else { - ISP_DELAY(250000); - if (IS_SCSI(isp)) { - /* - * Set CLOCK RATE, but only if asked to. - */ - if (isp->isp_clock) { - mbs.param[0] = MBOX_SET_CLOCK_RATE; - mbs.param[1] = isp->isp_clock; - mbs.logval = MBLOGNONE; - isp_mboxcmd(isp, &mbs); - /* we will try not to care if this fails */ - } + if (isp->isp_clock) { + MBSINIT(&mbs, MBOX_SET_CLOCK_RATE, MBLOGALL, 0); + mbs.param[1] = isp->isp_clock; + isp_mboxcmd(isp, &mbs); + /* we will try not to care if this fails */ } } |