d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rework r290504.

Browse Source
This commit is contained in:
mav 2015-11-07 19:33:57 +00:00
parent f8767e9255
commit 82a6376e2a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/isp/isp.c
View File

@ -2774,7 +2774,7 @@ isp_fclink_test(ispsoftc_t *isp, int chan, int usdelay)
*/
lwfs = FW_CONFIG_WAIT;
GET_NANOTIME(&hra);
do {
while (1) {
isp_fw_state(isp, chan);
if (lwfs != fcp->isp_fwstate) {
isp_prt(isp, ISP_LOGCONFIG|ISP_LOG_SANCFG, "Chan %d Firmware State <%s->%s>", chan, isp_fc_fw_statename((int)lwfs), isp_fc_fw_statename((int)fcp->isp_fwstate));
@ -2783,9 +2783,11 @@ isp_fclink_test(ispsoftc_t *isp, int chan, int usdelay)
if (fcp->isp_fwstate == FW_READY) {
break;
}
ISP_SLEEP(isp, 1000);
GET_NANOTIME(&hrb);
} while (NANOTIME_SUB(&hrb, &hra) / 1000 < usdelay);
if ((NANOTIME_SUB(&hrb, &hra) / 1000 + 1000 >= usdelay))
break;
ISP_SLEEP(isp, 1000);
}
/*
* If we haven't gone to 'ready' state, return.

4
sys/dev/isp/isp_freebsd.h
View File

@ -401,10 +401,10 @@ struct isposinfo {
#define ISP_SNPRINTF snprintf
#define ISP_DELAY(x) DELAY(x)
#if __FreeBSD_version < 1000029
#define ISP_SLEEP(isp, x) msleep(&(isp)->isp_osinfo.lock, \
#define ISP_SLEEP(isp, x) msleep(&(isp)->isp_osinfo.is_exiting, \
&(isp)->isp_osinfo.lock, 0, "isp_sleep", ((x) + tick - 1) / tick)
#else
#define ISP_SLEEP(isp, x) msleep_sbt(&(isp)->isp_osinfo.lock, \
#define ISP_SLEEP(isp, x) msleep_sbt(&(isp)->isp_osinfo.is_exiting, \
&(isp)->isp_osinfo.lock, 0, "isp_sleep", (x) * SBT_1US, 0, 0)
#endif