Commit 579468a9 authored by Michael Ellerman's avatar Michael Ellerman Committed by Benjamin Herrenschmidt

powerpc/dart: Remove uses of virt_to_abs() and abs_to_virt()

These days they are just wrappers around __pa() and __va() respectively.
Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 7db90c02
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include <asm/iommu.h> #include <asm/iommu.h>
#include <asm/pci-bridge.h> #include <asm/pci-bridge.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/abs_addr.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/ppc-pci.h> #include <asm/ppc-pci.h>
...@@ -167,7 +166,7 @@ static int dart_build(struct iommu_table *tbl, long index, ...@@ -167,7 +166,7 @@ static int dart_build(struct iommu_table *tbl, long index,
*/ */
l = npages; l = npages;
while (l--) { while (l--) {
rpn = virt_to_abs(uaddr) >> DART_PAGE_SHIFT; rpn = __pa(uaddr) >> DART_PAGE_SHIFT;
*(dp++) = DARTMAP_VALID | (rpn & DARTMAP_RPNMASK); *(dp++) = DARTMAP_VALID | (rpn & DARTMAP_RPNMASK);
...@@ -244,7 +243,7 @@ static int __init dart_init(struct device_node *dart_node) ...@@ -244,7 +243,7 @@ static int __init dart_init(struct device_node *dart_node)
panic("DART: Cannot map registers!"); panic("DART: Cannot map registers!");
/* Map in DART table */ /* Map in DART table */
dart_vbase = ioremap(virt_to_abs(dart_tablebase), dart_tablesize); dart_vbase = ioremap(__pa(dart_tablebase), dart_tablesize);
/* Fill initial table */ /* Fill initial table */
for (i = 0; i < dart_tablesize/4; i++) for (i = 0; i < dart_tablesize/4; i++)
...@@ -463,7 +462,7 @@ void __init alloc_dart_table(void) ...@@ -463,7 +462,7 @@ void __init alloc_dart_table(void)
* will blow up an entire large page anyway in the kernel mapping * will blow up an entire large page anyway in the kernel mapping
*/ */
dart_tablebase = (unsigned long) dart_tablebase = (unsigned long)
abs_to_virt(memblock_alloc_base(1UL<<24, 1UL<<24, 0x80000000L)); __va(memblock_alloc_base(1UL<<24, 1UL<<24, 0x80000000L));
printk(KERN_INFO "DART table allocated at: %lx\n", dart_tablebase); printk(KERN_INFO "DART table allocated at: %lx\n", dart_tablebase);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment