Skip to content

PCI/ASPM: Mask ASPM states based on Devicetree properties

Krishna Chaitanya Chundru linux-pci lkml 6 versions – Applied

Status from this message: Applied to pci/aspm for v7.3, thank you!

Get series with b4
b4 am [email protected] change-id 20260429-aspm-da55a54279e4

Versions newest first

  1. v6 Latest3 patches 4 repliesApplied
  2. v51 patch 1 replySuperseded
  3. v41 patch 0 repliesSuperseded
Earlier versions · 3
VersionPostedPatchesRepliesStatus
v31 patch0 repliesSuperseded
v21 patch0 repliesSuperseded
v11 patch2 repliesSuperseded

Changes in v6 from the cover letter

- Disable/enable each function L0s/L1. (sashiko)
- Move from pcie_capability_write_word to pcie_capability_clear_and_set_word (Sashiko)
- Link to v5: https://patch.msgid.link/[email protected]

Patches in v6 Applied

#Subject and filesSizeRepliesApplied
1/3PCI/ASPM: Use pcie_capability_clear_and_set_word() for ASPM disable/restoredrivers/pci/pcie/aspm.c+10 -61 reply
2/3PCI/ASPM: Disable/restore ASPM on every function for multi-function devicesdrivers/pci/pcie/aspm.c+8 -51 reply
3/3PCI/ASPM: Mask ASPM states based on Devicetree propertiesdrivers/pci/pcie/aspm.c+90 -421 reply

Reviews trailers per patch

All 3 patches have a Reviewed-by or Acked-by.

PatchManivannan Sadhasivam
1/3R-b
2/3R-b
3/3R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v6 thread

Cover letter [PATCH v6 0/3] PCI/ASPM: Mask ASPM states based on Devicetree properties

---
Changes in v6:
- Disable/enable each function L0s/L1. (sashiko)
- Move from pcie_capability_write_word to pcie_capability_clear_and_set_word (Sashiko)
- Link to v5: https://patch.msgid.link/[email protected]

Changes in v5:
- update all the child devices when enabling the ASPM back (sashiko).
- Link to v4: https://patch.msgid.link/[email protected]

Changes in v4:
- Clear link->aspm_enabled alongside aspm_support/aspm_default when an ASPM state is masked, so it no longer goes stale relative to hardware (sashiko).
- Mask the LNKCTL restore snapshot against the post-override
aspm_support so the restore step can no longer re-enable a state the Devicetree override just disabled. (sashiko)
- Link to v3: https://patch.msgid.link/[email protected]

Changes in v3:
- Move pcie_aspm_override_default_link_state() call in pcie_aspm_cap_init() to before the "Restore L0s/L1" block. pcie_aspm_cap_init() disables L1 in hardware prior to aspm_l1ss_init() and re-enables it only in the restore block. Calling pcie_config_aspm_l1ss() while L1 is already disabled satisfies its precondition ("Caller must disable L1 first"), whereas the previous placement after the restore violated it (sashiko).
- Link to v2: https://patch.msgid.link/[email protected]

Changes in v2:
- Disable L1ss when L1 is disabled as pointed by sashiko.
- Disable L1ss if bootloader enables them but we are disabling via devicetree pointed by sashiko.
- Link to v1: https://patch.msgid.link/[email protected]

---
Krishna Chaitanya Chundru (3):
PCI/ASPM: Use pcie_capability_clear_and_set_word() for ASPM disable/restore PCI/ASPM: Disable/restore ASPM on every function for multi-function devices PCI/ASPM: Mask ASPM states based on Devicetree properties

 drivers/pci/pcie/aspm.c | 149 +++++++++++++++++++++++++++++++++---------------
 1 file changed, 102 insertions(+), 47 deletions(-)

---
base-commit: f5098b6bae761e346ebcd9da7f95622c04733cff
change-id: 20260429-aspm-da55a54279e4

Best regards,

Signature · 1 line
Krishna Chaitanya Chundru <[email protected]>