diff options
| author | Joerg Roedel <joro@8bytes.org> | 2013-02-06 12:55:23 +0100 |
|---|---|---|
| committer | Joerg Roedel <joro@8bytes.org> | 2013-02-07 22:05:49 +0100 |
| commit | f528d980c17b8714aedc918ba86e058af914d66b (patch) | |
| tree | ea899fb1e287775f2cf05735040f772ffca728e6 /drivers/iommu | |
| parent | 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7 (diff) | |
| download | linux-3.10-f528d980c17b8714aedc918ba86e058af914d66b.tar.gz linux-3.10-f528d980c17b8714aedc918ba86e058af914d66b.tar.bz2 linux-3.10-f528d980c17b8714aedc918ba86e058af914d66b.zip | |
iommu/amd: Initialize device table after dma_ops
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.
Cc: stable@vger.kernel.org
Signed-off-by: Joerg Roedel <joro@8bytes.org>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/amd_iommu_init.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index faf10ba1ed9..b6ecddb63cd 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -1876,11 +1876,6 @@ static int amd_iommu_init_dma(void) struct amd_iommu *iommu; int ret; - init_device_table_dma(); - - for_each_iommu(iommu) - iommu_flush_all_caches(iommu); - if (iommu_pass_through) ret = amd_iommu_init_passthrough(); else @@ -1889,6 +1884,11 @@ static int amd_iommu_init_dma(void) if (ret) return ret; + init_device_table_dma(); + + for_each_iommu(iommu) + iommu_flush_all_caches(iommu); + amd_iommu_init_api(); amd_iommu_init_notifier(); |