From c872d65b55aa3bf6c030276eb0c7933015b20801 Mon Sep 17 00:00:00 2001 From: Chandrakanth Patil Date: Fri, 21 Jan 2022 14:54:37 +0530 Subject: [PATCH] mrsas: if controller reset is in progress, refrain from firing DCMDs to firmware in shutdown If controller reset is in progress, at same time if system shutdown is issued then corresponding shutdown function in driver will be invoked where driver is waiting 15 seconds to complete the controller reset. If the reset is not complteted within that time frame driver will go ahead and fire cache flush and shutdown DCMDs which will end up accessing the the queues which are not initialized due to undergoing reset leads to FMU error in firmware. Fix: In shutdown function, if controller reset is not finished within 15 seconds than driver will return to the OS without firing any DCMDs. Approved by: re@ (gjb) Reviewed by: imp PR: 261375 (cherry picked from commit 79c4c4be9618470711480f46ef2cd3a15c00cdd2) (cherry picked from commit 09e161a29ee5b0e52494c861f451de35b286e327) --- sys/dev/mrsas/mrsas.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/mrsas/mrsas.c b/sys/dev/mrsas/mrsas.c index 8814642fccd..0055ddda8ce 100644 --- a/sys/dev/mrsas/mrsas.c +++ b/sys/dev/mrsas/mrsas.c @@ -1198,6 +1198,7 @@ mrsas_shutdown(device_t dev) if (sc->reset_in_progress) { mrsas_dprint(sc, MRSAS_INFO, "gave up waiting for OCR to be finished\n"); + return (0); } } -- 2.45.0