diff options
author | Olof Johansson <olof@lixom.net> | 2007-06-03 20:49:05 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-06-06 21:44:39 -0400 |
commit | 6291ed3c04d5c83c26e77d4fa47e06d0416be81d (patch) | |
tree | 08e482c7288515f609af5fccf93e79c050fb5b83 | |
parent | 5ecd3100e695228ac5e0ce0e325e252c0f11806f (diff) |
[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>
-rw-r--r-- | arch/powerpc/platforms/pasemi/iommu.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/powerpc/platforms/pasemi/iommu.c b/arch/powerpc/platforms/pasemi/iommu.c index 95fa6a7d15ee..f33b21b9f5d4 100644 --- a/arch/powerpc/platforms/pasemi/iommu.c +++ b/arch/powerpc/platforms/pasemi/iommu.c | |||
@@ -31,8 +31,6 @@ | |||
31 | #define IOBMAP_PAGE_SIZE (1 << IOBMAP_PAGE_SHIFT) | 31 | #define IOBMAP_PAGE_SIZE (1 << IOBMAP_PAGE_SHIFT) |
32 | #define IOBMAP_PAGE_MASK (IOBMAP_PAGE_SIZE - 1) | 32 | #define IOBMAP_PAGE_MASK (IOBMAP_PAGE_SIZE - 1) |
33 | 33 | ||
34 | #define IOBMAP_PAGE_FACTOR (PAGE_SHIFT - IOBMAP_PAGE_SHIFT) | ||
35 | |||
36 | #define IOB_BASE 0xe0000000 | 34 | #define IOB_BASE 0xe0000000 |
37 | #define IOB_SIZE 0x3000 | 35 | #define IOB_SIZE 0x3000 |
38 | /* Configuration registers */ | 36 | /* Configuration registers */ |
@@ -97,9 +95,6 @@ static void iobmap_build(struct iommu_table *tbl, long index, | |||
97 | 95 | ||
98 | bus_addr = (tbl->it_offset + index) << PAGE_SHIFT; | 96 | bus_addr = (tbl->it_offset + index) << PAGE_SHIFT; |
99 | 97 | ||
100 | npages <<= IOBMAP_PAGE_FACTOR; | ||
101 | index <<= IOBMAP_PAGE_FACTOR; | ||
102 | |||
103 | ip = ((u32 *)tbl->it_base) + index; | 98 | ip = ((u32 *)tbl->it_base) + index; |
104 | 99 | ||
105 | while (npages--) { | 100 | while (npages--) { |
@@ -125,9 +120,6 @@ static void iobmap_free(struct iommu_table *tbl, long index, | |||
125 | 120 | ||
126 | bus_addr = (tbl->it_offset + index) << PAGE_SHIFT; | 121 | bus_addr = (tbl->it_offset + index) << PAGE_SHIFT; |
127 | 122 | ||
128 | npages <<= IOBMAP_PAGE_FACTOR; | ||
129 | index <<= IOBMAP_PAGE_FACTOR; | ||
130 | |||
131 | ip = ((u32 *)tbl->it_base) + index; | 123 | ip = ((u32 *)tbl->it_base) + index; |
132 | 124 | ||
133 | while (npages--) { | 125 | while (npages--) { |