Commit f3d049b3 authored by Kai-Heng Feng's avatar Kai-Heng Feng Committed by Bjorn Helgaas
Browse files

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: 64dbb2d7 ("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: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
[bhelgaas: update subject]
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent 2e0239d4

drivers/pci/pcie/aspm.c

+2 −2
Original line number Diff line number Diff line
@@ -177,8 +177,8 @@ void pci_restore_aspm_l1ss_state(struct pci_dev *pdev) 
	/* Restore L0s/L1 if they were enabled */

	if (FIELD_GET(PCI_EXP_LNKCTL_ASPMC, clnkctl) ||

	    FIELD_GET(PCI_EXP_LNKCTL_ASPMC, plnkctl)) {

		pcie_capability_write_word(parent, PCI_EXP_LNKCTL, clnkctl);

		pcie_capability_write_word(pdev, PCI_EXP_LNKCTL, plnkctl);

		pcie_capability_write_word(parent, PCI_EXP_LNKCTL, plnkctl);

		pcie_capability_write_word(pdev, PCI_EXP_LNKCTL, clnkctl);

	}

}