Commit 1ab1a19d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v6.9-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci 

Pull pci fixes from Bjorn Helgaas:

 - Update kernel-parameters doc to describe "pcie_aspm=off" more
   accurately (Bjorn Helgaas)

 - Restore the parent's (not the child's) ASPM state to the parent
   during resume, which fixes a reboot during resume (Kai-Heng Feng)

* tag 'pci-v6.9-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
  PCI/ASPM: Restore parent state to parent, child state to child
  PCI/ASPM: Clarify that pcie_aspm=off means leave ASPM untouched
parents dccb07f2 f3d049b3

Documentation/admin-guide/kernel-parameters.txt

+3 −2
Original line number Diff line number Diff line
@@ -4594,9 +4594,10 @@ 
		norid		[S390] ignore the RID field and force use of

				one PCI domain per PCI function



	pcie_aspm=	[PCIE] Forcibly enable or disable PCIe Active State Power

	pcie_aspm=	[PCIE] Forcibly enable or ignore PCIe Active State Power

			Management.

		off	Disable ASPM.

		off	Don't touch ASPM configuration at all.  Leave any

			configuration done by firmware unchanged.

		force	Enable ASPM even on devices that claim not to support it.

			WARNING: Forcing ASPM on may cause system lockups.

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);

	}

}