diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2010-01-22 17:44:35 +0100 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2010-01-22 17:44:35 +0100 |
| commit | f5325094379158e6b876ea0010c807bf7890ec8f (patch) | |
| tree | 54a40356a9076bddaac4186c1b97e2dbb98a5863 /arch/x86 | |
| parent | 2ca762790caf822f7b61430fbaffa3ae4219977f (diff) | |
| download | kernel-crypto-f5325094379158e6b876ea0010c807bf7890ec8f.tar.gz kernel-crypto-f5325094379158e6b876ea0010c807bf7890ec8f.tar.xz kernel-crypto-f5325094379158e6b876ea0010c807bf7890ec8f.zip | |
x86/amd-iommu: Fix IOMMU-API initialization for iommu=pt
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.
Cc: stable@kernel.org
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/amd_iommu_proto.h | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/amd_iommu.c | 8 | ||||
| -rw-r--r-- | arch/x86/kernel/amd_iommu_init.c | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/arch/x86/include/asm/amd_iommu_proto.h b/arch/x86/include/asm/amd_iommu_proto.h index 4d817f9e6e7..d2544f1d705 100644 --- a/arch/x86/include/asm/amd_iommu_proto.h +++ b/arch/x86/include/asm/amd_iommu_proto.h @@ -31,6 +31,7 @@ extern void amd_iommu_reset_cmd_buffer(struct amd_iommu *iommu); extern int amd_iommu_init_devices(void); extern void amd_iommu_uninit_devices(void); extern void amd_iommu_init_notifier(void); +extern void amd_iommu_init_api(void); #ifndef CONFIG_AMD_IOMMU_STATS static inline void amd_iommu_stats_init(void) { } diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index 4478a48198a..751ce73c6e1 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c @@ -2221,6 +2221,12 @@ static struct dma_map_ops amd_iommu_dma_ops = { /* * The function which clues the AMD IOMMU driver into dma_ops. */ + +void __init amd_iommu_init_api(void) +{ + register_iommu(&amd_iommu_ops); +} + int __init amd_iommu_init_dma_ops(void) { struct amd_iommu *iommu; @@ -2256,8 +2262,6 @@ int __init amd_iommu_init_dma_ops(void) /* Make the driver finally visible to the drivers */ dma_ops = &amd_iommu_dma_ops; - register_iommu(&amd_iommu_ops); - amd_iommu_stats_init(); return 0; diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c index fb490ce7dd5..9dc91b43147 100644 --- a/arch/x86/kernel/amd_iommu_init.c +++ b/arch/x86/kernel/amd_iommu_init.c @@ -1292,9 +1292,12 @@ static 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(); + amd_iommu_init_notifier(); enable_iommus(); |