Sorry, evidently I forgot to cc the lists for this v6.9 pull request last week. This has been merged and appeared in v6.9: https://git.kernel.org/linus/1ab1a19db13c On Tue, May 07, 2024 at 08:39:24PM -0500, Bjorn Helgaas wrote: > The following changes since commit 4cece764965020c22cff7665b18a012006359095: > > Linux 6.9-rc1 (2024-03-24 14:10:05 -0700) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git tags/pci-v6.9-fixes-2 > > for you to fetch changes up to f3d049b35b01fff656d720606fcbab0b819f26d1: > > PCI/ASPM: Restore parent state to parent, child state to child (2024-05-06 14:12:40 -0500) > > ---------------------------------------------------------------- > - 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) > > ---------------------------------------------------------------- > Bjorn Helgaas (1): > PCI/ASPM: Clarify that pcie_aspm=off means leave ASPM untouched > > Kai-Heng Feng (1): > PCI/ASPM: Restore parent state to parent, child state to child > > Documentation/admin-guide/kernel-parameters.txt | 5 +++-- > drivers/pci/pcie/aspm.c | 4 ++-- > 2 files changed, 5 insertions(+), 4 deletions(-)
