[PATCH] Generic ioremap_page_range: alpha conversion
Convert Alpha to use generic ioremap_page_range() by turning __alpha_remap_area_pages() into an inline wrapper around ioremap_page_range(). Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
db71daabad
commit
801f92ad5a
|
@ -1,5 +1,7 @@
|
|||
#include <linux/interrupt.h>
|
||||
#include <linux/io.h>
|
||||
|
||||
#include <asm/pgtable.h>
|
||||
|
||||
/* Prototypes of functions used across modules here in this directory. */
|
||||
|
||||
|
@ -181,9 +183,16 @@ extern void titan_dispatch_irqs(u64, struct pt_regs *);
|
|||
extern void switch_to_system_map(void);
|
||||
extern void srm_paging_stop(void);
|
||||
|
||||
/* ../mm/remap.c */
|
||||
extern int __alpha_remap_area_pages(unsigned long, unsigned long,
|
||||
unsigned long, unsigned long);
|
||||
static inline int
|
||||
__alpha_remap_area_pages(unsigned long address, unsigned long phys_addr,
|
||||
unsigned long size, unsigned long flags)
|
||||
{
|
||||
pgprot_t prot;
|
||||
|
||||
prot = __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE
|
||||
| _PAGE_KWE | flags);
|
||||
return ioremap_page_range(address, address + size, phys_addr, prot);
|
||||
}
|
||||
|
||||
/* irq.c */
|
||||
|
||||
|
|
|
@ -4,6 +4,6 @@
|
|||
|
||||
EXTRA_CFLAGS := -Werror
|
||||
|
||||
obj-y := init.o fault.o extable.o remap.o
|
||||
obj-y := init.o fault.o extable.o
|
||||
|
||||
obj-$(CONFIG_DISCONTIGMEM) += numa.o
|
||||
|
|
|
@ -1,86 +0,0 @@
|
|||
#include <linux/vmalloc.h>
|
||||
#include <asm/pgalloc.h>
|
||||
#include <asm/cacheflush.h>
|
||||
|
||||
static inline void
|
||||
remap_area_pte(pte_t * pte, unsigned long address, unsigned long size,
|
||||
unsigned long phys_addr, unsigned long flags)
|
||||
{
|
||||
unsigned long end;
|
||||
unsigned long pfn;
|
||||
|
||||
address &= ~PMD_MASK;
|
||||
end = address + size;
|
||||
if (end > PMD_SIZE)
|
||||
end = PMD_SIZE;
|
||||
if (address >= end)
|
||||
BUG();
|
||||
pfn = phys_addr >> PAGE_SHIFT;
|
||||
do {
|
||||
if (!pte_none(*pte)) {
|
||||
printk("remap_area_pte: page already exists\n");
|
||||
BUG();
|
||||
}
|
||||
set_pte(pte, pfn_pte(pfn,
|
||||
__pgprot(_PAGE_VALID | _PAGE_ASM |
|
||||
_PAGE_KRE | _PAGE_KWE | flags)));
|
||||
address += PAGE_SIZE;
|
||||
pfn++;
|
||||
pte++;
|
||||
} while (address && (address < end));
|
||||
}
|
||||
|
||||
static inline int
|
||||
remap_area_pmd(pmd_t * pmd, unsigned long address, unsigned long size,
|
||||
unsigned long phys_addr, unsigned long flags)
|
||||
{
|
||||
unsigned long end;
|
||||
|
||||
address &= ~PGDIR_MASK;
|
||||
end = address + size;
|
||||
if (end > PGDIR_SIZE)
|
||||
end = PGDIR_SIZE;
|
||||
phys_addr -= address;
|
||||
if (address >= end)
|
||||
BUG();
|
||||
do {
|
||||
pte_t * pte = pte_alloc_kernel(pmd, address);
|
||||
if (!pte)
|
||||
return -ENOMEM;
|
||||
remap_area_pte(pte, address, end - address,
|
||||
address + phys_addr, flags);
|
||||
address = (address + PMD_SIZE) & PMD_MASK;
|
||||
pmd++;
|
||||
} while (address && (address < end));
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
__alpha_remap_area_pages(unsigned long address, unsigned long phys_addr,
|
||||
unsigned long size, unsigned long flags)
|
||||
{
|
||||
pgd_t * dir;
|
||||
int error = 0;
|
||||
unsigned long end = address + size;
|
||||
|
||||
phys_addr -= address;
|
||||
dir = pgd_offset(&init_mm, address);
|
||||
flush_cache_all();
|
||||
if (address >= end)
|
||||
BUG();
|
||||
do {
|
||||
pmd_t *pmd;
|
||||
pmd = pmd_alloc(&init_mm, dir, address);
|
||||
error = -ENOMEM;
|
||||
if (!pmd)
|
||||
break;
|
||||
if (remap_area_pmd(pmd, address, end - address,
|
||||
phys_addr + address, flags))
|
||||
break;
|
||||
error = 0;
|
||||
address = (address + PGDIR_SIZE) & PGDIR_MASK;
|
||||
dir++;
|
||||
} while (address && (address < end));
|
||||
return error;
|
||||
}
|
||||
|
Loading…
Reference in New Issue