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 = {
  */
 static int __init amd_iommu_init(void)
 {
+        struct amd_iommu *iommu;
         int i, ret = 0;
 
         /*
@@ -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
          */
@@ -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();