Commit d62efd4f authored by Jacob Pan's avatar Jacob Pan Committed by Joerg Roedel
Browse files

iommu/vt-d: Avoid duplicated code for PASID setup 



After each setup for PASID entry, related translation caches must be
flushed. We can combine duplicated code into one function which is less
error prone.

Signed-off-by: default avatarJacob Pan <jacob.jun.pan@linux.intel.com>
Reviewed-by: default avatarEric Auger <eric.auger@redhat.com>
Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 6eba09a4

drivers/iommu/intel-pasid.c

+18 −30
Original line number Diff line number Diff line
@@ -465,6 +465,21 @@ void intel_pasid_tear_down_entry(struct intel_iommu *iommu, 
		devtlb_invalidation_with_pasid(iommu, dev, pasid);

}



static void pasid_flush_caches(struct intel_iommu *iommu,

				struct pasid_entry *pte,

				int pasid, u16 did)

{

	if (!ecap_coherent(iommu->ecap))

		clflush_cache_range(pte, sizeof(*pte));



	if (cap_caching_mode(iommu->cap)) {

		pasid_cache_invalidation_with_pasid(iommu, did, pasid);

		iotlb_invalidation_with_pasid(iommu, did, pasid);

	} else {

		iommu_flush_write_buffer(iommu);

	}

}



/*

 * Set up the scalable mode pasid table entry for first only

 * translation type.
@@ -518,16 +533,7 @@ int intel_pasid_setup_first_level(struct intel_iommu *iommu, 
	/* Setup Present and PASID Granular Transfer Type: */

	pasid_set_translation_type(pte, 1);

	pasid_set_present(pte);



	if (!ecap_coherent(iommu->ecap))

		clflush_cache_range(pte, sizeof(*pte));



	if (cap_caching_mode(iommu->cap)) {

		pasid_cache_invalidation_with_pasid(iommu, did, pasid);

		iotlb_invalidation_with_pasid(iommu, did, pasid);

	} else {

		iommu_flush_write_buffer(iommu);

	}

	pasid_flush_caches(iommu, pte, pasid, did);



	return 0;

}
@@ -591,16 +597,7 @@ int intel_pasid_setup_second_level(struct intel_iommu *iommu, 
	 */

	pasid_set_sre(pte);

	pasid_set_present(pte);



	if (!ecap_coherent(iommu->ecap))

		clflush_cache_range(pte, sizeof(*pte));



	if (cap_caching_mode(iommu->cap)) {

		pasid_cache_invalidation_with_pasid(iommu, did, pasid);

		iotlb_invalidation_with_pasid(iommu, did, pasid);

	} else {

		iommu_flush_write_buffer(iommu);

	}

	pasid_flush_caches(iommu, pte, pasid, did);



	return 0;

}
@@ -634,16 +631,7 @@ int intel_pasid_setup_pass_through(struct intel_iommu *iommu, 
	 */

	pasid_set_sre(pte);

	pasid_set_present(pte);



	if (!ecap_coherent(iommu->ecap))

		clflush_cache_range(pte, sizeof(*pte));



	if (cap_caching_mode(iommu->cap)) {

		pasid_cache_invalidation_with_pasid(iommu, did, pasid);

		iotlb_invalidation_with_pasid(iommu, did, pasid);

	} else {

		iommu_flush_write_buffer(iommu);

	}

	pasid_flush_caches(iommu, pte, pasid, did);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE