PCI: brcmstb: don't use ASPM state defines for register bits#6588
Merged
Conversation
Contributor
|
Can we at least have comments as to what bits 0 and 1 do? |
In commit b478e16 ("PCI/ASPM: Consolidate link state defines") PCIE_LINK_STATE_L1 and PCIE_LINK_STATE_L0s grew some bits for more granular control of ASPM. This broke the aspm-no-l0s override, instead disabling link ASPM completely if this DT property was specified. Just open-code the link capability register field bits. Fixes: caab002 ("PCI: brcmstb: Disable L0s component of ASPM if requested") Fixes: 0693b42 ("PCI: brcmstb: Split post-link up initialization to brcm_pcie_start_link()") Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
popcornmix
added a commit
to raspberrypi/rpi-firmware
that referenced
this pull request
Jan 9, 2025
See: raspberrypi/linux#6579 kernel: BCM2711, BCM2712 and RP1 UARTs are r1p5 See: raspberrypi/linux#6587 kernel: IMX415 support - rpi-6.6.y See: raspberrypi/linux#6582 kernel: PCI: brcmstb: don't use ASPM state defines for register bits See: raspberrypi/linux#6588 kernel: allo-piano-dac-plus: Trial patches for the second part of issue 6527 See: raspberrypi/linux#6590 kernel: configs: add CONFIG_CRYPTO_NHPOLY1305_NEON=m See: raspberrypi/linux#6594
popcornmix
added a commit
to raspberrypi/firmware
that referenced
this pull request
Jan 10, 2025
See: raspberrypi/linux#6579 kernel: BCM2711, BCM2712 and RP1 UARTs are r1p5 See: raspberrypi/linux#6587 kernel: IMX415 support - rpi-6.6.y See: raspberrypi/linux#6582 kernel: PCI: brcmstb: don't use ASPM state defines for register bits See: raspberrypi/linux#6588 kernel: allo-piano-dac-plus: Trial patches for the second part of issue 6527 See: raspberrypi/linux#6590 kernel: configs: add CONFIG_CRYPTO_NHPOLY1305_NEON=m See: raspberrypi/linux#6594
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
In commit b478e16 ("PCI/ASPM: Consolidate link state defines") PCIE_LINK_STATE_L1 and PCIE_LINK_STATE_L0s grew some bits for more granular control of ASPM.
This broke the aspm-no-l0s override, instead disabling link ASPM completely if this DT property was specified.
Just open-code the link capability register field bits.
Fixes: caab002 ("PCI: brcmstb: Disable L0s component of ASPM if requested")
Fixes: 0693b42 ("PCI: brcmstb: Split post-link up initialization to brcm_pcie_start_link()")