Skip to content

Commit

Permalink
powerpc/pasemi: Remove uses of virt_to_abs() and abs_to_virt()
Browse files Browse the repository at this point in the history
These days they are just wrappers around __pa() and __va() respectively.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Michael Ellerman authored and Benjamin Herrenschmidt committed Sep 5, 2012
1 parent 70267a7 commit 7db90c0
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions arch/powerpc/platforms/pasemi/iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include <linux/pci.h>
#include <asm/iommu.h>
#include <asm/machdep.h>
#include <asm/abs_addr.h>
#include <asm/firmware.h>

#define IOBMAP_PAGE_SHIFT 12
Expand Down Expand Up @@ -99,7 +98,7 @@ static int iobmap_build(struct iommu_table *tbl, long index,
ip = ((u32 *)tbl->it_base) + index;

while (npages--) {
rpn = virt_to_abs(uaddr) >> IOBMAP_PAGE_SHIFT;
rpn = __pa(uaddr) >> IOBMAP_PAGE_SHIFT;

*(ip++) = IOBMAP_L2E_V | rpn;
/* invalidate tlb, can be optimized more */
Expand Down Expand Up @@ -258,7 +257,7 @@ void __init alloc_iobmap_l2(void)
return;
#endif
/* For 2G space, 8x64 pages (2^21 bytes) is max total l2 size */
iob_l2_base = (u32 *)abs_to_virt(memblock_alloc_base(1UL<<21, 1UL<<21, 0x80000000));
iob_l2_base = (u32 *)__va(memblock_alloc_base(1UL<<21, 1UL<<21, 0x80000000));

printk(KERN_INFO "IOBMAP L2 allocated at: %p\n", iob_l2_base);
}

0 comments on commit 7db90c0

Please sign in to comment.