summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2022-10-13 01:10:53 +0200
committerFelix Held <felix-coreboot@felixheld.de>2022-10-13 23:57:53 +0000
commitb16a87d16a6132ba9b773b4ed48584e1432fcc1b (patch)
tree98dd0470577747baa40f877a48c3c29df18f91b0
parent6e94623a24e2047941ac37fecb7fa8548c37dee4 (diff)
mb/amd/padmelon: enable PCI device 3.1 for Merlinfalcon
When using a Merlin Falcon APU, explicitly enable the PCIe root port at B0D3F1. B0D3F0 is only a dummy PCI device function, but needs to also be enabled in order for the actually used function to be usable. Prairie Falcon doesn't have and PCI device 3 on bus 0, so remove D3F0 from the common mainboard devicetree. Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Change-Id: I01f9b9ac2a9ebd5899a093d97eb5b2d76d309f66 Reviewed-on: https://review.coreboot.org/c/coreboot/+/68315 Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/mainboard/amd/padmelon/devicetree.cb1
-rw-r--r--src/mainboard/amd/padmelon/override-merlinfalcon.cb5
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mainboard/amd/padmelon/devicetree.cb b/src/mainboard/amd/padmelon/devicetree.cb
index ffac527705..9b3ddd7649 100644
--- a/src/mainboard/amd/padmelon/devicetree.cb
+++ b/src/mainboard/amd/padmelon/devicetree.cb
@@ -17,7 +17,6 @@ chip soc/amd/stoneyridge
device pci 2.2 on end # mini PCIe slot x1
device pci 2.4 on end # LAN RTL8111F
device pci 2.5 on end # LAN RTL8111F
- device pci 3.0 on end # GFX host bridge
device pci 8.0 on end # PSP
device pci 9.0 on end # HDA
device pci 9.2 on end # HDA
diff --git a/src/mainboard/amd/padmelon/override-merlinfalcon.cb b/src/mainboard/amd/padmelon/override-merlinfalcon.cb
index 160b458857..2abb241ba6 100644
--- a/src/mainboard/amd/padmelon/override-merlinfalcon.cb
+++ b/src/mainboard/amd/padmelon/override-merlinfalcon.cb
@@ -6,5 +6,8 @@ chip soc/amd/stoneyridge
{ {0xA0, 0x00}, {0xA4, 0x00} }, // socket 0 - Channel 0 & 1, slot 0
}"
- device domain 0 on end
+ device domain 0 on
+ device pci 3.0 on end # GFX host bridge
+ device pci 3.1 on end # GFX PCIe x8 slot
+ end
end