Commit 9b994429 authored by Baoquan He's avatar Baoquan He Committed by Andrew Morton
Browse files

openrisc: mm: convert to GENERIC_IOREMAP 

By taking GENERIC_IOREMAP method, the generic generic_ioremap_prot(),
generic_iounmap(), and their generic wrapper ioremap_prot(), ioremap() and
iounmap() are all visible and available to arch.  Arch needs to provide
wrapper functions to override the generic versions if there's arch
specific handling in its ioremap_prot(), ioremap() or iounmap().  This
change will simplify implementation by removing duplicated code with
generic_ioremap_prot() and generic_iounmap(), and has the equivalent
functioality as before.

For openrisc, the current ioremap() and iounmap() are the same as generic
version.  After taking GENERIC_IOREMAP way, the old ioremap() and
iounmap() can be completely removed.

Link: https://lkml.kernel.org/r/20230706154520.11257-10-bhe@redhat.com


Signed-off-by: default avatarBaoquan He <bhe@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMike Rapoport (IBM) <rppt@kernel.org>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Brian Cain <bcain@quicinc.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Chris Zankel <chris@zankel.net>
Cc: David Laight <David.Laight@ACULAB.COM>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Helge Deller <deller@gmx.de>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Niklas Schnelle <schnelle@linux.ibm.com>
Cc: Rich Felker <dalias@libc.org>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Vineet Gupta <vgupta@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 38d110ab

arch/openrisc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ config OPENRISC 
	select GENERIC_IRQ_PROBE

	select GENERIC_IRQ_SHOW

	select GENERIC_PCI_IOMAP

	select GENERIC_IOREMAP

	select GENERIC_CPU_DEVICES

	select HAVE_PCI

	select HAVE_UID16

arch/openrisc/include/asm/io.h

+6 −5
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
#define __ASM_OPENRISC_IO_H



#include <linux/types.h>

#include <asm/pgalloc.h>

#include <asm/pgtable.h>



/*

 * PCI: We do not use IO ports in OpenRISC
@@ -27,11 +29,10 @@ 
#define PIO_OFFSET		0

#define PIO_MASK		0



#define ioremap ioremap

void __iomem *ioremap(phys_addr_t offset, unsigned long size);



#define iounmap iounmap

extern void iounmap(volatile void __iomem *addr);

/*

 * I/O memory mapping functions.

 */

#define _PAGE_IOREMAP (pgprot_val(PAGE_KERNEL) | _PAGE_CI)



#include <asm-generic/io.h>

arch/openrisc/mm/ioremap.c

+0 −49
Original line number Diff line number Diff line
@@ -22,55 +22,6 @@ 


extern int mem_init_done;



/*

 * Remap an arbitrary physical address space into the kernel virtual

 * address space. Needed when the kernel wants to access high addresses

 * directly.

 *

 * NOTE! We need to allow non-page-aligned mappings too: we will obviously

 * have to convert them into an offset in a page-aligned mapping, but the

 * caller shouldn't need to know that small detail.

 */

void __iomem *__ref ioremap(phys_addr_t addr, unsigned long size)

{

	phys_addr_t p;

	unsigned long v;

	unsigned long offset, last_addr;

	struct vm_struct *area = NULL;



	/* Don't allow wraparound or zero size */

	last_addr = addr + size - 1;

	if (!size || last_addr < addr)

		return NULL;



	/*

	 * Mappings have to be page-aligned

	 */

	offset = addr & ~PAGE_MASK;

	p = addr & PAGE_MASK;

	size = PAGE_ALIGN(last_addr + 1) - p;



	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))) {

		vfree(area->addr);

		return NULL;

	}



	return (void __iomem *)(offset + (char *)v);

}

EXPORT_SYMBOL(ioremap);



void iounmap(volatile void __iomem *addr)

{

	return vfree((void *)(PAGE_MASK & (unsigned long)addr));

}

EXPORT_SYMBOL(iounmap);



/**

 * OK, this one's a bit tricky... ioremap can get called before memory is

 * initialized (early serial console does this) and will want to alloc a page