forked from Minki/linux
[POWERPC] pasemi: Fix iommu + 64K PAGE_SIZE bug
The powerpc iommu code was refactored by Linas back in the 2.6.20 time frame to map 4K pages from the generic code, but I had forgotten to go back and fix my platform driver before submitting it. Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
5ecd3100e6
commit
6291ed3c04
@ -31,8 +31,6 @@
|
||||
#define IOBMAP_PAGE_SIZE (1 << IOBMAP_PAGE_SHIFT)
|
||||
#define IOBMAP_PAGE_MASK (IOBMAP_PAGE_SIZE - 1)
|
||||
|
||||
#define IOBMAP_PAGE_FACTOR (PAGE_SHIFT - IOBMAP_PAGE_SHIFT)
|
||||
|
||||
#define IOB_BASE 0xe0000000
|
||||
#define IOB_SIZE 0x3000
|
||||
/* Configuration registers */
|
||||
@ -97,9 +95,6 @@ static void iobmap_build(struct iommu_table *tbl, long index,
|
||||
|
||||
bus_addr = (tbl->it_offset + index) << PAGE_SHIFT;
|
||||
|
||||
npages <<= IOBMAP_PAGE_FACTOR;
|
||||
index <<= IOBMAP_PAGE_FACTOR;
|
||||
|
||||
ip = ((u32 *)tbl->it_base) + index;
|
||||
|
||||
while (npages--) {
|
||||
@ -125,9 +120,6 @@ static void iobmap_free(struct iommu_table *tbl, long index,
|
||||
|
||||
bus_addr = (tbl->it_offset + index) << PAGE_SHIFT;
|
||||
|
||||
npages <<= IOBMAP_PAGE_FACTOR;
|
||||
index <<= IOBMAP_PAGE_FACTOR;
|
||||
|
||||
ip = ((u32 *)tbl->it_base) + index;
|
||||
|
||||
while (npages--) {
|
||||
|
Loading…
Reference in New Issue
Block a user