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>
This commit is contained in:
Marshall Dawson 2019-05-03 12:55:16 -06:00 committed by Martin Roth
parent 43c26cb07f
commit ec63a7140a
5 changed files with 14 additions and 4 deletions

View File

@ -0,0 +1,5 @@
config SOC_AMD_COMMON_BLOCK_IOMMU
bool
default n
help
Select this option to use AMD common IOMMU support.

View File

@ -0,0 +1 @@
ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_IOMMU) += iommu.c

View File

@ -43,13 +43,17 @@ static struct device_operations iommu_ops = {
.read_resources = iommu_read_resources, .read_resources = iommu_read_resources,
.set_resources = pci_dev_set_resources, .set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources, .enable_resources = pci_dev_enable_resources,
.init = 0,
.scan_bus = 0,
.ops_pci = &lops_pci, .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 = { static const struct pci_driver iommu_driver __pci_driver = {
.ops = &iommu_ops, .ops = &iommu_ops,
.vendor = PCI_VENDOR_ID_AMD, .vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_15H_MODEL_707F_NB_IOMMU, .devices = pci_device_ids,
}; };

View File

@ -46,6 +46,7 @@ config CPU_SPECIFIC_OPTIONS
select SOC_AMD_PI select SOC_AMD_PI
select SOC_AMD_COMMON select SOC_AMD_COMMON
select SOC_AMD_COMMON_BLOCK select SOC_AMD_COMMON_BLOCK
select SOC_AMD_COMMON_BLOCK_IOMMU
select SOC_AMD_COMMON_BLOCK_ACPIMMIO select SOC_AMD_COMMON_BLOCK_ACPIMMIO
select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS
select SOC_AMD_COMMON_BLOCK_ACPI select SOC_AMD_COMMON_BLOCK_ACPI

View File

@ -99,7 +99,6 @@ ramstage-y += mca.c
ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c
ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c
ramstage-y += gpio.c ramstage-y += gpio.c
ramstage-y += iommu.c
ramstage-y += monotonic_timer.c ramstage-y += monotonic_timer.c
ramstage-y += southbridge.c ramstage-y += southbridge.c
ramstage-y += sb_util.c ramstage-y += sb_util.c