Skip to content

Commit

Permalink
[POWERPC] pasemi: Fix iommu + 64K PAGE_SIZE bug
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Olof Johansson authored and Paul Mackerras committed Jun 7, 2007
1 parent 5ecd310 commit 6291ed3
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions arch/powerpc/platforms/pasemi/iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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--) {
Expand All @@ -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--) {
Expand Down

0 comments on commit 6291ed3

Please sign in to comment.