Author: mav
Date: Mon Nov 30 21:30:56 2015
New Revision: 291501
URL: https://svnweb.freebsd.org/changeset/base/291501
Log:
MFC r290159: Remove reset delays for which I see neither explanation nor need.
Modified:
stable/10/sys/dev/isp/isp.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/isp/isp.c
==============================================================================
--- stable/10/sys/dev/isp/isp.c Mon Nov 30 21:30:18 2015 (r291500)
+++ stable/10/sys/dev/isp/isp.c Mon Nov 30 21:30:56 2015 (r291501)
@@ -1011,33 +1011,15 @@ isp_reset(ispsoftc_t *isp, int do_load_d
}
}
- /*
- * 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 */
}
}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "[email protected]"
