Revert "PCI/ASPM: Disable only ASPM_STATE_L1 when driver, disables L1"

[linux-2.6-microblaze.git] / drivers / pci / pcie / aspm.c

diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 855feae..dc203b8 100644 (file)
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -1066,7 +1066,8 @@ static int __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem)
        if (state & PCIE_LINK_STATE_L0S)
                link->aspm_disable |= ASPM_STATE_L0S;
        if (state & PCIE_LINK_STATE_L1)
-               link->aspm_disable |= ASPM_STATE_L1;
+               /* L1 PM substates require L1 */
+               link->aspm_disable |= ASPM_STATE_L1 | ASPM_STATE_L1SS;
        if (state & PCIE_LINK_STATE_L1_1)
                link->aspm_disable |= ASPM_STATE_L1_1;
        if (state & PCIE_LINK_STATE_L1_2)