Commit 15d5a015 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/aspm' 

  - Allow ASPM on links to PCIe-to-PCI/PCI-X Bridges (Kai-Heng Feng)

* pci/aspm:
  PCI/ASPM: Allow ASPM on links to PCIe-to-PCI/PCI-X Bridges
parents 8f3d9f35 66ff14e5

drivers/pci/pcie/aspm.c

+0 −10
Original line number Diff line number Diff line
@@ -628,16 +628,6 @@ static void pcie_aspm_cap_init(struct pcie_link_state *link, int blacklist) 


	/* Setup initial capable state. Will be updated later */

	link->aspm_capable = link->aspm_support;

	/*

	 * If the downstream component has pci bridge function, don't

	 * do ASPM for now.

	 */

	list_for_each_entry(child, &linkbus->devices, bus_list) {

		if (pci_pcie_type(child) == PCI_EXP_TYPE_PCI_BRIDGE) {

			link->aspm_disable = ASPM_STATE_ALL;

			break;

		}

	}



	/* Get and check endpoint acceptable latencies */

	list_for_each_entry(child, &linkbus->devices, bus_list) {