Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

iommu/amd: Initialize device table after dma_ops

Browse source 
commit f528d980c1 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>
This commit is contained in:
Joerg Roedel 2013-02-06 12:55:23 +01:00 committed by Greg Kroah-Hartman
parent db6154ead4
commit 0c85818633
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/iommu/amd_iommu_init.c
View file

@ -1572,8 +1572,6 @@ int __init amd_iommu_init_hardware(void)
if (amd_iommu_pd_alloc_bitmap == NULL)
goto free;
/* init the device table */
init_device_table();
/*
* let all alias entries point to itself
@ -1655,6 +1653,7 @@ out:
*/
static int __init amd_iommu_init(void)
{
struct amd_iommu *iommu;
int ret = 0;
ret = amd_iommu_init_hardware();
@ -1673,6 +1672,12 @@ static int __init amd_iommu_init(void)
if (ret)
goto free;
/* init the device table */
init_device_table();
for_each_iommu(iommu)
iommu_flush_all_caches(iommu);
amd_iommu_init_api();
x86_platform.iommu_shutdown = disable_iommus;