mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-08 17:49:45 +00:00
Code Issues Releases Wiki Activity

scsi: hpsa: disable device during shutdown

Browse source 
commit 0d98ba8d70 upstream.

'Commit cc27b735ad ("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: Sinan Kaya <okaya@codeaurora.org>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=199779
Fixes: cc27b735ad ("PCI/portdrv: Turn off PCIe services during shutdown")
Cc: stable@vger.kernel.org
Reported-by: Ryan Finnie <ryan@finnie.org>
Tested-by: Don Brace <don.brace@microsemi.com>
Acked-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sinan Kaya 2018-06-02 00:28:53 -04:00 committed by Greg Kroah-Hartman
parent 2d329968a8
commit 2829829c3e
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/scsi/hpsa.c
View file

@ -8638,7 +8638,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;
@ -8653,6 +8653,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;
@ -8696,7 +8702,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 */