Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PCI: brcmstb: don't use ASPM state defines for register bits #6588

Merged
merged 1 commit into from
Jan 7, 2025

Conversation

P33M
Copy link
Contributor

@P33M P33M commented Jan 7, 2025

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()")

@pelwell
Copy link
Contributor

pelwell commented Jan 7, 2025

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 <[email protected]>
@pelwell pelwell merged commit 6af7775 into raspberrypi:rpi-6.12.y Jan 7, 2025
11 of 12 checks passed
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants