Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+5
-4
+3
-2
Documentation/admin-guide/kernel-parameters.txt
+3
-2
Documentation/admin-guide/kernel-parameters.txt
···
4594
4594
norid [S390] ignore the RID field and force use of
4595
4595
one PCI domain per PCI function
4596
4596
4597
-
pcie_aspm= [PCIE] Forcibly enable or disable PCIe Active State Power
4597
+
pcie_aspm= [PCIE] Forcibly enable or ignore PCIe Active State Power
4598
4598
Management.
4599
-
off Disable ASPM.
4599
+
off Don't touch ASPM configuration at all. Leave any
4600
+
configuration done by firmware unchanged.
4600
4601
force Enable ASPM even on devices that claim not to support it.
4601
4602
WARNING: Forcing ASPM on may cause system lockups.
4602
4603
+2
-2
drivers/pci/pcie/aspm.c
+2
-2
drivers/pci/pcie/aspm.c
···
177
177
/* Restore L0s/L1 if they were enabled */
178
178
if (FIELD_GET(PCI_EXP_LNKCTL_ASPMC, clnkctl) ||
179
179
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);
182
182
}
183
183
}
184
184