Commit 84fb913c authored Jan 31, 2013 by Myron Stowe Committed by Bjorn Helgaas Feb 01, 2013

PCI/ASPM: Deallocate upstream link state even if device is not PCIe



On PCI bus hotplug removal, pcie_aspm_exit_link_state() can potentially
skip parent devices that have link_state allocated.  Instead of exiting
early if a given device is not PCIe, check whether or not the device's
parent has link_state allocated.  This enables pcie_aspm_exit_link_state()
to properly clean up parent link_state when the last function in a slot
might not be PCIe.

Reported-by: Joe Lawrence <joe.lawrence@stratus.com>
Tested-by: Joe Lawrence <joe.lawrence@stratus.com>
Signed-off-by: Myron Stowe <myron.stowe@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

parent d1c3ed66

drivers/pci/pcie/aspm.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -634,10 +634,7 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev)
		struct pci_dev *parent = pdev->bus->self;
		struct pcie_link_state link, root, *parent_link;

		if (!pci_is_pcie(pdev) \|\| !parent \|\| !parent->link_state)
		return;
		if ((pci_pcie_type(parent) != PCI_EXP_TYPE_ROOT_PORT) &&
		(pci_pcie_type(parent) != PCI_EXP_TYPE_DOWNSTREAM))
		if (!parent \|\| !parent->link_state)
		return;

		down_read(&pci_bus_sem);

Admin message