Commit d8190dc6 authored by Lu Baolu's avatar Lu Baolu Committed by Joerg Roedel

iommu/vt-d: Enable DMA remapping after rmrr mapped

The rmrr devices require identity map of the rmrr regions before
enabling DMA remapping. Otherwise, there will be a window during
which DMA from/to the rmrr regions will be blocked. In order to
alleviate this, we move enabling DMA remapping after all rmrr
regions get mapped.
Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent d850c2ee
...@@ -3510,11 +3510,6 @@ static int __init init_dmars(void) ...@@ -3510,11 +3510,6 @@ static int __init init_dmars(void)
ret = dmar_set_interrupt(iommu); ret = dmar_set_interrupt(iommu);
if (ret) if (ret)
goto free_iommu; goto free_iommu;
if (!translation_pre_enabled(iommu))
iommu_enable_translation(iommu);
iommu_disable_protect_mem_regions(iommu);
} }
return 0; return 0;
...@@ -4902,7 +4897,6 @@ int __init intel_iommu_init(void) ...@@ -4902,7 +4897,6 @@ int __init intel_iommu_init(void)
goto out_free_reserved_range; goto out_free_reserved_range;
} }
up_write(&dmar_global_lock); up_write(&dmar_global_lock);
pr_info("Intel(R) Virtualization Technology for Directed I/O\n");
#if defined(CONFIG_X86) && defined(CONFIG_SWIOTLB) #if defined(CONFIG_X86) && defined(CONFIG_SWIOTLB)
swiotlb = 0; swiotlb = 0;
...@@ -4925,6 +4919,16 @@ int __init intel_iommu_init(void) ...@@ -4925,6 +4919,16 @@ int __init intel_iommu_init(void)
register_memory_notifier(&intel_iommu_memory_nb); register_memory_notifier(&intel_iommu_memory_nb);
cpuhp_setup_state(CPUHP_IOMMU_INTEL_DEAD, "iommu/intel:dead", NULL, cpuhp_setup_state(CPUHP_IOMMU_INTEL_DEAD, "iommu/intel:dead", NULL,
intel_iommu_cpu_dead); intel_iommu_cpu_dead);
/* Finally, we enable the DMA remapping hardware. */
for_each_iommu(iommu, drhd) {
if (!translation_pre_enabled(iommu))
iommu_enable_translation(iommu);
iommu_disable_protect_mem_regions(iommu);
}
pr_info("Intel(R) Virtualization Technology for Directed I/O\n");
intel_iommu_enabled = 1; intel_iommu_enabled = 1;
intel_iommu_debugfs_init(); intel_iommu_debugfs_init();
......
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