Skip to content

Commit f3d049b

Browse files
Kai-Heng Fengbjorn-helgaas
authored andcommitted
PCI/ASPM: Restore parent state to parent, child state to child
There's a typo that makes parent device uses child LNKCTL value and vice versa. This causes Micron NVMe to trigger a reboot upon system resume. Correct the typo to fix the issue. Fixes: 64dbb2d ("PCI/ASPM: Disable L1 before configuring L1 Substates") Link: https://lore.kernel.org/r/20240506051602.1990743-1-kai.heng.feng@canonical.com Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> [bhelgaas: update subject] Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
1 parent 2e0239d commit f3d049b

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/pci/pcie/aspm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ void pci_restore_aspm_l1ss_state(struct pci_dev *pdev)
177177
/* Restore L0s/L1 if they were enabled */
178178
if (FIELD_GET(PCI_EXP_LNKCTL_ASPMC, clnkctl) ||
179179
FIELD_GET(PCI_EXP_LNKCTL_ASPMC, plnkctl)) {
180-
pcie_capability_write_word(parent, PCI_EXP_LNKCTL, clnkctl);
181-
pcie_capability_write_word(pdev, PCI_EXP_LNKCTL, plnkctl);
180+
pcie_capability_write_word(parent, PCI_EXP_LNKCTL, plnkctl);
181+
pcie_capability_write_word(pdev, PCI_EXP_LNKCTL, clnkctl);
182182
}
183183
}
184184

0 commit comments

Comments
 (0)