hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Bjorn Helgaas 2013-02-02 14:34:19 -07:00
parent 8e5de3dcc6 a26d5ecb32
commit ecb87e6609
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/pci/pcie/aspm.c
View File

@ -556,6 +556,9 @@ void pcie_aspm_init_link_state(struct pci_dev *pdev)
struct pcie_link_state *link; struct pcie_link_state *link;
int blacklist = !!pcie_aspm_sanity_check(pdev); int blacklist = !!pcie_aspm_sanity_check(pdev);
if (!aspm_support_enabled)
return;
if (!pci_is_pcie(pdev) || pdev->link_state) if (!pci_is_pcie(pdev) || pdev->link_state)
return; return;
if (pci_pcie_type(pdev) != PCI_EXP_TYPE_ROOT_PORT && if (pci_pcie_type(pdev) != PCI_EXP_TYPE_ROOT_PORT &&
@ -634,10 +637,7 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev)
struct pci_dev *parent = pdev->bus->self; struct pci_dev *parent = pdev->bus->self;
struct pcie_link_state *link, *root, *parent_link; struct pcie_link_state *link, *root, *parent_link;
if (!pci_is_pcie(pdev) || !parent || !parent->link_state) if (!parent || !parent->link_state)
return;
if ((pci_pcie_type(parent) != PCI_EXP_TYPE_ROOT_PORT) &&
(pci_pcie_type(parent) != PCI_EXP_TYPE_DOWNSTREAM))
return; return;
down_read(&pci_bus_sem); down_read(&pci_bus_sem);