Change in coreboot[master]: mainboards using soc/amd/picasso: use aliases for PCIe devices on bus 0
Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/55103 )
Change subject: mainboards using soc/amd/picasso: use aliases for PCIe devices on bus 0 ......................................................................
mainboards using soc/amd/picasso: use aliases for PCIe devices on bus 0
Signed-off-by: Felix Held felix-coreboot@felixheld.de Change-Id: Ia6199c70163d32467abe5ba5da55c73ff62ba10f Reviewed-on: https://review.coreboot.org/c/coreboot/+/55103 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Raul Rangel rrangel@chromium.org --- M src/mainboard/amd/bilby/devicetree.cb M src/mainboard/amd/mandolin/variants/cereme/devicetree.cb M src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb M src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb M src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb M src/mainboard/google/zork/variants/vilboz/overridetree.cb M util/mainboard/google/trembyle/template/overridetree.cb 7 files changed, 33 insertions(+), 33 deletions(-)
Approvals: build bot (Jenkins): Verified Raul Rangel: Looks good to me, approved
diff --git a/src/mainboard/amd/bilby/devicetree.cb b/src/mainboard/amd/bilby/devicetree.cb index 7015185..10a5d2e 100644 --- a/src/mainboard/amd/bilby/devicetree.cb +++ b/src/mainboard/amd/bilby/devicetree.cb @@ -140,11 +140,11 @@
device domain 0 on subsystemid 0x1022 0x1510 inherit - device pci 0.2 on end # IOMMU - device pci 1.1 on end # GPP Bridge 0 - device pci 1.2 on end # GPP Bridge 1 - device pci 1.5 on end # NVMe - device pci 8.1 on # Bridge to Bus A + device ref iommu on end + device ref gpp_bridge_0 on end + device ref gpp_bridge_1 on end + device ref gpp_bridge_4 on end # NVMe + device ref internal_bridge_a on device pci 0.0 on end # Internal GPU device pci 0.1 on end # Display HDA device pci 0.2 on end # Crypto Coprocessor @@ -154,12 +154,12 @@ device pci 0.6 on end # HDA device pci 0.7 on end # non-Sensor Fusion Hub device end - device pci 8.2 on # Bridge to Bus B + device ref internal_bridge_b on device pci 0.0 off end # AHCI device pci 0.1 off end # integrated Ethernet MAC device pci 0.2 off end # integrated Ethernet MAC end - device pci 14.3 on # D14F3 bridge + device ref lpc_bridge on chip superio/smsc/sio1036 # optional debug card end end diff --git a/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb b/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb index d1e0241..9b21895 100644 --- a/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb +++ b/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb @@ -140,9 +140,9 @@
device domain 0 on subsystemid 0x1022 0x1510 inherit - device pci 0.2 on end # IOMMU - device pci 1.1 on end # Bridge to PCIe Ethernet chip - device pci 8.1 on # Bridge to Bus A + device ref iommu on end + device ref gpp_bridge_0 on end # Bridge to PCIe Ethernet chip + device ref internal_bridge_a on device pci 0.0 on end # Internal GPU device pci 0.1 on end # Display HDA device pci 0.2 on end # Crypto Coprocessor @@ -152,12 +152,12 @@ device pci 0.6 on end # HDA device pci 0.7 on end # non-Sensor Fusion Hub device end - device pci 8.2 on # Bridge to Bus B + device ref internal_bridge_b on device pci 0.0 off end # AHCI device pci 0.1 off end # integrated Ethernet MAC device pci 0.2 off end # integrated Ethernet MAC end - device pci 14.3 on # D14F3 bridge + device ref lpc_bridge on chip superio/smsc/sio1036 # optional debug card end end diff --git a/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb b/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb index 1c20095..fef625f 100644 --- a/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb +++ b/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb @@ -140,9 +140,9 @@
device domain 0 on subsystemid 0x1022 0x1510 inherit - device pci 0.2 on end # IOMMU - device pci 1.3 on end # Bridge to PCIe Ethernet chip - device pci 8.1 on # Bridge to Bus A + device ref iommu on end + device ref gpp_bridge_2 on end # Bridge to PCIe Ethernet chip + device ref internal_bridge_a on device pci 0.0 on end # Internal GPU device pci 0.1 on end # Display HDA device pci 0.2 on end # Crypto Coprocessor @@ -152,12 +152,12 @@ device pci 0.6 on end # HDA device pci 0.7 on end # non-Sensor Fusion Hub device end - device pci 8.2 on # Bridge to Bus B + device ref internal_bridge_b on device pci 0.0 on end # AHCI device pci 0.1 off end # integrated Ethernet MAC device pci 0.2 off end # integrated Ethernet MAC end - device pci 14.3 on # D14F3 bridge + device ref lpc_bridge on chip superio/smsc/sio1036 # optional debug card end end diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb index 0d0e829..57710c2 100644 --- a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb +++ b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb @@ -255,15 +255,15 @@ # See AMD 55570-B1 Table 13: PCI Device ID Assignments. device domain 0 on subsystemid 0x1022 0x1510 inherit - device pci 0.2 on end # IOMMU - device pci 1.2 on # GPP Bridge 1 - Wifi + device ref iommu on end + device ref gpp_bridge_1 on # Wifi chip drivers/wifi/generic register "wake" = "GEVENT_8" device pci 00.0 on end end end - device pci 1.3 on end # GPP Bridge 2 - SD - device pci 8.1 on # Internal GPP Bridge 0 to Bus A + device ref gpp_bridge_2 on end # SD + device ref internal_bridge_a on device pci 0.0 on end # Internal GPU device pci 0.1 on end # Display HDA device pci 0.2 on end # Crypto Coprocessor @@ -353,7 +353,7 @@ device pci 0.6 off end # HDA device pci 0.7 on end # non-Sensor Fusion Hub device end - device pci 14.3 on # - D14F3 bridge + device ref lpc_bridge on chip ec/google/chromeec device pnp 0c09.0 on chip ec/google/chromeec/i2c_tunnel diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb index 8d0abad..1ddc763 100644 --- a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb +++ b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb @@ -248,16 +248,16 @@ # See AMD 55570-B1 Table 13: PCI Device ID Assignments. device domain 0 on subsystemid 0x1022 0x1510 inherit - device pci 0.2 on end # IOMMU - device pci 1.2 on # GPP Bridge 1 - Wifi + device ref iommu on end + device ref gpp_bridge_1 on # Wifi chip drivers/wifi/generic register "wake" = "GEVENT_8" device pci 00.0 on end end end - device pci 1.3 on end # GPP Bridge 2 - SD - device pci 1.7 on end # GPP Bridge 6 - NVME - device pci 8.1 on # Internal GPP Bridge 0 to Bus A + device ref gpp_bridge_2 on end # SD + device ref gpp_bridge_6 on end # NVME + device ref internal_bridge_a on device pci 0.0 on end # Internal GPU device pci 0.1 on end # Display HDA device pci 0.2 on end # Crypto Coprocessor @@ -374,7 +374,7 @@ device pci 0.6 off end # HDA device pci 0.7 on end # non-Sensor Fusion Hub device end - device pci 14.3 on # - D14F3 bridge + device ref lpc_bridge on chip ec/google/chromeec device pnp 0c09.0 on chip ec/google/chromeec/i2c_tunnel diff --git a/src/mainboard/google/zork/variants/vilboz/overridetree.cb b/src/mainboard/google/zork/variants/vilboz/overridetree.cb index 43a64b0d..7cadaf8 100644 --- a/src/mainboard/google/zork/variants/vilboz/overridetree.cb +++ b/src/mainboard/google/zork/variants/vilboz/overridetree.cb @@ -152,13 +152,13 @@ # See AMD 55570-B1 Table 13: PCI Device ID Assignments. device domain 0 on subsystemid 0x1022 0x1510 inherit - device pci 1.3 on + device ref gpp_bridge_2 on chip drivers/generic/bayhub_lv2 register "enable_power_saving" = "1" device pci 00.0 on end end - end # GPP Bridge 2 - SD - device pci 8.1 on + end # SD + device ref internal_bridge_a on device pci 0.5 on chip drivers/amd/i2s_machine_dev register "hid" = ""AMDI1015"" @@ -200,7 +200,7 @@ end end # Audio end - device pci 14.3 on # - D14F3 bridge + device ref lpc_bridge on chip ec/google/chromeec device pnp 0c09.0 on chip ec/google/chromeec/i2c_tunnel diff --git a/util/mainboard/google/trembyle/template/overridetree.cb b/util/mainboard/google/trembyle/template/overridetree.cb index d09c942..52607d1 100644 --- a/util/mainboard/google/trembyle/template/overridetree.cb +++ b/util/mainboard/google/trembyle/template/overridetree.cb @@ -37,7 +37,7 @@ # See AMD 55570-B1 Table 13: PCI Device ID Assignments. device domain 0 on subsystemid 0x1022 0x1510 inherit - device pci 1.7 on end # GPP Bridge 6 - NVME + device ref gpp_bridge_6 on end # NVME end # domain
device mmio 0xfedc4000 on end
-
Felix Held (Code Review)