diff options
| author | mjacob <mjacob@FreeBSD.org> | 2007-05-05 20:17:23 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 2007-05-05 20:17:23 +0000 |
| commit | ace2524e6248fd7ca96bda126cb5bded62451a13 (patch) | |
| tree | c5e127befa8e1d977a5d0f932bdbef74b370fa64 /sys/dev/isp/isp.c | |
| parent | b34f6f7ab1b2b31d561cfbfbc0b43a23c6d93a3e (diff) | |
| download | FreeBSD-src-ace2524e6248fd7ca96bda126cb5bded62451a13.zip FreeBSD-src-ace2524e6248fd7ca96bda126cb5bded62451a13.tar.gz | |
Make this an MP safe driver but also still be multi-release.
Seems to work on RELENG_4 through -current and also on sparc64
now. There may still be some issues with the auto attach/detach
code to sort out.
MFC after: 3 days
Diffstat (limited to 'sys/dev/isp/isp.c')
| -rw-r--r-- | sys/dev/isp/isp.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c index a6d04b7..25b6e8f 100644 --- a/sys/dev/isp/isp.c +++ b/sys/dev/isp/isp.c @@ -5121,20 +5121,11 @@ isp_parse_async(ispsoftc_t *isp, uint16_t mbox) isp->isp_mboxtmp[0] = MBOX_HOST_INTERFACE_ERROR; MBOX_NOTIFY_COMPLETE(isp); } -#ifdef ISP_FW_CRASH_DUMP /* - * If we have crash dumps enabled, it's up to the handler - * for isp_async to reinit stuff and restart the firmware - * after performing the crash dump. The reason we do things - * this way is that we may need to activate a kernel thread - * to do all the crash dump goop. + * It's up to the handler for isp_async to reinit stuff and + * restart the firmware */ isp_async(isp, ISPASYNC_FW_CRASH, NULL); -#else - isp_async(isp, ISPASYNC_FW_CRASH, NULL); - isp_reinit(isp); - isp_async(isp, ISPASYNC_FW_RESTARTED, NULL); -#endif rval = -1; break; @@ -5401,13 +5392,7 @@ isp_parse_async(ispsoftc_t *isp, uint16_t mbox) break; case ISP_CONN_FATAL: isp_prt(isp, ISP_LOGERR, "FATAL CONNECTION ERROR"); -#ifdef ISP_FW_CRASH_DUMP - isp_async(isp, ISPASYNC_FW_CRASH, NULL); -#else isp_async(isp, ISPASYNC_FW_CRASH, NULL); - isp_reinit(isp); - isp_async(isp, ISPASYNC_FW_RESTARTED, NULL); -#endif return (-1); case ISP_CONN_LOOPBACK: isp_prt(isp, ISP_LOGWARN, |
