diff options
| author | Marshall Dawson <marshalldawson3rd@gmail.com> | 2019-05-03 12:55:16 -0600 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2019-06-06 18:52:07 +0000 |
| commit | ec63a7140a3326fa177114a7253c74039ab07454 (patch) | |
| tree | 3e6c597e0ad6ef5aed9145bfaa2ffa03cc742316 /src/soc | |
| parent | 43c26cb07fa42e6d5013f2e6bcb4e05522d24c1b (diff) | |
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>
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/amd/common/block/iommu/Kconfig | 5 | ||||
| -rw-r--r-- | src/soc/amd/common/block/iommu/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/soc/amd/common/block/iommu/iommu.c (renamed from src/soc/amd/stoneyridge/iommu.c) | 10 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/Kconfig | 1 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/Makefile.inc | 1 |
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 0000000000..4580400a7c --- /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 0000000000..d08dbfcc33 --- /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 index e33402ac43..1c982ca00d 100644 --- a/src/soc/amd/stoneyridge/iommu.c +++ b/src/soc/amd/common/block/iommu/iommu.c @@ -43,13 +43,17 @@ static struct device_operations iommu_ops = { .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 d386012a86..5bad30955b 100644 --- a/src/soc/amd/stoneyridge/Kconfig +++ b/src/soc/amd/stoneyridge/Kconfig @@ -46,6 +46,7 @@ config CPU_SPECIFIC_OPTIONS 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 7c4e875130..57c886d1a8 100644 --- a/src/soc/amd/stoneyridge/Makefile.inc +++ b/src/soc/amd/stoneyridge/Makefile.inc @@ -99,7 +99,6 @@ ramstage-y += mca.c 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 |