diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2010-02-03 16:13:08 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-02-23 07:37:56 -0800 |
| commit | 16ecf8a237415fac700d6c227f763a2be566c92a (patch) | |
| tree | 9bc5ae477ce85a48ea2c8c8a0c7be5d2c9b2603e /arch/x86/kernel/amd_iommu_init.c | |
| parent | 6d14e6b46af551e2551594ab5ab9356fb4cebbe7 (diff) | |
x86/amd-iommu: Fix IOMMU-API initialization for iommu=pt
commit f5325094379158e6b876ea0010c807bf7890ec8f upstream
This patch moves the initialization of the iommu-api out of
the dma-ops initialization code. This ensures that the
iommu-api is initialized even with iommu=pt.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/x86/kernel/amd_iommu_init.c')
| -rw-r--r-- | arch/x86/kernel/amd_iommu_init.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c index c8243f04e62..362ab88c73a 100644 --- a/arch/x86/kernel/amd_iommu_init.c +++ b/arch/x86/kernel/amd_iommu_init.c @@ -1288,9 +1288,12 @@ int __init amd_iommu_init(void) ret = amd_iommu_init_passthrough(); else ret = amd_iommu_init_dma_ops(); + if (ret) goto free; + amd_iommu_init_api(); + enable_iommus(); if (iommu_pass_through) |