aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Roedel2013-02-06 05:55:23 -0600
committerGreg Kroah-Hartman2013-03-03 16:09:03 -0600
commitffbf1423cc7e8ed018d0ba8fbe3f9f3bb816fa4c (patch)
tree878215e4c8bf88447ecf4790295e8ecb0f0fb4ee
parent1adbb5db21a1e08537061607abc9b0a9e7e12848 (diff)
downloadkernel-common-ffbf1423cc7e8ed018d0ba8fbe3f9f3bb816fa4c.tar.gz
kernel-common-ffbf1423cc7e8ed018d0ba8fbe3f9f3bb816fa4c.tar.xz
kernel-common-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>
-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 33df6e82f65..d86aa3f1504 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 = {
1363 */ 1363 */
1364static int __init amd_iommu_init(void) 1364static int __init amd_iommu_init(void)
1365{ 1365{
1366 struct amd_iommu *iommu;
1366 int i, ret = 0; 1367 int i, ret = 0;
1367 1368
1368 /* 1369 /*
@@ -1411,9 +1412,6 @@ static int __init amd_iommu_init(void)
1411 if (amd_iommu_pd_alloc_bitmap == NULL) 1412 if (amd_iommu_pd_alloc_bitmap == NULL)
1412 goto free; 1413 goto free;
1413 1414
1414 /* init the device table */
1415 init_device_table();
1416
1417 /* 1415 /*
1418 * let all alias entries point to itself 1416 * let all alias entries point to itself
1419 */ 1417 */
@@ -1463,6 +1461,12 @@ static int __init amd_iommu_init(void)
1463 if (ret) 1461 if (ret)
1464 goto free_disable; 1462 goto free_disable;
1465 1463
1464 /* init the device table */
1465 init_device_table();
1466
1467 for_each_iommu(iommu)
1468 iommu_flush_all_caches(iommu);
1469
1466 amd_iommu_init_api(); 1470 amd_iommu_init_api();
1467 1471
1468 amd_iommu_init_notifier(); 1472 amd_iommu_init_notifier();