Messages in this thread Patch in this message | | | Date | Mon, 28 Oct 2019 15:41:40 -0700 | From | Jacob Pan <> | Subject | Re: [PATCH v7 06/11] iommu/vt-d: Avoid duplicated code for PASID setup |
| |
On Fri, 25 Oct 2019 06:42:54 +0000 "Tian, Kevin" <kevin.tian@intel.com> wrote:
> > From: Jacob Pan [mailto:jacob.jun.pan@linux.intel.com] > > Sent: Friday, October 25, 2019 3:55 AM > > > > 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: Jacob Pan <jacob.jun.pan@linux.intel.com> > > similarly, it doesn't need to be in this series. Technically true, it is in this series so that we can use the combined function. > > > --- > > drivers/iommu/intel-pasid.c | 48 > > +++++++++++++++++--------------------------- - > > 1 file changed, 18 insertions(+), 30 deletions(-) > > > > diff --git a/drivers/iommu/intel-pasid.c > > b/drivers/iommu/intel-pasid.c index e79d680fe300..ffbd416ed3b8 > > 100644 --- a/drivers/iommu/intel-pasid.c > > +++ b/drivers/iommu/intel-pasid.c > > @@ -485,6 +485,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. > > @@ -530,16 +545,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; > > } > > @@ -603,16 +609,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; > > } > > @@ -646,16 +643,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; > > } > > -- > > 2.7.4 >
[Jacob Pan]
| |