Commit 6e0eda3c authored Mar 14, 2013 by Konstantin Khlebnikov Committed by Bjorn Helgaas Apr 02, 2013

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

This is a fix for commit 7897e602 ("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>

parent b8178f13

drivers/pci/pci-driver.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -390,8 +390,9 @@ 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.
		*/
		if (pci_dev->current_state <= PCI_D3hot)
		pci_clear_master(pci_dev);
		}

Admin message