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

Fixes mfi panic on recused on non-recusive mutex MFI I/O lock

Browse Source 
Removes a mtx_unlock call for mfi_io_lock which is never aquired

While I'm here fix a braceing style issue.

Reviewed by:	Doug Ambrisko
Approved by:	pjd (mentor)
MFC after:	1 month
This commit is contained in:
Steven Hartland 2013-02-27 00:35:40 +00:00
parent 6606ba811c
commit 5df4935e7a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/mfi/mfi.c
View File

@ -723,10 +723,8 @@ mfi_attach(struct mfi_softc *sc)
"hook\n"); "hook\n");
return (EINVAL); return (EINVAL);
} }
if ((error = mfi_aen_setup(sc, 0), 0) != 0) { if ((error = mfi_aen_setup(sc, 0), 0) != 0)
mtx_unlock(&sc->mfi_io_lock);
return (error); return (error);
}
/* /*
* Register a shutdown handler. * Register a shutdown handler.

4
sys/dev/mfi/mfi_tbolt.c
View File

@ -1194,6 +1194,7 @@ mfi_process_fw_state_chg_isr(void *arg)
sc->hw_crit_error= 1; sc->hw_crit_error= 1;
return ; return ;
} }
mtx_unlock(&sc->mfi_io_lock);
if ((error = mfi_tbolt_init_MFI_queue(sc)) != 0) if ((error = mfi_tbolt_init_MFI_queue(sc)) != 0)
return; return;
@ -1225,7 +1226,9 @@ mfi_process_fw_state_chg_isr(void *arg)
/* /*
* Initiate AEN (Asynchronous Event Notification) * Initiate AEN (Asynchronous Event Notification)
*/ */
mtx_unlock(&sc->mfi_io_lock);
mfi_aen_setup(sc, sc->last_seq_num); mfi_aen_setup(sc, sc->last_seq_num);
mtx_lock(&sc->mfi_io_lock);
sc->issuepend_done = 1; sc->issuepend_done = 1;
device_printf(sc->mfi_dev, "second stage of reset " device_printf(sc->mfi_dev, "second stage of reset "
"complete, FW is ready now.\n"); "complete, FW is ready now.\n");
@ -1237,7 +1240,6 @@ mfi_process_fw_state_chg_isr(void *arg)
device_printf(sc->mfi_dev, "mfi_process_fw_state_chg_isr " device_printf(sc->mfi_dev, "mfi_process_fw_state_chg_isr "
"called with unhandled value:%d\n", sc->adpreset); "called with unhandled value:%d\n", sc->adpreset);
} }
mtx_unlock(&sc->mfi_io_lock);
} }
/* /*