Page MenuHomeFreeBSD
Files F102689512

D42539.diff
No OneTemporary
Actions

D42539.diff
View Options

diff --git a/sys/dev/mpi3mr/mpi3mr.c b/sys/dev/mpi3mr/mpi3mr.c
--- a/sys/dev/mpi3mr/mpi3mr.c
+++ b/sys/dev/mpi3mr/mpi3mr.c
@@ -3037,9 +3037,6 @@
sc->watchdog_thread_active = 1;
mtx_lock(&sc->reset_mutex);
for (;;) {
- /* Sleep for 1 second and check the queue status */
- msleep(&sc->watchdog_chan, &sc->reset_mutex, PRIBIO,
- "mpi3mr_watchdog", 1 * hz);
if (sc->mpi3mr_flags & MPI3MR_FLAGS_SHUTDOWN ||
(sc->unrecoverable == 1)) {
mpi3mr_dprint(sc, MPI3MR_INFO,
@@ -3048,20 +3045,21 @@
"Hardware critical error", __func__);
break;
}
+ mtx_unlock(&sc->reset_mutex);
if ((sc->prepare_for_reset) &&
((sc->prepare_for_reset_timeout_counter++) >=
MPI3MR_PREPARE_FOR_RESET_TIMEOUT)) {
mpi3mr_soft_reset_handler(sc,
MPI3MR_RESET_FROM_CIACTVRST_TIMER, 1);
- continue;
+ goto sleep;
}
ioc_status = mpi3mr_regread(sc, MPI3_SYSIF_IOC_STATUS_OFFSET);
if (ioc_status & MPI3_SYSIF_IOC_STATUS_RESET_HISTORY) {
mpi3mr_soft_reset_handler(sc, MPI3MR_RESET_FROM_FIRMWARE, 0);
- continue;
+ goto sleep;
}
ioc_state = mpi3mr_get_iocstate(sc);
@@ -3077,7 +3075,7 @@
"diag save in progress\n");
}
if ((sc->diagsave_timeout++) <= MPI3_SYSIF_DIAG_SAVE_TIMEOUT)
- continue;
+ goto sleep;
}
mpi3mr_print_fault_info(sc);
sc->diagsave_timeout = 0;
@@ -3088,12 +3086,12 @@
"Controller requires system power cycle or complete reset is needed,"
"fault code: 0x%x. marking controller as unrecoverable\n", fault);
sc->unrecoverable = 1;
- goto out;
+ break;
}
if ((fault == MPI3_SYSIF_FAULT_CODE_DIAG_FAULT_RESET)
|| (fault == MPI3_SYSIF_FAULT_CODE_SOFT_RESET_IN_PROGRESS)
|| (sc->reset_in_progress))
- goto out;
+ break;
if (fault == MPI3_SYSIF_FAULT_CODE_CI_ACTIVATION_RESET)
mpi3mr_soft_reset_handler(sc,
MPI3MR_RESET_FROM_CIACTIV_FAULT, 0);
@@ -3107,8 +3105,18 @@
mpi3mr_print_fault_info(sc);
mpi3mr_soft_reset_handler(sc, sc->reset.reason, 1);
}
+sleep:
+ mtx_lock(&sc->reset_mutex);
+ /*
+ * Sleep for 1 second if we're not exiting, then loop to top
+ * to poll exit status and hardware health.
+ */
+ if ((sc->mpi3mr_flags & MPI3MR_FLAGS_SHUTDOWN) == 0 &&
+ !sc->unrecoverable) {
+ msleep(&sc->watchdog_chan, &sc->reset_mutex, PRIBIO,
+ "mpi3mr_watchdog", 1 * hz);
+ }
}
-out:
mtx_unlock(&sc->reset_mutex);
sc->watchdog_thread_active = 0;
mpi3mr_kproc_exit(0);
diff --git a/sys/dev/mpi3mr/mpi3mr_pci.c b/sys/dev/mpi3mr/mpi3mr_pci.c
--- a/sys/dev/mpi3mr/mpi3mr_pci.c
+++ b/sys/dev/mpi3mr/mpi3mr_pci.c
@@ -635,13 +635,15 @@
if (!sc->secure_ctrl)
return 0;
- sc->mpi3mr_flags |= MPI3MR_FLAGS_SHUTDOWN;
if (sc->sysctl_tree != NULL)
sysctl_ctx_free(&sc->sysctl_ctx);
+ mtx_lock(&sc->reset_mutex);
+ sc->mpi3mr_flags |= MPI3MR_FLAGS_SHUTDOWN;
if (sc->watchdog_thread_active)
wakeup(&sc->watchdog_chan);
+ mtx_unlock(&sc->reset_mutex);
while (sc->reset_in_progress && (i < PEND_IOCTLS_COMP_WAIT_TIME)) {
i++;

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 16, 9:53 PM (21 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14665019
Default Alt Text
D42539.diff (3 KB)

Event Timeline