Skip to content

meson64: require the PCIe port services on boards that have PCIe #10739

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.

Sign up for GitHub

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

Merged
iav merged 1 commit into from
Sep 18, 2026
Merged

meson64: require the PCIe port services on boards that have PCIe #10739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion config/kernel/linux-meson64-bleedingedge.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,8 @@ CONFIG_NFC_S3FWRN82_UART=m
CONFIG_NFC_ST95HF=m
CONFIG_PAGE_POOL_STATS=y
CONFIG_PCI=y
# CONFIG_PCIEPORTBUS is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIEAER=y
CONFIG_HOTPLUG_PCI_ACPI=y
CONFIG_PCI_HOST_THUNDER_PEM=y
CONFIG_PCI_HOST_THUNDER_ECAM=y
Expand Down
3 changes: 2 additions & 1 deletion config/kernel/linux-meson64-current.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,8 @@ CONFIG_NFC_S3FWRN82_UART=m
CONFIG_NFC_ST95HF=m
CONFIG_PAGE_POOL_STATS=y
CONFIG_PCI=y
# CONFIG_PCIEPORTBUS is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIEAER=y
CONFIG_HOTPLUG_PCI_ACPI=y
CONFIG_PCI_HOST_THUNDER_PEM=y
CONFIG_PCI_HOST_THUNDER_ECAM=y
Expand Down
3 changes: 2 additions & 1 deletion config/kernel/linux-meson64-edge.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,8 @@ CONFIG_NFC_S3FWRN82_UART=m
CONFIG_NFC_ST95HF=m
CONFIG_PAGE_POOL_STATS=y
CONFIG_PCI=y
# CONFIG_PCIEPORTBUS is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIEAER=y
CONFIG_HOTPLUG_PCI_ACPI=y
CONFIG_PCI_HOST_THUNDER_PEM=y
CONFIG_PCI_HOST_THUNDER_ECAM=y
Expand Down
3 changes: 2 additions & 1 deletion config/kernel/linux-meson64-oldlts.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,8 @@ CONFIG_NFC_S3FWRN82_UART=m
CONFIG_NFC_ST95HF=m
CONFIG_PAGE_POOL_STATS=y
CONFIG_PCI=y
# CONFIG_PCIEPORTBUS is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIEAER=y
CONFIG_HOTPLUG_PCI_ACPI=y
CONFIG_PCI_HOST_THUNDER_PEM=y
CONFIG_PCI_HOST_THUNDER_ECAM=y
Expand Down
10 changes: 10 additions & 0 deletions config/sources/families/include/meson64_common.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,16 @@ function custom_kernel_config__enable_rtl88x2cs_driver() {
opts_m+=("CONFIG_RTL8822CS")
}

# ODROID-HC4, Khadas VIM3 and VIM3L, Banana Pi M2S and CM4IO enable PCIe in their
# device tree. Without the port services their root port has no driver: nothing
# moves it to D3hot for suspend, and AER stays unserviced.
function custom_kernel_config__meson64_pcie_port_services() {
Comment thread
rpardini marked this conversation as resolved.
opts_y+=(
CONFIG_PCIEPORTBUS
CONFIG_PCIEAER
)
}

# this helper function includes postprocess for s400 and its variants.
# $1 PATH for uboot blob repo
# $2 dir name in uboot blob repo
Expand Down
Loading