Commit b94996c9 authored by David Woodhouse's avatar David Woodhouse
Browse files

intel-iommu: Disable PMRs after we enable translation, not before 



Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 0c02a20f

drivers/pci/intel-iommu.c

+3 −2
Original line number Diff line number Diff line
@@ -2403,11 +2403,12 @@ int __init init_dmars(void) 


		iommu->flush.flush_context(iommu, 0, 0, 0, DMA_CCMD_GLOBAL_INVL);

		iommu->flush.flush_iotlb(iommu, 0, 0, 0, DMA_TLB_GLOBAL_FLUSH);

		iommu_disable_protect_mem_regions(iommu);



		ret = iommu_enable_translation(iommu);

		if (ret)

			goto error;



		iommu_disable_protect_mem_regions(iommu);

	}



	return 0;
@@ -3066,8 +3067,8 @@ static int init_iommu_hw(void) 
					   DMA_CCMD_GLOBAL_INVL);

		iommu->flush.flush_iotlb(iommu, 0, 0, 0,

					 DMA_TLB_GLOBAL_FLUSH);

		iommu_disable_protect_mem_regions(iommu);

		iommu_enable_translation(iommu);

		iommu_disable_protect_mem_regions(iommu);

	}



	return 0;