diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2021-02-17 00:15:12 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2021-02-18 01:15:25 +0000 |
| commit | 8aa9edfa4e01c5cc8066de7ae27056dcce82dae4 (patch) | |
| tree | 38e0995d576ba81e130c23f2d623d615c1040d35 /src | |
| parent | ff092d416769b4308c8c03a0dca578d5ce22ede6 (diff) | |
soc/amd/common/block/iommu: move ACPI name to common code
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I0f1dce92475ce0ee05a8d090fc3b3d1e613f62c3
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50821
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/soc/amd/common/block/iommu/iommu.c | 10 | ||||
| -rw-r--r-- | src/soc/amd/picasso/chip.c | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/soc/amd/common/block/iommu/iommu.c b/src/soc/amd/common/block/iommu/iommu.c index c870972813..49683d4620 100644 --- a/src/soc/amd/common/block/iommu/iommu.c +++ b/src/soc/amd/common/block/iommu/iommu.c @@ -21,11 +21,21 @@ static void iommu_read_resources(struct device *dev) res->flags = IORESOURCE_MEM; } +#if CONFIG(HAVE_ACPI_TABLES) +static const char *iommu_acpi_name(const struct device *dev) +{ + return "IOMM"; +} +#endif + static struct device_operations iommu_ops = { .read_resources = iommu_read_resources, .set_resources = pci_dev_set_resources, .enable_resources = pci_dev_enable_resources, .ops_pci = &pci_dev_ops_pci, +#if CONFIG(HAVE_ACPI_TABLES) + .acpi_name = iommu_acpi_name, +#endif }; static const unsigned short pci_device_ids[] = { diff --git a/src/soc/amd/picasso/chip.c b/src/soc/amd/picasso/chip.c index 1c8671c01e..eec5124bca 100644 --- a/src/soc/amd/picasso/chip.c +++ b/src/soc/amd/picasso/chip.c @@ -35,8 +35,6 @@ static const char *soc_acpi_name(const struct device *dev) if (dev->bus->dev->path.type == DEVICE_PATH_DOMAIN) { switch (dev->path.pci.devfn) { - case IOMMU_DEVFN: - return "IOMM"; default: printk(BIOS_WARNING, "Unknown root PCI device: dev: %d, fn: %d\n", PCI_SLOT(dev->path.pci.devfn), PCI_FUNC(dev->path.pci.devfn)); |