hexagon/mm: enable ARCH_HAS_VM_GET_PAGE_PROT

This enables ARCH_HAS_VM_GET_PAGE_PROT on the platform and exports
standard vm_get_page_prot() implementation via DECLARE_VM_GET_PAGE_PROT,
which looks up a private and static protection_map[] array.  Subsequently
all __SXXX and __PXXX macros can be dropped which are no longer needed.

Link: https://lkml.kernel.org/r/20220711070600.2378316-13-anshuman.khandual@arm.com
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Acked-by: Brian Cain <bcain@quicinc.com>
Cc: Arnd Bergmann <arnd@arndb.de>
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: "David S. Miller" <davem@davemloft.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: Sam Ravnborg <sam@ravnborg.org>
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: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index 54eadf26517868f8cd575a1d5b777be700e35354..bc4ceecd0588c483a386c0eb947354e96e16c25f 100644 (file)
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -6,6 +6,7 @@ config HEXAGON
        def_bool y
        select ARCH_32BIT_OFF_T
        select ARCH_HAS_SYNC_DMA_FOR_DEVICE
+       select ARCH_HAS_VM_GET_PAGE_PROT
        select ARCH_NO_PREEMPT
        select DMA_GLOBAL_POOL
        # Other pending projects/to-do items.

diff --git a/arch/hexagon/include/asm/pgtable.h b/arch/hexagon/include/asm/pgtable.h
index 0610724d6a28078e179b74c0333f42076d54d082..f7048c18b6f97999c783eaf9bd4d4941ed12fd11 100644 (file)
--- a/arch/hexagon/include/asm/pgtable.h
+++ b/arch/hexagon/include/asm/pgtable.h
@@ -126,33 +126,6 @@ extern unsigned long _dflt_cache_att;
  */
 #define CACHEDEF       (CACHE_DEFAULT << 6)
 
-/* Private (copy-on-write) page protections. */
-#define __P000 __pgprot(_PAGE_PRESENT | _PAGE_USER | CACHEDEF)
-#define __P001 __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | CACHEDEF)
-#define __P010 __P000  /* Write-only copy-on-write */
-#define __P011 __P001  /* Read/Write copy-on-write */
-#define __P100 __pgprot(_PAGE_PRESENT | _PAGE_USER | \
-                       _PAGE_EXECUTE | CACHEDEF)
-#define __P101 __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_EXECUTE | \
-                       _PAGE_READ | CACHEDEF)
-#define __P110 __P100  /* Write/execute copy-on-write */
-#define __P111 __P101  /* Read/Write/Execute, copy-on-write */
-
-/* Shared page protections. */
-#define __S000 __P000
-#define __S001 __P001
-#define __S010 __pgprot(_PAGE_PRESENT | _PAGE_USER | \
-                       _PAGE_WRITE | CACHEDEF)
-#define __S011 __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | \
-                       _PAGE_WRITE | CACHEDEF)
-#define __S100 __pgprot(_PAGE_PRESENT | _PAGE_USER | \
-                       _PAGE_EXECUTE | CACHEDEF)
-#define __S101 __P101
-#define __S110 __pgprot(_PAGE_PRESENT | _PAGE_USER | \
-                       _PAGE_EXECUTE | _PAGE_WRITE | CACHEDEF)
-#define __S111 __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | \
-                       _PAGE_EXECUTE | _PAGE_WRITE | CACHEDEF)
-
 extern pgd_t swapper_pg_dir[PTRS_PER_PGD];  /* located in head.S */
 
 /*  HUGETLB not working currently  */

diff --git a/arch/hexagon/mm/init.c b/arch/hexagon/mm/init.c
index 3167a3b5c97b0bf2a2dd27f0dc73fff4a3d20535..146115c9de61778af434150ae4d5be23118783d6 100644 (file)
--- a/arch/hexagon/mm/init.c
+++ b/arch/hexagon/mm/init.c
@@ -234,3 +234,45 @@ void __init setup_arch_memory(void)
         *  which is called by start_kernel() later on in the process
         */
 }
+
+static const pgprot_t protection_map[16] = {
+       [VM_NONE]                                       = __pgprot(_PAGE_PRESENT | _PAGE_USER |
+                                                                  CACHEDEF),
+       [VM_READ]                                       = __pgprot(_PAGE_PRESENT | _PAGE_USER |
+                                                                  _PAGE_READ | CACHEDEF),
+       [VM_WRITE]                                      = __pgprot(_PAGE_PRESENT | _PAGE_USER |
+                                                                  CACHEDEF),
+       [VM_WRITE | VM_READ]                            = __pgprot(_PAGE_PRESENT | _PAGE_USER |
+                                                                  _PAGE_READ | CACHEDEF),
+       [VM_EXEC]                                       = __pgprot(_PAGE_PRESENT | _PAGE_USER |
+                                                                  _PAGE_EXECUTE | CACHEDEF),
+       [VM_EXEC | VM_READ]                             = __pgprot(_PAGE_PRESENT | _PAGE_USER |
+                                                                  _PAGE_EXECUTE | _PAGE_READ |
+                                                                  CACHEDEF),
+       [VM_EXEC | VM_WRITE]                            = __pgprot(_PAGE_PRESENT | _PAGE_USER |
+                                                                  _PAGE_EXECUTE | CACHEDEF),
+       [VM_EXEC | VM_WRITE | VM_READ]                  = __pgprot(_PAGE_PRESENT | _PAGE_USER |
+                                                                  _PAGE_EXECUTE | _PAGE_READ |
+                                                                  CACHEDEF),
+       [VM_SHARED]                                     = __pgprot(_PAGE_PRESENT | _PAGE_USER |
+                                                                  CACHEDEF),
+       [VM_SHARED | VM_READ]                           = __pgprot(_PAGE_PRESENT | _PAGE_USER |
+                                                                  _PAGE_READ | CACHEDEF),
+       [VM_SHARED | VM_WRITE]                          = __pgprot(_PAGE_PRESENT | _PAGE_USER |
+                                                                  _PAGE_WRITE | CACHEDEF),
+       [VM_SHARED | VM_WRITE | VM_READ]                = __pgprot(_PAGE_PRESENT | _PAGE_USER |
+                                                                  _PAGE_READ | _PAGE_WRITE |
+                                                                  CACHEDEF),
+       [VM_SHARED | VM_EXEC]                           = __pgprot(_PAGE_PRESENT | _PAGE_USER |
+                                                                  _PAGE_EXECUTE | CACHEDEF),
+       [VM_SHARED | VM_EXEC | VM_READ]                 = __pgprot(_PAGE_PRESENT | _PAGE_USER |
+                                                                  _PAGE_EXECUTE | _PAGE_READ |
+                                                                  CACHEDEF),
+       [VM_SHARED | VM_EXEC | VM_WRITE]                = __pgprot(_PAGE_PRESENT | _PAGE_USER |
+                                                                  _PAGE_EXECUTE | _PAGE_WRITE |
+                                                                  CACHEDEF),
+       [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ]      = __pgprot(_PAGE_PRESENT | _PAGE_USER |
+                                                                  _PAGE_READ | _PAGE_EXECUTE |
+                                                                  _PAGE_WRITE | CACHEDEF)
+};
+DECLARE_VM_GET_PAGE_PROT