---

yaml --- r: 33919 b: refs/heads/master c: eeac5c1 h: refs/heads/master i: 33917: cd1f0b2 33915: a66da22 33911: 9c6e328 33903: 6b566fe 33887: d3bb194 33855: 185b0f4 33791: fc715c0 v: v3
git-mirror · Sep 13, 2006 · 2e0e789 · 2e0e789
1 parent 41b6154
commit 2e0e789
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f007cacffc8870702a1473d83ba5e4922d54e17c
+refs/heads/master: eeac5c142b8687e35780b11b54b4c2f95b1a2436
diff --git a/trunk/arch/powerpc/sysdev/dart_iommu.c b/trunk/arch/powerpc/sysdev/dart_iommu.c
@@ -139,6 +139,7 @@ static inline void dart_tlb_invalidate_one(unsigned long bus_rpn)
 
 static void dart_flush(struct iommu_table *tbl)
 {
+	mb();
 	if (dart_dirty) {
 		dart_tlb_invalidate_all();
 		dart_dirty = 0;
@@ -172,9 +173,13 @@ static void dart_build(struct iommu_table *tbl, long index,
 		uaddr += DART_PAGE_SIZE;
 	}
 
+	/* make sure all updates have reached memory */
+	mb();
+	in_be32((unsigned __iomem *)dp);
+	mb();
+
 	if (dart_is_u4) {
 		rpn = index;
-		mb(); /* make sure all updates have reached memory */
 		while (npages--)
 			dart_tlb_invalidate_one(rpn++);
 	} else {