Commit 0d98ba8d authored by Sinan Kaya's avatar Sinan Kaya Committed by Martin K. Petersen

scsi: hpsa: disable device during shutdown

'Commit cc27b735 ("PCI/portdrv: Turn off PCIe services during
shutdown")' has been added to kernel to shutdown pending PCIe port service
interrupts during reboot so that a newly started kexec kernel wouldn't
observe pending interrupts.

pcie_port_device_remove() is disabling the root port and switches by
calling pci_disable_device() after all PCIe service drivers are shutdown.

This has been found to cause crashes on HP DL360 Gen9 machines during
reboot due to hpsa driver not clearing the bus master bit during the
shutdown procedure by calling pci_disable_device().

Disable device as part of the shutdown sequence.
Signed-off-by: default avatarSinan Kaya <okaya@codeaurora.org>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=199779
Fixes: cc27b735 ("PCI/portdrv: Turn off PCIe services during shutdown")
Cc: stable@vger.kernel.org
Reported-by: default avatarRyan Finnie <ryan@finnie.org>
Tested-by: default avatarDon Brace <don.brace@microsemi.com>
Acked-by: default avatarDon Brace <don.brace@microsemi.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 3aadbe25
...@@ -8869,7 +8869,7 @@ static void hpsa_disable_rld_caching(struct ctlr_info *h) ...@@ -8869,7 +8869,7 @@ static void hpsa_disable_rld_caching(struct ctlr_info *h)
kfree(options); kfree(options);
} }
static void hpsa_shutdown(struct pci_dev *pdev) static void __hpsa_shutdown(struct pci_dev *pdev)
{ {
struct ctlr_info *h; struct ctlr_info *h;
...@@ -8884,6 +8884,12 @@ static void hpsa_shutdown(struct pci_dev *pdev) ...@@ -8884,6 +8884,12 @@ static void hpsa_shutdown(struct pci_dev *pdev)
hpsa_disable_interrupt_mode(h); /* pci_init 2 */ hpsa_disable_interrupt_mode(h); /* pci_init 2 */
} }
static void hpsa_shutdown(struct pci_dev *pdev)
{
__hpsa_shutdown(pdev);
pci_disable_device(pdev);
}
static void hpsa_free_device_info(struct ctlr_info *h) static void hpsa_free_device_info(struct ctlr_info *h)
{ {
int i; int i;
...@@ -8927,7 +8933,7 @@ static void hpsa_remove_one(struct pci_dev *pdev) ...@@ -8927,7 +8933,7 @@ static void hpsa_remove_one(struct pci_dev *pdev)
scsi_remove_host(h->scsi_host); /* init_one 8 */ scsi_remove_host(h->scsi_host); /* init_one 8 */
/* includes hpsa_free_irqs - init_one 4 */ /* includes hpsa_free_irqs - init_one 4 */
/* includes hpsa_disable_interrupt_mode - pci_init 2 */ /* includes hpsa_disable_interrupt_mode - pci_init 2 */
hpsa_shutdown(pdev); __hpsa_shutdown(pdev);
hpsa_free_device_info(h); /* scan */ hpsa_free_device_info(h); /* scan */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment