From e2bc901cde1c68547a5a55285b0b5fabce675989 Mon Sep 17 00:00:00 2001
From: Nishanth Aravamudan <nacc@us.ibm.com>
Date: Wed, 15 Sep 2010 08:05:45 +0000
Subject: [PATCH] --- yaml --- r: 212867 b: refs/heads/master c:
 1cb8e85a9d9da4192acfb5f70a80b0c5ce8c3e8f h: refs/heads/master i:   212865:
 1f4979ff7f23551a1172d5a5c5d7f14240f38e8c   212863:
 b277bf504bfe0c2b0dd3d764f8d3af413fd4eebb v: v3

---
 [refs]                                |  2 +-
 trunk/arch/powerpc/kernel/dma-iommu.c | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index c5e4bb582d46..e1198de02f36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dda804ad4023cc202466c46fcfcc163131953838
+refs/heads/master: 1cb8e85a9d9da4192acfb5f70a80b0c5ce8c3e8f
diff --git a/trunk/arch/powerpc/kernel/dma-iommu.c b/trunk/arch/powerpc/kernel/dma-iommu.c
index 37771a518119..6e54a0fd31aa 100644
--- a/trunk/arch/powerpc/kernel/dma-iommu.c
+++ b/trunk/arch/powerpc/kernel/dma-iommu.c
@@ -74,16 +74,17 @@ static int dma_iommu_dma_supported(struct device *dev, u64 mask)
 {
 	struct iommu_table *tbl = get_iommu_table_base(dev);
 
-	if (!tbl || tbl->it_offset > mask) {
-		printk(KERN_INFO
-		       "Warning: IOMMU offset too big for device mask\n");
-		if (tbl)
-			printk(KERN_INFO
-			       "mask: 0x%08llx, table offset: 0x%08lx\n",
-				mask, tbl->it_offset);
-		else
-			printk(KERN_INFO "mask: 0x%08llx, table unavailable\n",
-				mask);
+	if (!tbl) {
+		dev_info(dev, "Warning: IOMMU dma not supported: mask 0x%08llx"
+			", table unavailable\n", mask);
+		return 0;
+	}
+
+	if ((tbl->it_offset + tbl->it_size) > (mask >> IOMMU_PAGE_SHIFT)) {
+		dev_info(dev, "Warning: IOMMU window too big for device mask\n");
+		dev_info(dev, "mask: 0x%08llx, table end: 0x%08lx\n",
+				mask, (tbl->it_offset + tbl->it_size) <<
+				IOMMU_PAGE_SHIFT);
 		return 0;
 	} else
 		return 1;