From: Paul Mackerras <paulus@samba.org>
Date: Thu, 26 Apr 2007 07:01:04 +0000 (+1000)
Subject: Revert "[POWERPC] DMA 4GB boundary protection"
X-Git-Tag: v2.6.22-rc1~1109^2~39
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0999ed7f57728c1919b131207e47d9b311cfbd74;p=linux-2.6

Revert "[POWERPC] DMA 4GB boundary protection"

This reverts commit 618d3adc351a24c4c48437c767befb88ca2d199d, because
it is superseded by 569975591c5530fdc9c7a3c45122e5e46f075a74.
---

diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index d2598e2e7b..c08ceca627 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -89,7 +89,6 @@ static unsigned long iommu_range_alloc(struct iommu_table *tbl,
                                        unsigned int align_order)
 { 
 	unsigned long n, end, i, start;
-	unsigned long start_addr, end_addr;
 	unsigned long limit;
 	int largealloc = npages > 15;
 	int pass = 0;
@@ -160,15 +159,6 @@ static unsigned long iommu_range_alloc(struct iommu_table *tbl,
 		}
 	}
 
-	/* DMA cannot cross 4 GB boundary */
-	start_addr = (n + tbl->it_offset) << PAGE_SHIFT;
-	end_addr = (end + tbl->it_offset) << PAGE_SHIFT;
-	if ((start_addr >> 32) != (end_addr >> 32)) {
-		end_addr &= 0xffffffff00000000l;
-		start = (end_addr >> PAGE_SHIFT) - tbl->it_offset;
-		goto again;
-	}
-
 	for (i = n; i < end; i++)
 		if (test_bit(i, tbl->it_map)) {
 			start = i+1;