From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7753BC7EE21 for ; Thu, 20 Apr 2023 11:05:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234382AbjDTLFY (ORCPT ); Thu, 20 Apr 2023 07:05:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233782AbjDTLEd (ORCPT ); Thu, 20 Apr 2023 07:04:33 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 79A9C7689; Thu, 20 Apr 2023 04:03:14 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 86B16647D0; Thu, 20 Apr 2023 11:02:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D280C433A0; Thu, 20 Apr 2023 11:02:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681988543; bh=8XlNvxFe8J9MElTonJQu/vF4gtbvlLAZtiQOh98u3T4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h29duO9p0Z7pviXmpEzgXyrEJfjcql7wU7lQKvXKtSZ/GNwLpEkor2URoTQsZACLA 9yfFXgNrsPpG55KK5VHOScPdwMhhax9WDv0SOFbBMo4xu4qfQUWTPZDjh0mK1xw82H s+urbbHWhn/XqYpj49pC6+mCocoIpIAdqddY3p4IsZ6qddDayiqBlHo+BZWm47ocQL 8ziXqhGASXN6LM1VeImsmnaanuE+Ro3XhHdjzJUZGbPCdgPphiIAaz1wnr+dv9pQhS 5+BdvPKsqNDGrNWoSe4nyrEq9+9LukirdOqbC/3I6d2VPqkzAajyTLhqPFGyAAYJTH RNsICZziAbctw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ranjan Kumar , "Martin K . Petersen" , Sasha Levin , sathya.prakash@broadcom.com, kashyap.desai@broadcom.com, sumit.saxena@broadcom.com, sreekanth.reddy@broadcom.com, jejb@linux.ibm.com, mpi3mr-linuxdrv.pdl@broadcom.com, linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 6.2 13/17] scsi: mpi3mr: Handle soft reset in progress fault code (0xF002) Date: Thu, 20 Apr 2023 07:01:42 -0400 Message-Id: <20230420110148.505779-13-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230420110148.505779-1-sashal@kernel.org> References: <20230420110148.505779-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ranjan Kumar [ 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 Link: https://lore.kernel.org/r/20230331122317.11391-1-ranjan.kumar@broadcom.com Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/mpi3mr/mpi3mr_fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- 2.39.2