renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-03 02:49:09 +08:00
Code

PCI: Don't try to disable Bus Master on disconnected PCI devices

Browse Source 
This is a fix for commit 7897e60227 ("PCI: Disable Bus Master
unconditionally in pci_device_shutdown()").  Vivek reported that
with this commit, kexec failed because none of his SATA disks
came up.

A ->shutdown() callback might put the device in D3cold, which means config
space is no longer available.

[bhelgaas: changelog]
Link: https://lkml.org/lkml/2013/3/12/529
Reported-and-Tested-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Konstantin Khlebnikov 2013-03-14 18:49:37 +04:00 committed by Bjorn Helgaas
parent b8178f130e
commit 6e0eda3c38
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/pci/pci-driver.c
View File

@ -390,9 +390,10 @@ static void pci_device_shutdown(struct device *dev)
/*
* Turn off Bus Master bit on the device to tell it to not
* continue to do DMA
* continue to do DMA. Don't touch devices in D3cold or unknown states.
*/
pci_clear_master(pci_dev);
if (pci_dev->current_state <= PCI_D3hot)
pci_clear_master(pci_dev);
}
#ifdef CONFIG_PM