iommu/amd: Set AMD iommu callbacks for amba bus

AMD Uart DMA belongs to ACPI HID type device, and its driver
is basing on AMBA Bus, need also IOMMU support.

This patch is just to set the AMD iommu callbacks for amba bus.

Signed-off-by: Wan Zongshun <Vincent.Wan@amd.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 713e7ea062104a764daac9d975512755cfc54323..c430c10fb645a1c78b9d20d7c7587f8e07bd5075 100644 (file)
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -20,6 +20,7 @@
 #include <linux/ratelimit.h>
 #include <linux/pci.h>
 #include <linux/acpi.h>
+#include <linux/amba/bus.h>
 #include <linux/pci-ats.h>
 #include <linux/bitmap.h>
 #include <linux/slab.h>
@@ -2969,7 +2970,17 @@ static struct dma_map_ops amd_iommu_dma_ops = {
 
 int __init amd_iommu_init_api(void)
 {
-       return bus_set_iommu(&pci_bus_type, &amd_iommu_ops);
+       int err = 0;
+
+       err = bus_set_iommu(&pci_bus_type, &amd_iommu_ops);
+       if (err)
+               return err;
+#ifdef CONFIG_ARM_AMBA
+       err = bus_set_iommu(&amba_bustype, &amd_iommu_ops);
+       if (err)
+               return err;
+#endif
+       return 0;
 }
 
 int __init amd_iommu_init_dma_ops(void)