powerpc/pasemi: Remove uses of virt_to_abs() and abs_to_virt() (7db90c02) · Commits · 戴 / test

arch/powerpc/platforms/pasemi/iommu.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -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
		@@ -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 */
		@@ -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);
		}