tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'pci/joe-aspm' into next

* pci/joe-aspm:
PCI/ASPM: Don't touch ASPM if forcibly disabled
PCI/ASPM: Deallocate upstream link state even if device is not PCIe

Bjorn Helgaas ecb87e66 8e5de3dc

+4 -4
+4 -4
drivers/pci/pcie/aspm.c
··· 556 556 struct pcie_link_state *link; 557 557 int blacklist = !!pcie_aspm_sanity_check(pdev); 558 558 559 + if (!aspm_support_enabled) 560 + return; 561 + 559 562 if (!pci_is_pcie(pdev) || pdev->link_state) 560 563 return; 561 564 if (pci_pcie_type(pdev) != PCI_EXP_TYPE_ROOT_PORT && ··· 637 634 struct pci_dev *parent = pdev->bus->self; 638 635 struct pcie_link_state *link, *root, *parent_link; 639 636 640 - if (!pci_is_pcie(pdev) || !parent || !parent->link_state) 641 - return; 642 - if ((pci_pcie_type(parent) != PCI_EXP_TYPE_ROOT_PORT) && 643 - (pci_pcie_type(parent) != PCI_EXP_TYPE_DOWNSTREAM)) 637 + if (!parent || !parent->link_state) 644 638 return; 645 639 646 640 down_read(&pci_bus_sem);