Commit 25740d31 authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Andrew Morton
Browse files

sparc/mm: move protection_map[] inside the platform 

This moves protection_map[] inside the platform and while here, also
enable ARCH_HAS_VM_GET_PAGE_PROT on 32 bit platforms via
DECLARE_VM_GET_PAGE_PROT.

Link: https://lkml.kernel.org/r/20220711070600.2378316-5-anshuman.khandual@arm.com


Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Brian Cain <bcain@quicinc.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Chris Zankel <chris@zankel.net>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Guo Ren <guoren@kernel.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Rich Felker <dalias@libc.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Vineet Gupta <vgupta@kernel.org>
Cc: WANG Xuerui <kernel@xen0n.name>
Cc: Will Deacon <will@kernel.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 6eac1eaf

arch/sparc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ config 64BIT 
config SPARC

	bool

	default y

	select ARCH_HAS_VM_GET_PAGE_PROT

	select ARCH_MIGHT_HAVE_PC_PARPORT if SPARC64 && PCI

	select ARCH_MIGHT_HAVE_PC_SERIO

	select DMA_OPS
@@ -84,7 +85,6 @@ config SPARC64 
	select PERF_USE_VMALLOC

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select HAVE_C_RECORDMCOUNT

	select ARCH_HAS_VM_GET_PAGE_PROT

	select HAVE_ARCH_AUDITSYSCALL

	select ARCH_SUPPORTS_ATOMIC_RMW

	select ARCH_SUPPORTS_DEBUG_PAGEALLOC

arch/sparc/include/asm/pgtable_32.h

+0 −19
Original line number Diff line number Diff line
@@ -64,25 +64,6 @@ void paging_init(void); 


extern unsigned long ptr_in_current_pgd;



/*         xwr */

#define __P000  PAGE_NONE

#define __P001  PAGE_READONLY

#define __P010  PAGE_COPY

#define __P011  PAGE_COPY

#define __P100  PAGE_READONLY

#define __P101  PAGE_READONLY

#define __P110  PAGE_COPY

#define __P111  PAGE_COPY



#define __S000	PAGE_NONE

#define __S001	PAGE_READONLY

#define __S010	PAGE_SHARED

#define __S011	PAGE_SHARED

#define __S100	PAGE_READONLY

#define __S101	PAGE_READONLY

#define __S110	PAGE_SHARED

#define __S111	PAGE_SHARED



/* First physical page can be anywhere, the following is needed so that

 * va-->pa and vice versa conversions work properly without performance

 * hit for all __pa()/__va() operations.

arch/sparc/include/asm/pgtable_64.h

+0 −19
Original line number Diff line number Diff line
@@ -187,25 +187,6 @@ bool kern_addr_valid(unsigned long addr); 
#define _PAGE_SZHUGE_4U	_PAGE_SZ4MB_4U

#define _PAGE_SZHUGE_4V	_PAGE_SZ4MB_4V



/* These are actually filled in at boot time by sun4{u,v}_pgprot_init() */

#define __P000	__pgprot(0)

#define __P001	__pgprot(0)

#define __P010	__pgprot(0)

#define __P011	__pgprot(0)

#define __P100	__pgprot(0)

#define __P101	__pgprot(0)

#define __P110	__pgprot(0)

#define __P111	__pgprot(0)



#define __S000	__pgprot(0)

#define __S001	__pgprot(0)

#define __S010	__pgprot(0)

#define __S011	__pgprot(0)

#define __S100	__pgprot(0)

#define __S101	__pgprot(0)

#define __S110	__pgprot(0)

#define __S111	__pgprot(0)



#ifndef __ASSEMBLY__



pte_t mk_pte_io(unsigned long, pgprot_t, int, unsigned long);

arch/sparc/mm/init_32.c

+20 −0
Original line number Diff line number Diff line
@@ -302,3 +302,23 @@ void sparc_flush_page_to_ram(struct page *page) 
		__flush_page_to_ram(vaddr);

}

EXPORT_SYMBOL(sparc_flush_page_to_ram);



static const pgprot_t protection_map[16] = {

	[VM_NONE]					= PAGE_NONE,

	[VM_READ]					= PAGE_READONLY,

	[VM_WRITE]					= PAGE_COPY,

	[VM_WRITE | VM_READ]				= PAGE_COPY,

	[VM_EXEC]					= PAGE_READONLY,

	[VM_EXEC | VM_READ]				= PAGE_READONLY,

	[VM_EXEC | VM_WRITE]				= PAGE_COPY,

	[VM_EXEC | VM_WRITE | VM_READ]			= PAGE_COPY,

	[VM_SHARED]					= PAGE_NONE,

	[VM_SHARED | VM_READ]				= PAGE_READONLY,

	[VM_SHARED | VM_WRITE]				= PAGE_SHARED,

	[VM_SHARED | VM_WRITE | VM_READ]		= PAGE_SHARED,

	[VM_SHARED | VM_EXEC]				= PAGE_READONLY,

	[VM_SHARED | VM_EXEC | VM_READ]			= PAGE_READONLY,

	[VM_SHARED | VM_EXEC | VM_WRITE]		= PAGE_SHARED,

	[VM_SHARED | VM_EXEC | VM_WRITE | VM_READ]	= PAGE_SHARED

};

DECLARE_VM_GET_PAGE_PROT

arch/sparc/mm/init_64.c

+3 −0
Original line number Diff line number Diff line
@@ -2634,6 +2634,9 @@ void vmemmap_free(unsigned long start, unsigned long end, 
}

#endif /* CONFIG_SPARSEMEM_VMEMMAP */



/* These are actually filled in at boot time by sun4{u,v}_pgprot_init() */

static pgprot_t protection_map[16] __ro_after_init;



static void prot_init_common(unsigned long page_none,

			     unsigned long page_shared,

			     unsigned long page_copy,