From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Ranjan Kumar <ranjan.kumar@broadcom.com>,
"Martin K . Petersen" <martin.petersen@oracle.com>,
Sasha Levin <sashal@kernel.org>,
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.1 11/15] scsi: mpi3mr: Handle soft reset in progress fault code (0xF002)
Date: Thu, 20 Apr 2023 07:02:25 -0400 [thread overview]
Message-ID: <20230420110231.505992-11-sashal@kernel.org> (raw)
In-Reply-To: <20230420110231.505992-1-sashal@kernel.org>
From: Ranjan Kumar <ranjan.kumar@broadcom.com>
[ 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@broadcom.com>
Link: https://lore.kernel.org/r/20230331122317.11391-1-ranjan.kumar@broadcom.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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 ea9e69fb62826..64355d0baa5fb 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
next prev parent reply other threads:[~2023-04-20 11:07 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-20 11:02 [PATCH AUTOSEL 6.1 01/15] ASOC: Intel: sof_sdw: add quirk for Intel 'Rooks County' NUC M15 Sasha Levin
2023-04-20 11:02 ` [PATCH AUTOSEL 6.1 02/15] ASoC: Intel: soc-acpi: add table " Sasha Levin
2023-04-20 11:02 ` [PATCH AUTOSEL 6.1 03/15] ASoC: soc-pcm: fix hw->formats cleared by soc_pcm_hw_init() for dpcm Sasha Levin
2023-04-20 11:02 ` [PATCH AUTOSEL 6.1 04/15] x86/hyperv: Block root partition functionality in a Confidential VM Sasha Levin
2023-04-20 11:02 ` [PATCH AUTOSEL 6.1 05/15] ASoC: amd: yc: Add DMI entries to support Victus by HP Laptop 16-e1xxx (8A22) Sasha Levin
2023-04-20 11:02 ` [PATCH AUTOSEL 6.1 06/15] iio: adc: palmas_gpadc: fix NULL dereference on rmmod Sasha Levin
2023-04-20 11:02 ` [PATCH AUTOSEL 6.1 07/15] ASoC: Intel: bytcr_rt5640: Add quirk for the Acer Iconia One 7 B1-750 Sasha Levin
2023-04-20 11:02 ` [PATCH AUTOSEL 6.1 08/15] ASoC: da7213.c: add missing pm_runtime_disable() Sasha Levin
2023-04-20 11:02 ` [PATCH AUTOSEL 6.1 09/15] net: wwan: t7xx: do not compile with -Werror Sasha Levin
2023-04-20 11:02 ` [PATCH AUTOSEL 6.1 10/15] selftests mount: Fix mount_setattr_test builds failed Sasha Levin
2023-04-20 11:02 ` Sasha Levin [this message]
2023-04-20 11:02 ` [PATCH AUTOSEL 6.1 12/15] net: sfp: add quirk enabling 2500Base-x for HG MXPD-483II Sasha Levin
2023-04-20 11:02 ` [PATCH AUTOSEL 6.1 13/15] platform/x86: thinkpad_acpi: Add missing T14s Gen1 type to s2idle quirk list Sasha Levin
2023-04-20 11:02 ` [PATCH AUTOSEL 6.1 14/15] wifi: ath11k: reduce the MHI timeout to 20s Sasha Levin
2023-04-20 11:02 ` [PATCH AUTOSEL 6.1 15/15] x86/cpu: Add model number for Intel Arrow Lake processor Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230420110231.505992-11-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=jejb@linux.ibm.com \
--cc=kashyap.desai@broadcom.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=mpi3mr-linuxdrv.pdl@broadcom.com \
--cc=ranjan.kumar@broadcom.com \
--cc=sathya.prakash@broadcom.com \
--cc=sreekanth.reddy@broadcom.com \
--cc=stable@vger.kernel.org \
--cc=sumit.saxena@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).