Commit ffbf1423 authored by Joerg Roedel's avatar Joerg Roedel Committed by Greg Kroah-Hartman

iommu/amd: Initialize device table after dma_ops

commit f528d980 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: default avatarJoerg Roedel <joro@8bytes.org>
Signed-off-by: default avatarShuah Khan <shuah.khan@hp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1adbb5db
...@@ -1363,6 +1363,7 @@ static struct syscore_ops amd_iommu_syscore_ops = { ...@@ -1363,6 +1363,7 @@ static struct syscore_ops amd_iommu_syscore_ops = {
*/ */
static int __init amd_iommu_init(void) static int __init amd_iommu_init(void)
{ {
struct amd_iommu *iommu;
int i, ret = 0; int i, ret = 0;
/* /*
...@@ -1411,9 +1412,6 @@ static int __init amd_iommu_init(void) ...@@ -1411,9 +1412,6 @@ static int __init amd_iommu_init(void)
if (amd_iommu_pd_alloc_bitmap == NULL) if (amd_iommu_pd_alloc_bitmap == NULL)
goto free; goto free;
/* init the device table */
init_device_table();
/* /*
* let all alias entries point to itself * let all alias entries point to itself
*/ */
...@@ -1463,6 +1461,12 @@ static int __init amd_iommu_init(void) ...@@ -1463,6 +1461,12 @@ static int __init amd_iommu_init(void)
if (ret) if (ret)
goto free_disable; 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_api();
amd_iommu_init_notifier(); amd_iommu_init_notifier();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment