diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2020-06-04 12:59:09 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-06-04 12:59:09 -0500 |
| commit | 15d5a0157f31a874c94a0c8142c9bd7d494cb374 (patch) | |
| tree | c8cdf508573002279c8a5406e0eb2b02665d7c0f | |
| parent | 8f3d9f354286745c751374f5f1fcafee6b3f3136 (diff) | |
| parent | 66ff14e59e8a30690755b08bc3042359703fb07a (diff) | |
| download | linux-15d5a0157f31a874c94a0c8142c9bd7d494cb374.tar.bz2 | |
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
| -rw-r--r-- | drivers/pci/pcie/aspm.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 2378ed692534..b17e5ffd31b1 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -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) { |