Commit 0999ed7f authored by Paul Mackerras's avatar Paul Mackerras

Revert "[POWERPC] DMA 4GB boundary protection"

This reverts commit 618d3adc, because
it is superseded by 56997559.
parent c78f8305
...@@ -89,7 +89,6 @@ static unsigned long iommu_range_alloc(struct iommu_table *tbl, ...@@ -89,7 +89,6 @@ static unsigned long iommu_range_alloc(struct iommu_table *tbl,
unsigned int align_order) unsigned int align_order)
{ {
unsigned long n, end, i, start; unsigned long n, end, i, start;
unsigned long start_addr, end_addr;
unsigned long limit; unsigned long limit;
int largealloc = npages > 15; int largealloc = npages > 15;
int pass = 0; int pass = 0;
...@@ -160,15 +159,6 @@ static unsigned long iommu_range_alloc(struct iommu_table *tbl, ...@@ -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++) for (i = n; i < end; i++)
if (test_bit(i, tbl->it_map)) { if (test_bit(i, tbl->it_map)) {
start = i+1; start = i+1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment