Commit 2f6ea7b3 authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds

[PATCH] ptwalk: ioremap_page_range

Convert i386 ioremap pagetable walkers to loops using p?d_addr_end.
Rename internal levels ioremap_p??_range.  Don't cheat, give it a real
(but inlined) ioremap_pud_range; uninline lowest level to help debug.
Replace "page already exists" printk and BUG by BUG_ON.
Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c1523e5c
...@@ -20,89 +20,82 @@ ...@@ -20,89 +20,82 @@
#define ISA_START_ADDRESS 0xa0000 #define ISA_START_ADDRESS 0xa0000
#define ISA_END_ADDRESS 0x100000 #define ISA_END_ADDRESS 0x100000
static inline void remap_area_pte(pte_t * pte, unsigned long address, unsigned long size, static int ioremap_pte_range(pmd_t *pmd, unsigned long addr,
unsigned long phys_addr, unsigned long flags) unsigned long end, unsigned long phys_addr, unsigned long flags)
{ {
unsigned long end; pte_t *pte;
unsigned long pfn; 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; pfn = phys_addr >> PAGE_SHIFT;
pte = pte_alloc_kernel(&init_mm, pmd, addr);
if (!pte)
return -ENOMEM;
do { do {
if (!pte_none(*pte)) { BUG_ON(!pte_none(*pte));
printk("remap_area_pte: page already exists\n");
BUG();
}
set_pte(pte, pfn_pte(pfn, __pgprot(_PAGE_PRESENT | _PAGE_RW | set_pte(pte, pfn_pte(pfn, __pgprot(_PAGE_PRESENT | _PAGE_RW |
_PAGE_DIRTY | _PAGE_ACCESSED | flags))); _PAGE_DIRTY | _PAGE_ACCESSED | flags)));
address += PAGE_SIZE;
pfn++; pfn++;
pte++; } while (pte++, addr += PAGE_SIZE, addr != end);
} while (address && (address < end)); return 0;
}
static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
unsigned long end, unsigned long phys_addr, unsigned long flags)
{
pmd_t *pmd;
unsigned long next;
phys_addr -= addr;
pmd = pmd_alloc(&init_mm, pud, addr);
if (!pmd)
return -ENOMEM;
do {
next = pmd_addr_end(addr, end);
if (ioremap_pte_range(pmd, addr, next, phys_addr + addr, flags))
return -ENOMEM;
} while (pmd++, addr = next, addr != end);
return 0;
} }
static inline int remap_area_pmd(pmd_t * pmd, unsigned long address, unsigned long size, static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
unsigned long phys_addr, unsigned long flags) unsigned long end, unsigned long phys_addr, unsigned long flags)
{ {
unsigned long end; pud_t *pud;
unsigned long next;
address &= ~PGDIR_MASK;
end = address + size; phys_addr -= addr;
if (end > PGDIR_SIZE) pud = pud_alloc(&init_mm, pgd, addr);
end = PGDIR_SIZE; if (!pud)
phys_addr -= address; return -ENOMEM;
if (address >= end)
BUG();
do { do {
pte_t * pte = pte_alloc_kernel(&init_mm, pmd, address); next = pud_addr_end(addr, end);
if (!pte) if (ioremap_pmd_range(pud, addr, next, phys_addr + addr, flags))
return -ENOMEM; return -ENOMEM;
remap_area_pte(pte, address, end - address, address + phys_addr, flags); } while (pud++, addr = next, addr != end);
address = (address + PMD_SIZE) & PMD_MASK;
pmd++;
} while (address && (address < end));
return 0; return 0;
} }
static int remap_area_pages(unsigned long address, unsigned long phys_addr, static int ioremap_page_range(unsigned long addr,
unsigned long size, unsigned long flags) unsigned long end, unsigned long phys_addr, unsigned long flags)
{ {
int error; pgd_t *pgd;
pgd_t * dir; unsigned long next;
unsigned long end = address + size; int err;
phys_addr -= address; BUG_ON(addr >= end);
dir = pgd_offset(&init_mm, address);
flush_cache_all(); flush_cache_all();
if (address >= end) phys_addr -= addr;
BUG(); pgd = pgd_offset_k(addr);
spin_lock(&init_mm.page_table_lock); spin_lock(&init_mm.page_table_lock);
do { do {
pud_t *pud; next = pgd_addr_end(addr, end);
pmd_t *pmd; err = ioremap_pud_range(pgd, addr, next, phys_addr+addr, flags);
if (err)
error = -ENOMEM;
pud = pud_alloc(&init_mm, dir, address);
if (!pud)
break;
pmd = pmd_alloc(&init_mm, pud, address);
if (!pmd)
break;
if (remap_area_pmd(pmd, address, end - address,
phys_addr + address, flags))
break; break;
error = 0; } while (pgd++, addr = next, addr != end);
address = (address + PGDIR_SIZE) & PGDIR_MASK;
dir++;
} while (address && (address < end));
spin_unlock(&init_mm.page_table_lock); spin_unlock(&init_mm.page_table_lock);
flush_tlb_all(); flush_tlb_all();
return error; return err;
} }
/* /*
...@@ -165,7 +158,8 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l ...@@ -165,7 +158,8 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l
return NULL; return NULL;
area->phys_addr = phys_addr; area->phys_addr = phys_addr;
addr = (void __iomem *) area->addr; addr = (void __iomem *) area->addr;
if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) { if (ioremap_page_range((unsigned long) addr,
(unsigned long) addr + size, phys_addr, flags)) {
vunmap((void __force *) addr); vunmap((void __force *) addr);
return NULL; return NULL;
} }
......
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