Date: Thu, 29 Oct 2015 20:34:02 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r290159 - head/sys/dev/isp Message-ID: <201510292034.t9TKY2Is030562@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Thu Oct 29 20:34:01 2015 New Revision: 290159 URL: https://svnweb.freebsd.org/changeset/base/290159 Log: Remove reset delays for which I see neither explanation nor need. Modified: head/sys/dev/isp/isp.c Modified: head/sys/dev/isp/isp.c ============================================================================== --- head/sys/dev/isp/isp.c Thu Oct 29 19:35:01 2015 (r290158) +++ head/sys/dev/isp/isp.c Thu Oct 29 20:34:01 2015 (r290159) @@ -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 */ } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510292034.t9TKY2Is030562>