Skip to contentSkip to conversation

scsi: mpt3sas: Stop fw fault watchdog work item during system shutdown

PATCH Applied David Jeffery 3 participants 3 messages Jul 22, 2022 – Jul 27, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: mpt3sas: Stop fw fault watchdog work item during system shutdown

During system shutdown or reboot, mpt3sas will reset the firmware back to ready state. However, the driver leaves running a watchdog work item intended to keep the firmware in operational state. This causes a second, unneeded reset on shutdown and moves the firmware back to operational instead of in ready state as intended. And if the mpt3sas_fwfault_debug module parameter is set, this extra reset also panics the system.

mpt3sas's scsih_shutdown needs to stop the watchdog before resetting the firmware back to ready state.

Fixes fae21608c31c ("scsi: mpt3sas: Transition IOC to Ready state during shutdown")
---
 drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1 +
 1 file changed, 1 insertion(+)
drivers/scsi/mpt3sas/mpt3sas_scsih.c +1 -0
index b519f4b59d30..5e8887fa02c8 100644
@@ -11386,6 +11386,7 @@ scsih_shutdown(struct pci_dev *pdev)
 	_scsih_ir_shutdown(ioc);
 	_scsih_nvme_shutdown(ioc);
 	mpt3sas_base_mask_interrupts(ioc);
+	mpt3sas_base_stop_watchdog(ioc);
 	ioc->shost_recovery = 1;
 	mpt3sas_base_make_ioc_ready(ioc, SOFT_RESET);
 	ioc->shost_recovery = 0;
Signature · 1 line
2.36.1
maintainer
#1 lore raw
Quoted 8 lines · David Jeffery

During system shutdown or reboot, mpt3sas will reset the firmware back to ready state. However, the driver leaves running a watchdog work item intended to keep the firmware in operational state. This causes a second, unneeded reset on shutdown and moves the firmware back to operational instead of in ready state as intended. And if the mpt3sas_fwfault_debug module parameter is set, this extra reset also panics the system.

Quoted 6 lines

mpt3sas's scsih_shutdown needs to stop the watchdog before resetting the firmware back to ready state.

Fixes fae21608c31c ("scsi: mpt3sas: Transition IOC to Ready state during shutdown")

Thanks for the patch.

Quoted 19 lines
---
 drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1 +
 1 file changed, 1 insertion(+)
drivers/scsi/mpt3sas/mpt3sas_scsih.c +1 -1
index b519f4b59d30..5e8887fa02c8 100644
@@ -11386,6 +11386,7 @@ scsih_shutdown(struct pci_dev *pdev)
        _scsih_ir_shutdown(ioc);
        _scsih_nvme_shutdown(ioc);
        mpt3sas_base_mask_interrupts(ioc);
+       mpt3sas_base_stop_watchdog(ioc);
        ioc->shost_recovery = 1;
        mpt3sas_base_make_ioc_ready(ioc, SOFT_RESET);
        ioc->shost_recovery = 0;
--

2.36.1

#2 lore raw
In reply to David Jeffery
Quoted 8 lines · David Jeffery

During system shutdown or reboot, mpt3sas will reset the firmware back to ready state. However, the driver leaves running a watchdog work item intended to keep the firmware in operational state. This causes a second, unneeded reset on shutdown and moves the firmware back to operational instead of in ready state as intended. And if the mpt3sas_fwfault_debug module parameter is set, this extra reset also panics the system.

[...]

Applied to 5.19/scsi-fixes, thanks!

[1/1] scsi: mpt3sas: Stop fw fault watchdog work item during system shutdown

      https://git.kernel.org/mkp/scsi/c/0fde22c5420e
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering