diff options
author | Alexander Motin <mav@FreeBSD.org> | 2015-10-29 20:34:01 +0000 |
---|---|---|
committer | Alexander Motin <mav@FreeBSD.org> | 2015-10-29 20:34:01 +0000 |
commit | 030eb8d0f24dc01be6f52e88b10e043db8741104 (patch) | |
tree | 6f8babe4e3e259ad90b7a8fb200fb3780a703757 /sys | |
parent | 217b098a1eaeb45b576553939005b8d4a67d8c0c (diff) | |
download | src-030eb8d0f24dc01be6f52e88b10e043db8741104.tar.gz src-030eb8d0f24dc01be6f52e88b10e043db8741104.zip |
Remove reset delays for which I see neither explanation nor need.
Notes
Notes:
svn path=/head/; revision=290159
Diffstat (limited to 'sys')
-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 fb8e71760005..2ca55048c8c9 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 */ } } |