diff options
| author | Kevin Barnett <kevin.barnett@microchip.com> | 2021-03-11 14:17:42 -0600 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-04-05 23:02:32 -0400 |
| commit | 43e97ef482eea96698af5cde99c9d55bbefe225d (patch) | |
| tree | fff495374d192b47c40dfa236e4f72d4abb6f29a | |
| parent | d0cba99fd7a3781a78f751cfd4f4e3ff4d0b1ea3 (diff) | |
| download | linux-stable-43e97ef482eea96698af5cde99c9d55bbefe225d.tar.gz linux-stable-43e97ef482eea96698af5cde99c9d55bbefe225d.tar.bz2 linux-stable-43e97ef482eea96698af5cde99c9d55bbefe225d.zip | |
scsi: smartpqi: Correct system hangs when resuming from hibernation
Correct system hangs when resuming from hibernation after first successful
hibernation/resume cycle. Rare condition involving OFA.
Note: Suspend/resume is not supported on many platforms. It was originally
intended for workstations.
Link: https://lore.kernel.org/r/161549386295.25025.14555840632114761610.stgit@brunhilda
Reviewed-by: Scott Benesh <scott.benesh@microchip.com>
Reviewed-by: Scott Teel <scott.teel@microchip.com>
Signed-off-by: Kevin Barnett <kevin.barnett@microchip.com>
Signed-off-by: Don Brace <don.brace@microchip.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
| -rw-r--r-- | drivers/scsi/smartpqi/smartpqi_init.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index dbc0d3732d85..939da70058a0 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -8651,14 +8651,21 @@ static __maybe_unused int pqi_resume(struct pci_dev *pci_dev) pci_dev->irq, rc); return rc; } + pqi_ctrl_unblock_device_reset(ctrl_info); pqi_ctrl_unblock_requests(ctrl_info); pqi_scsi_unblock_requests(ctrl_info); + pqi_ctrl_unblock_scan(ctrl_info); return 0; } pci_set_power_state(pci_dev, PCI_D0); pci_restore_state(pci_dev); + pqi_ctrl_unblock_device_reset(ctrl_info); + pqi_ctrl_unblock_requests(ctrl_info); + pqi_scsi_unblock_requests(ctrl_info); + pqi_ctrl_unblock_scan(ctrl_info); + return pqi_ctrl_init_resume(ctrl_info); } |