ia64/xen-unstable

changeset 16139:96930bc060a6

Clean up a little bit after the TLB/cache-flush changes.
Signed-off-by: Keir Fraser <keir@xensource.com>
author Keir Fraser <keir@xensource.com>
date Tue Oct 16 17:36:28 2007 +0100 (2007-10-16)
parents 9488d3166553
children b6ff4859b3d4
files xen/arch/x86/hvm/vmx/vtd/intel-iommu.c xen/include/asm-x86/flushtlb.h
line diff
     1.1 --- a/xen/arch/x86/hvm/vmx/vtd/intel-iommu.c	Tue Oct 16 17:31:37 2007 +0100
     1.2 +++ b/xen/arch/x86/hvm/vmx/vtd/intel-iommu.c	Tue Oct 16 17:36:28 2007 +0100
     1.3 @@ -499,7 +499,7 @@ static int inline iommu_flush_iotlb_psi(
     1.4                                 DMA_TLB_PSI_FLUSH, non_present_entry_flush);
     1.5  }
     1.6  
     1.7 -void flush_all(void)
     1.8 +void iommu_flush_all(void)
     1.9  {
    1.10      struct acpi_drhd_unit *drhd;
    1.11      struct iommu *iommu;
    1.12 @@ -1775,7 +1775,7 @@ int iommu_setup(void)
    1.13      INIT_LIST_HEAD(&hd->pdev_list);
    1.14  
    1.15      /* start from scratch */
    1.16 -    flush_all();
    1.17 +    iommu_flush_all();
    1.18  
    1.19      /* setup clflush size */
    1.20      x86_clflush_size = ((cpuid_ebx(1) >> 8) & 0xff) * 8;
    1.21 @@ -1958,7 +1958,7 @@ int iommu_suspend(void)
    1.22      struct iommu *iommu;
    1.23      int i = 0;
    1.24  
    1.25 -    flush_all();
    1.26 +    iommu_flush_all();
    1.27  
    1.28      for_each_drhd_unit ( drhd )
    1.29      {
    1.30 @@ -1993,7 +1993,7 @@ int iommu_resume(void)
    1.31      struct iommu *iommu;
    1.32      int i = 0;
    1.33  
    1.34 -    flush_all();
    1.35 +    iommu_flush_all();
    1.36  
    1.37      init_vtd_hw();
    1.38      for_each_drhd_unit ( drhd )
     2.1 --- a/xen/include/asm-x86/flushtlb.h	Tue Oct 16 17:31:37 2007 +0100
     2.2 +++ b/xen/include/asm-x86/flushtlb.h	Tue Oct 16 17:36:28 2007 +0100
     2.3 @@ -104,13 +104,13 @@ void flush_area_mask(cpumask_t, const vo
     2.4  #define flush_tlb_local()                       \
     2.5      flush_local(FLUSH_TLB)
     2.6  #define flush_tlb_one_local(v)                  \
     2.7 -    flush_area_local((const void *)(v), FLUSH_TLB|1)
     2.8 +    flush_area_local((const void *)(v), FLUSH_TLB|FLUSH_LEVEL(1))
     2.9  
    2.10  /* Flush specified CPUs' TLBs */
    2.11  #define flush_tlb_mask(mask)                    \
    2.12      flush_mask(mask, FLUSH_TLB)
    2.13  #define flush_tlb_one_mask(mask,v)              \
    2.14 -    flush_area_mask(mask, (const void *)(v), FLUSH_TLB|1)
    2.15 +    flush_area_mask(mask, (const void *)(v), FLUSH_TLB|FLUSH_LEVEL(1))
    2.16  
    2.17  /* Flush all CPUs' TLBs */
    2.18  #define flush_tlb_all()                         \