summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/amd_iommu_init.c
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2008-06-26 21:28:07 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-27 10:12:21 +0200
commit8736197ba8e40d030eec0ab7a9e9f2be41810c4e (patch)
tree2ad786a9626caec77f5a4e11b12d44999661c789 /arch/x86/kernel/amd_iommu_init.c
parentc6da992e16a9d261eb9dfeff14e9777c3e0468c5 (diff)
downloadblackbird-op-linux-8736197ba8e40d030eec0ab7a9e9f2be41810c4e.tar.gz
blackbird-op-linux-8736197ba8e40d030eec0ab7a9e9f2be41810c4e.zip
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>
Diffstat (limited to 'arch/x86/kernel/amd_iommu_init.c')
-rw-r--r--arch/x86/kernel/amd_iommu_init.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
index bae4a76a3b54..d1aa2344cd90 100644
--- 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)));
OpenPOWER on IntegriCloud