Patch "scsi: mpi3mr: Handle soft reset in progress fault code (0xF002)" has been added to the 6.2-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    scsi: mpi3mr: Handle soft reset in progress fault code (0xF002)

to the 6.2-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     scsi-mpi3mr-handle-soft-reset-in-progress-fault-code.patch
and it can be found in the queue-6.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 13806034e70b14a18a27a5b8eb902ec31e07300b
Author: Ranjan Kumar <ranjan.kumar@xxxxxxxxxxxx>
Date:   Fri Mar 31 17:53:17 2023 +0530

    scsi: mpi3mr: Handle soft reset in progress fault code (0xF002)
    
    [ Upstream commit a3d27dfdcfc27ac3f46de5391bb6d24f04af7941 ]
    
    The driver is exiting from the fault watchdog thread if it sees the 0xF002
    (Soft reset in progress) fault code.
    
    If the driver initiates the soft reset, then the driver restarts the
    watchdog at the end of the soft reset completion.  However, if the soft
    reset is initiated by the firmware asynchronously, then the driver will
    never restart the watchdog and never re-initialize the controller after the
    asynchronous soft reset completion.
    
    Signed-off-by: Ranjan Kumar <ranjan.kumar@xxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20230331122317.11391-1-ranjan.kumar@xxxxxxxxxxxx
    Signed-off-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/scsi/mpi3mr/mpi3mr_fw.c b/drivers/scsi/mpi3mr/mpi3mr_fw.c
index a565817aa56d4..d109a4ceb72b1 100644
--- a/drivers/scsi/mpi3mr/mpi3mr_fw.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c
@@ -2526,7 +2526,7 @@ static void mpi3mr_watchdog_work(struct work_struct *work)
 		mrioc->unrecoverable = 1;
 		goto schedule_work;
 	case MPI3_SYSIF_FAULT_CODE_SOFT_RESET_IN_PROGRESS:
-		return;
+		goto schedule_work;
 	case MPI3_SYSIF_FAULT_CODE_CI_ACTIVATION_RESET:
 		reset_reason = MPI3MR_RESET_FROM_CIACTIV_FAULT;
 		break;



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux