Martin Roth merged this change.
soc/amd/stoneyridge: Move IOMMU support to common
BUG=b:131682806
Change-Id: Icb02180645c9e7e6dc973438c777228b031b3f54
Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32657
Reviewed-by: Richard Spiegel <richard.spiegel@silverbackltd.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
A src/soc/amd/common/block/iommu/Kconfig
A src/soc/amd/common/block/iommu/Makefile.inc
R src/soc/amd/common/block/iommu/iommu.c
M src/soc/amd/stoneyridge/Kconfig
M src/soc/amd/stoneyridge/Makefile.inc
5 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/soc/amd/common/block/iommu/Kconfig b/src/soc/amd/common/block/iommu/Kconfig
new file mode 100644
index 0000000..4580400
--- /dev/null
+++ b/src/soc/amd/common/block/iommu/Kconfig
@@ -0,0 +1,5 @@
+config SOC_AMD_COMMON_BLOCK_IOMMU
+ bool
+ default n
+ help
+ Select this option to use AMD common IOMMU support.
diff --git a/src/soc/amd/common/block/iommu/Makefile.inc b/src/soc/amd/common/block/iommu/Makefile.inc
new file mode 100644
index 0000000..d08dbfc
--- /dev/null
+++ b/src/soc/amd/common/block/iommu/Makefile.inc
@@ -0,0 +1 @@
+ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_IOMMU) += iommu.c
diff --git a/src/soc/amd/stoneyridge/iommu.c b/src/soc/amd/common/block/iommu/iommu.c
similarity index 89%
rename from src/soc/amd/stoneyridge/iommu.c
rename to src/soc/amd/common/block/iommu/iommu.c
index e33402a..1c982ca 100644
--- a/src/soc/amd/stoneyridge/iommu.c
+++ b/src/soc/amd/common/block/iommu/iommu.c
@@ -43,13 +43,17 @@
.read_resources = iommu_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
- .init = 0,
- .scan_bus = 0,
.ops_pci = &lops_pci,
};
+static const unsigned short pci_device_ids[] = {
+ PCI_DEVICE_ID_AMD_15H_MODEL_303F_NB_IOMMU,
+ PCI_DEVICE_ID_AMD_15H_MODEL_707F_NB_IOMMU,
+ 0
+};
+
static const struct pci_driver iommu_driver __pci_driver = {
.ops = &iommu_ops,
.vendor = PCI_VENDOR_ID_AMD,
- .device = PCI_DEVICE_ID_AMD_15H_MODEL_707F_NB_IOMMU,
+ .devices = pci_device_ids,
};
diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig
index d386012..5bad309 100644
--- a/src/soc/amd/stoneyridge/Kconfig
+++ b/src/soc/amd/stoneyridge/Kconfig
@@ -46,6 +46,7 @@
select SOC_AMD_PI
select SOC_AMD_COMMON
select SOC_AMD_COMMON_BLOCK
+ select SOC_AMD_COMMON_BLOCK_IOMMU
select SOC_AMD_COMMON_BLOCK_ACPIMMIO
select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS
select SOC_AMD_COMMON_BLOCK_ACPI
diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc
index 7c4e875..57c886d 100644
--- a/src/soc/amd/stoneyridge/Makefile.inc
+++ b/src/soc/amd/stoneyridge/Makefile.inc
@@ -99,7 +99,6 @@
ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c
ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c
ramstage-y += gpio.c
-ramstage-y += iommu.c
ramstage-y += monotonic_timer.c
ramstage-y += southbridge.c
ramstage-y += sb_util.c
To view, visit change 32657. To unsubscribe, or for help writing mail filters, visit settings.