summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2023-12-07 23:19:35 +0100
committerFelix Held <felix-coreboot@felixheld.de>2023-12-12 18:30:55 +0000
commit5aaaee3486b9f5c1fe4b1396de94e2604ebfd766 (patch)
treeea1465949f48323bc32ce7f1882b4a3bbc93fc13
parent2f58bbd686088597aa33f1b44450957443cd8714 (diff)
soc/amd/genoa/chipset.cb: disable IOMMU devices by default
Disable the IOMMU PCI devices in the chipset devicetree. In order for the IOMMU devices on the Onyx mainboard still be enabled, enable them in the mainboard devicetree. Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Change-Id: I8c1bbbf370a3b5566a8484bcfa88dc4efa31222b Reviewed-on: https://review.coreboot.org/c/coreboot/+/79409 Reviewed-by: Varshit Pandya <pandyavarshit@gmail.com> Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/mainboard/amd/onyx/devicetree.cb4
-rw-r--r--src/soc/amd/genoa/chipset.cb8
2 files changed, 8 insertions, 4 deletions
diff --git a/src/mainboard/amd/onyx/devicetree.cb b/src/mainboard/amd/onyx/devicetree.cb
index 3d63da586b..80c25e1899 100644
--- a/src/mainboard/amd/onyx/devicetree.cb
+++ b/src/mainboard/amd/onyx/devicetree.cb
@@ -53,6 +53,7 @@ chip soc/amd/genoa
}"
device domain 0 on
+ device ref iommu_0 on end
device ref gpp_bridge_0_0_a on
chip vendorcode/amd/opensil/genoa_poc/mpio # P2
register "start_lane" = "48"
@@ -84,6 +85,7 @@ chip soc/amd/genoa
end
device domain 1 on
+ device ref iommu_1 on end
device ref gpp_bridge_1_0_a on
chip vendorcode/amd/opensil/genoa_poc/mpio # P3
register "start_lane" = "16"
@@ -105,6 +107,7 @@ chip soc/amd/genoa
end
device domain 2 on
+ device ref iommu_2 on end
device ref gpp_bridge_2_0_a on
chip vendorcode/amd/opensil/genoa_poc/mpio # P1
register "start_lane" = "32"
@@ -128,6 +131,7 @@ chip soc/amd/genoa
end
device domain 3 on
+ device ref iommu_3 on end
device ref gpp_bridge_3_0_a on
chip vendorcode/amd/opensil/genoa_poc/mpio # P0
register "start_lane" = "0"
diff --git a/src/soc/amd/genoa/chipset.cb b/src/soc/amd/genoa/chipset.cb
index 739e50fe32..17ae9fb270 100644
--- a/src/soc/amd/genoa/chipset.cb
+++ b/src/soc/amd/genoa/chipset.cb
@@ -12,7 +12,7 @@ chip soc/amd/genoa
device domain 0 on
ops genoa_pci_domain_ops
device pci 00.0 alias gnb_0 on end
- device pci 00.2 alias iommu_0 on ops amd_iommu_ops end
+ device pci 00.2 alias iommu_0 off ops amd_iommu_ops end
device pci 00.3 alias rcec_0 off end
device pci 01.0 on end # Dummy device function, do not disable
@@ -80,7 +80,7 @@ chip soc/amd/genoa
device domain 1 on
ops genoa_pci_domain_ops
device pci 00.0 alias gnb_1 on end
- device pci 00.2 alias iommu_1 on ops amd_iommu_ops end
+ device pci 00.2 alias iommu_1 off ops amd_iommu_ops end
device pci 00.3 alias rcec_1 off end
device pci 01.0 on end # Dummy device function, do not disable
@@ -121,7 +121,7 @@ chip soc/amd/genoa
device domain 2 on
ops genoa_pci_domain_ops
device pci 00.0 alias gnb_2 on end
- device pci 00.2 alias iommu_2 on ops amd_iommu_ops end
+ device pci 00.2 alias iommu_2 off ops amd_iommu_ops end
device pci 00.3 alias rcec_2 off end
device pci 01.0 on end # Dummy device function, do not disable
@@ -162,7 +162,7 @@ chip soc/amd/genoa
device domain 3 on
ops genoa_pci_domain_ops
device pci 00.0 alias gnb_3 on end
- device pci 00.2 alias iommu_3 on ops amd_iommu_ops end
+ device pci 00.2 alias iommu_3 off ops amd_iommu_ops end
device pci 00.3 alias rcec_3 off end
device pci 01.0 on end # Dummy device function, do not disable