diff options
author | Michal Simek <monstr@monstr.eu> | 2010-02-08 06:13:10 -0500 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2010-03-11 08:08:33 -0500 |
commit | d79f3b06a9e40b382bd5d5ae8dea9b3210eda9ce (patch) | |
tree | d0e49b835c40cde89f8af1b641df6baf0b16dd82 /arch/microblaze/include/asm | |
parent | 407c1da07d5afa001ed0fdb8f379c00bbd09990a (diff) |
microblaze: Preliminary support for dma drivers
I found several problems for ll_temac driver and on system with WB.
This early fix should fix it. I will clean this patch before I will add
it to mainline
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze/include/asm')
-rw-r--r-- | arch/microblaze/include/asm/io.h | 3 | ||||
-rw-r--r-- | arch/microblaze/include/asm/page.h | 12 |
2 files changed, 5 insertions, 10 deletions
diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h index 06d804b15a51..32d621a56aee 100644 --- a/arch/microblaze/include/asm/io.h +++ b/arch/microblaze/include/asm/io.h | |||
@@ -140,9 +140,6 @@ static inline void writel(unsigned int v, volatile void __iomem *addr) | |||
140 | #define virt_to_phys(addr) ((unsigned long)__virt_to_phys(addr)) | 140 | #define virt_to_phys(addr) ((unsigned long)__virt_to_phys(addr)) |
141 | #define virt_to_bus(addr) ((unsigned long)__virt_to_phys(addr)) | 141 | #define virt_to_bus(addr) ((unsigned long)__virt_to_phys(addr)) |
142 | 142 | ||
143 | #define __page_address(page) \ | ||
144 | (PAGE_OFFSET + (((page) - mem_map) << PAGE_SHIFT)) | ||
145 | #define page_to_phys(page) virt_to_phys((void *)__page_address(page)) | ||
146 | #define page_to_bus(page) (page_to_phys(page)) | 143 | #define page_to_bus(page) (page_to_phys(page)) |
147 | #define bus_to_virt(addr) (phys_to_virt(addr)) | 144 | #define bus_to_virt(addr) (phys_to_virt(addr)) |
148 | 145 | ||
diff --git a/arch/microblaze/include/asm/page.h b/arch/microblaze/include/asm/page.h index 9b66c0fa9a32..2dd1d04129e0 100644 --- a/arch/microblaze/include/asm/page.h +++ b/arch/microblaze/include/asm/page.h | |||
@@ -62,12 +62,6 @@ extern unsigned int __page_offset; | |||
62 | #define PAGE_OFFSET CONFIG_KERNEL_START | 62 | #define PAGE_OFFSET CONFIG_KERNEL_START |
63 | 63 | ||
64 | /* | 64 | /* |
65 | * MAP_NR -- given an address, calculate the index of the page struct which | ||
66 | * points to the address's page. | ||
67 | */ | ||
68 | #define MAP_NR(addr) (((unsigned long)(addr) - PAGE_OFFSET) >> PAGE_SHIFT) | ||
69 | |||
70 | /* | ||
71 | * The basic type of a PTE - 32 bit physical addressing. | 65 | * The basic type of a PTE - 32 bit physical addressing. |
72 | */ | 66 | */ |
73 | typedef unsigned long pte_basic_t; | 67 | typedef unsigned long pte_basic_t; |
@@ -154,7 +148,11 @@ extern int page_is_ram(unsigned long pfn); | |||
154 | # define pfn_to_virt(pfn) __va(pfn_to_phys((pfn))) | 148 | # define pfn_to_virt(pfn) __va(pfn_to_phys((pfn))) |
155 | 149 | ||
156 | # ifdef CONFIG_MMU | 150 | # ifdef CONFIG_MMU |
157 | # define virt_to_page(kaddr) (mem_map + MAP_NR(kaddr)) | 151 | |
152 | # define virt_to_page(kaddr) (pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)) | ||
153 | # define page_to_virt(page) __va(page_to_pfn(page) << PAGE_SHIFT) | ||
154 | # define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) | ||
155 | |||
158 | # else /* CONFIG_MMU */ | 156 | # else /* CONFIG_MMU */ |
159 | # define virt_to_page(vaddr) (pfn_to_page(virt_to_pfn(vaddr))) | 157 | # define virt_to_page(vaddr) (pfn_to_page(virt_to_pfn(vaddr))) |
160 | # define page_to_virt(page) (pfn_to_virt(page_to_pfn(page))) | 158 | # define page_to_virt(page) (pfn_to_virt(page_to_pfn(page))) |