Skip to content

Commit fb097dc

Browse files
Ajay Agarwalbjorn-helgaas
authored andcommitted
PCI/ASPM: Disable only ASPM_STATE_L1 when driver disables L1
Previously pci_disable_link_state(PCIE_LINK_STATE_L1) disabled L1SS as well as L1. This is unnecessary since pcie_config_aspm_link() takes care that L1SS is not enabled if L1 is disabled. Disable only ASPM_STATE_L1 when the caller disables L1. No functional changes intended. This is consistent with aspm_attr_store_common(), which disables only L1, not L1SS, when L1 is disabled via the sysfs "l1_aspm" file. [bhelgaas: commit log] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Ajay Agarwal <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]> Reviewed-by: Kuppuswamy Sathyanarayanan <[email protected]>
1 parent 456d8aa commit fb097dc

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/pci/pcie/aspm.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,8 +1098,7 @@ static int __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem)
10981098
if (state & PCIE_LINK_STATE_L0S)
10991099
link->aspm_disable |= ASPM_STATE_L0S;
11001100
if (state & PCIE_LINK_STATE_L1)
1101-
/* L1 PM substates require L1 */
1102-
link->aspm_disable |= ASPM_STATE_L1 | ASPM_STATE_L1SS;
1101+
link->aspm_disable |= ASPM_STATE_L1;
11031102
if (state & PCIE_LINK_STATE_L1_1)
11041103
link->aspm_disable |= ASPM_STATE_L1_1;
11051104
if (state & PCIE_LINK_STATE_L1_2)

0 commit comments

Comments
 (0)