summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJoerg Roedel <joro@8bytes.org>2013-02-06 12:55:23 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-04 06:09:03 +0800
commitffbf1423cc7e8ed018d0ba8fbe3f9f3bb816fa4c (patch)
tree878215e4c8bf88447ecf4790295e8ecb0f0fb4ee /arch
parent1adbb5db21a1e08537061607abc9b0a9e7e12848 (diff)
downloadlinux-stable-ffbf1423cc7e8ed018d0ba8fbe3f9f3bb816fa4c.tar.gz
linux-stable-ffbf1423cc7e8ed018d0ba8fbe3f9f3bb816fa4c.tar.bz2
linux-stable-ffbf1423cc7e8ed018d0ba8fbe3f9f3bb816fa4c.zip
iommu/amd: Initialize device table after dma_ops
commit f528d980c17b8714aedc918ba86e058af914d66b upstream. When dma_ops are initialized the unity mappings are created. The init_device_table_dma() function makes sure DMA from all devices is blocked by default. This opens a short window in time where DMA to unity mapped regions is blocked by the IOMMU. Make sure this does not happen by initializing the device table after dma_ops. Signed-off-by: Joerg Roedel <joro@8bytes.org> Signed-off-by: Shuah Khan <shuah.khan@hp.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/amd_iommu_init.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
index 33df6e82f653..d86aa3f15041 100644
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@ -1363,6 +1363,7 @@ static struct syscore_ops amd_iommu_syscore_ops = {
*/
static int __init amd_iommu_init(void)
{
+ struct amd_iommu *iommu;
int i, ret = 0;
/*
@@ -1411,9 +1412,6 @@ static int __init amd_iommu_init(void)
if (amd_iommu_pd_alloc_bitmap == NULL)
goto free;
- /* init the device table */
- init_device_table();
-
/*
* let all alias entries point to itself
*/
@@ -1463,6 +1461,12 @@ static int __init amd_iommu_init(void)
if (ret)
goto free_disable;
+ /* init the device table */
+ init_device_table();
+
+ for_each_iommu(iommu)
+ iommu_flush_all_caches(iommu);
+
amd_iommu_init_api();
amd_iommu_init_notifier();