mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
synced 2026-10-29 13:23:23 +01:00
openrisc: mm: remove unneeded early ioremap code
Under arch/openrisc, there isn't any place where ioremap() is called. It means that there isn't early ioremap handling needed in openrisc, So the early ioremap handling code in ioremap() of arch/openrisc/mm/ioremap.c is unnecessary and can be removed. And also remove the special handling in iounmap() since no page is got from fixmap pool along with early ioremap code removing in ioremap(). Link: https://lore.kernel.org/linux-mm/YwxfxKrTUtAuejKQ@oscomms1/ Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Baoquan He <[email protected]> Acked-by: Stafford Horne <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Reviewed-by: Mike Rapoport (IBM) <[email protected]> Cc: Jonas Bonn <[email protected]> Cc: Stefan Kristiansson <[email protected]> Cc: Stafford Horne <[email protected]> Cc: Alexander Gordeev <[email protected]> Cc: Arnd Bergmann <[email protected]> Cc: Brian Cain <[email protected]> Cc: Catalin Marinas <[email protected]> Cc: Christian Borntraeger <[email protected]> Cc: Christophe Leroy <[email protected]> Cc: Chris Zankel <[email protected]> Cc: David Laight <[email protected]> Cc: Geert Uytterhoeven <[email protected]> Cc: Gerald Schaefer <[email protected]> Cc: Heiko Carstens <[email protected]> Cc: Helge Deller <[email protected]> Cc: "James E.J. Bottomley" <[email protected]> Cc: John Paul Adrian Glaubitz <[email protected]> Cc: Kefeng Wang <[email protected]> Cc: Matthew Wilcox <[email protected]> Cc: Max Filippov <[email protected]> Cc: Michael Ellerman <[email protected]> Cc: Nathan Chancellor <[email protected]> Cc: Nicholas Piggin <[email protected]> Cc: Niklas Schnelle <[email protected]> Cc: Rich Felker <[email protected]> Cc: Sven Schnelle <[email protected]> Cc: Vasily Gorbik <[email protected]> Cc: Vineet Gupta <[email protected]> Cc: Will Deacon <[email protected]> Cc: Yoshinori Sato <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
This commit is contained in:
1 parent
5bd2cc5666
commit
53c98e35dc
1 file changed
+5
-38
@@ -22,8 +22,6 @@
|
||||
|
||||
extern int mem_init_done;
|
||||
|
||||
static unsigned int fixmaps_used __initdata;
|
||||
|
||||
/*
|
||||
* Remap an arbitrary physical address space into the kernel virtual
|
||||
* address space. Needed when the kernel wants to access high addresses
|
||||
@@ -52,24 +50,14 @@ void __iomem *__ref ioremap(phys_addr_t addr, unsigned long size)
|
||||
p = addr & PAGE_MASK;
|
||||
size = PAGE_ALIGN(last_addr + 1) - p;
|
||||
|
||||
if (likely(mem_init_done)) {
|
||||
area = get_vm_area(size, VM_IOREMAP);
|
||||
if (!area)
|
||||
return NULL;
|
||||
v = (unsigned long)area->addr;
|
||||
} else {
|
||||
if ((fixmaps_used + (size >> PAGE_SHIFT)) > FIX_N_IOREMAPS)
|
||||
return NULL;
|
||||
v = fix_to_virt(FIX_IOREMAP_BEGIN + fixmaps_used);
|
||||
fixmaps_used += (size >> PAGE_SHIFT);
|
||||
}
|
||||
area = get_vm_area(size, VM_IOREMAP);
|
||||
if (!area)
|
||||
return NULL;
|
||||
v = (unsigned long)area->addr;
|
||||
|
||||
if (ioremap_page_range(v, v + size, p,
|
||||
__pgprot(pgprot_val(PAGE_KERNEL) | _PAGE_CI))) {
|
||||
if (likely(mem_init_done))
|
||||
vfree(area->addr);
|
||||
else
|
||||
fixmaps_used -= (size >> PAGE_SHIFT);
|
||||
vfree(area->addr);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -79,27 +67,6 @@ EXPORT_SYMBOL(ioremap);
|
||||
|
||||
void iounmap(volatile void __iomem *addr)
|
||||
{
|
||||
/* If the page is from the fixmap pool then we just clear out
|
||||
* the fixmap mapping.
|
||||
*/
|
||||
if (unlikely((unsigned long)addr > FIXADDR_START)) {
|
||||
/* This is a bit broken... we don't really know
|
||||
* how big the area is so it's difficult to know
|
||||
* how many fixed pages to invalidate...
|
||||
* just flush tlb and hope for the best...
|
||||
* consider this a FIXME
|
||||
*
|
||||
* Really we should be clearing out one or more page
|
||||
* table entries for these virtual addresses so that
|
||||
* future references cause a page fault... for now, we
|
||||
* rely on two things:
|
||||
* i) this code never gets called on known boards
|
||||
* ii) invalid accesses to the freed areas aren't made
|
||||
*/
|
||||
flush_tlb_all();
|
||||
return;
|
||||
}
|
||||
|
||||
return vfree((void *)(PAGE_MASK & (unsigned long)addr));
|
||||
}
|
||||
EXPORT_SYMBOL(iounmap);
|
||||
|
||||
Reference in new issue
Block a user