From 1be36fdfa2c792e7a17ae605bcf686527a203c83 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 24 Feb 2009 10:10:59 -0800 Subject: [PATCH] fix fix-intel-iommu-write-buffer-flushing.patch --- ...ix-intel-iommu-write-buffer-flushing.patch | 20 +++++++++---------- ...ix-intel-iommu-write-buffer-flushing.patch | 20 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/review-2.6.27/fix-intel-iommu-write-buffer-flushing.patch b/review-2.6.27/fix-intel-iommu-write-buffer-flushing.patch index cab41a1de29..1470bf2f99a 100644 --- a/review-2.6.27/fix-intel-iommu-write-buffer-flushing.patch +++ b/review-2.6.27/fix-intel-iommu-write-buffer-flushing.patch @@ -30,7 +30,16 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c -@@ -527,7 +527,7 @@ static void iommu_flush_write_buffer(str +@@ -72,6 +72,8 @@ static struct deferred_flush_tables *def + /* bitmap for indexing intel_iommus */ + static int g_num_of_iommus; + ++static int rwbf_quirk = 0; ++ + static DEFINE_SPINLOCK(async_umap_flush_lock); + static LIST_HEAD(unmaps_to_do); + +@@ -527,7 +529,7 @@ static void iommu_flush_write_buffer(str u32 val; unsigned long flag; @@ -39,15 +48,6 @@ Signed-off-by: Greg Kroah-Hartman return; val = iommu->gcmd | DMA_GCMD_WBF; -@@ -1410,6 +1410,8 @@ static void domain_remove_dev_info(struc - spin_unlock_irqrestore(&device_domain_lock, flags); - } - -+static int rwbf_quirk = 0; -+ - /* - * find_domain - * Note: we use struct pci_dev->dev.archdata.iommu stores the info @@ -2453,3 +2455,12 @@ int __init intel_iommu_init(void) return 0; } diff --git a/review-2.6.28/fix-intel-iommu-write-buffer-flushing.patch b/review-2.6.28/fix-intel-iommu-write-buffer-flushing.patch index f1f4701264b..4cd6ac57284 100644 --- a/review-2.6.28/fix-intel-iommu-write-buffer-flushing.patch +++ b/review-2.6.28/fix-intel-iommu-write-buffer-flushing.patch @@ -30,7 +30,16 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c -@@ -506,7 +506,7 @@ static void iommu_flush_write_buffer(str +@@ -71,6 +71,8 @@ static struct deferred_flush_tables *def + /* bitmap for indexing intel_iommus */ + static int g_num_of_iommus; + ++static int rwbf_quirk = 0; ++ + static DEFINE_SPINLOCK(async_umap_flush_lock); + static LIST_HEAD(unmaps_to_do); + +@@ -506,7 +508,7 @@ static void iommu_flush_write_buffer(str u32 val; unsigned long flag; @@ -39,15 +48,6 @@ Signed-off-by: Greg Kroah-Hartman return; val = iommu->gcmd | DMA_GCMD_WBF; -@@ -1315,6 +1315,8 @@ static void domain_remove_dev_info(struc - spin_unlock_irqrestore(&device_domain_lock, flags); - } - -+static int rwbf_quirk = 0; -+ - /* - * find_domain - * Note: we use struct pci_dev->dev.archdata.iommu stores the info @@ -2436,3 +2438,13 @@ u64 intel_iommu_iova_to_pfn(struct dmar_ return pfn >> VTD_PAGE_SHIFT; } -- 2.47.3