x86, AMD IOMMU: initialize dma_ops from IOMMU initialization and enable IOMMUs

This patch adds a call to the driver specific dma_ops initialization routine
from the AMD IOMMU hardware initialization. Further it adds the necessary code
to finally enable AMD IOMMU hardware.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Cc: iommu@lists.linux-foundation.org
Cc: bhavna.sarathy@amd.com
Cc: Sebastian.Biemueller@amd.com
Cc: robert.richter@amd.com
Cc: joro@8bytes.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
index bae4a76a3b545449177c1b639c3c9dd89f683d8b..d1aa2344cd90b087dd5040a0bb9759c0f2616e30 100644 (file)
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@ -644,6 +644,16 @@ static int __init init_memory_definitions(struct acpi_table_header *table)
        return 0;
 }
 
+static void __init enable_iommus(void)
+{
+       struct amd_iommu *iommu;
+
+       list_for_each_entry(iommu, &amd_iommu_list, list) {
+               iommu_set_exclusion_range(iommu);
+               iommu_enable(iommu);
+       }
+}
+
 int __init amd_iommu_init(void)
 {
        int i, ret = 0;
@@ -731,6 +741,12 @@ int __init amd_iommu_init(void)
        if (acpi_table_parse("IVRS", init_memory_definitions) != 0)
                goto free;
 
+       ret = amd_iommu_init_dma_ops();
+       if (ret)
+               goto free;
+
+       enable_iommus();
+
        printk(KERN_INFO "AMD IOMMU: aperture size is %d MB\n",
                        (1 << (amd_iommu_aperture_order-20)));