Skip to content

Commit

Permalink
iommu/amd: Initialize device table after dma_ops
Browse files Browse the repository at this point in the history
commit f528d98 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>
  • Loading branch information
joergroedel authored and gregkh committed Mar 3, 2013
1 parent 1adbb5d commit ffbf142
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions arch/x86/kernel/amd_iommu_init.c
Expand Up @@ -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;

/*
Expand Down Expand Up @@ -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
*/
Expand Down Expand Up @@ -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();
Expand Down

0 comments on commit ffbf142

Please sign in to comment.