Commit 8f03d74f authored by Baoquan He's avatar Baoquan He Committed by Andrew Morton
Browse files

arm64 : mm: add wrapper function ioremap_prot() 

Since hook functions ioremap_allowed() and iounmap_allowed() will be
obsoleted, add wrapper function ioremap_prot() to contain the the specific
handling in addition to generic_ioremap_prot() invocation.

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


Signed-off-by: default avatarBaoquan He <bhe@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarMike Rapoport (IBM) <rppt@kernel.org>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Brian Cain <bcain@quicinc.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: Jonas Bonn <jonas@southpole.se>
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: Stafford Horne <shorne@gmail.com>
Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Vineet Gupta <vgupta@kernel.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 8d05554d

arch/arm64/include/asm/io.h

+1 −2
Original line number Diff line number Diff line
@@ -139,8 +139,7 @@ extern void __memset_io(volatile void __iomem *, int, size_t); 
 * I/O memory mapping functions.

 */



bool ioremap_allowed(phys_addr_t phys_addr, size_t size, unsigned long prot);

#define ioremap_allowed ioremap_allowed

#define ioremap_prot ioremap_prot



#define _PAGE_IOREMAP PROT_DEVICE_nGnRE

arch/arm64/mm/ioremap.c

+6 −4
Original line number Diff line number Diff line
@@ -3,20 +3,22 @@ 
#include <linux/mm.h>

#include <linux/io.h>



bool ioremap_allowed(phys_addr_t phys_addr, size_t size, unsigned long prot)

void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size,

			   unsigned long prot)

{

	unsigned long last_addr = phys_addr + size - 1;



	/* Don't allow outside PHYS_MASK */

	if (last_addr & ~PHYS_MASK)

		return false;

		return NULL;



	/* Don't allow RAM to be mapped. */

	if (WARN_ON(pfn_is_map_memory(__phys_to_pfn(phys_addr))))

		return false;

		return NULL;



	return true;

	return generic_ioremap_prot(phys_addr, size, __pgprot(prot));

}

EXPORT_SYMBOL(ioremap_prot);



/*

 * Must be called after early_fixmap_init