This defines and exports a platform specific custom vm_get_page_prot() via
subscribing ARCH_HAS_VM_GET_PAGE_PROT. Subsequently all __SXXX and __PXXX
macros can be dropped which are no longer needed.

Cc: Michal Simek <mon...@monstr.eu>
Cc: linux-ker...@vger.kernel.org
Signed-off-by: Anshuman Khandual <anshuman.khand...@arm.com>
---
 arch/microblaze/Kconfig               |  1 +
 arch/microblaze/include/asm/pgtable.h | 17 -----------
 arch/microblaze/mm/init.c             | 41 +++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 59798e43cdb0..f2c25ba8621e 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -7,6 +7,7 @@ config MICROBLAZE
        select ARCH_HAS_GCOV_PROFILE_ALL
        select ARCH_HAS_SYNC_DMA_FOR_CPU
        select ARCH_HAS_SYNC_DMA_FOR_DEVICE
+       select ARCH_HAS_VM_GET_PAGE_PROT
        select ARCH_MIGHT_HAVE_PC_PARPORT
        select ARCH_WANT_IPC_PARSE_VERSION
        select BUILDTIME_TABLE_SORT
diff --git a/arch/microblaze/include/asm/pgtable.h 
b/arch/microblaze/include/asm/pgtable.h
index c136a01e467e..6df373077ff2 100644
--- a/arch/microblaze/include/asm/pgtable.h
+++ b/arch/microblaze/include/asm/pgtable.h
@@ -204,23 +204,6 @@ extern pte_t *va_to_pte(unsigned long address);
  * We consider execute permission the same as read.
  * Also, write permissions imply read permissions.
  */
-#define __P000 PAGE_NONE
-#define __P001 PAGE_READONLY_X
-#define __P010 PAGE_COPY
-#define __P011 PAGE_COPY_X
-#define __P100 PAGE_READONLY
-#define __P101 PAGE_READONLY_X
-#define __P110 PAGE_COPY
-#define __P111 PAGE_COPY_X
-
-#define __S000 PAGE_NONE
-#define __S001 PAGE_READONLY_X
-#define __S010 PAGE_SHARED
-#define __S011 PAGE_SHARED_X
-#define __S100 PAGE_READONLY
-#define __S101 PAGE_READONLY_X
-#define __S110 PAGE_SHARED
-#define __S111 PAGE_SHARED_X
 
 #ifndef __ASSEMBLY__
 /*
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index 952f35b335b2..68faf7d04faf 100644
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c
@@ -280,3 +280,44 @@ void * __ref zalloc_maybe_bootmem(size_t size, gfp_t mask)
 
        return p;
 }
+
+pgprot_t vm_get_page_prot(unsigned long vm_flags)
+{
+       switch (vm_flags & (VM_READ | VM_WRITE | VM_EXEC | VM_SHARED)) {
+       case VM_NONE:
+               return PAGE_NONE;
+       case VM_READ:
+               return PAGE_READONLY_X;
+       case VM_WRITE:
+               return PAGE_COPY;
+       case VM_WRITE | VM_READ:
+               return PAGE_COPY_X;
+       case VM_EXEC:
+               return PAGE_READONLY;
+       case VM_EXEC | VM_READ:
+               return PAGE_READONLY_X;
+       case VM_EXEC | VM_WRITE:
+               return PAGE_COPY;
+       case VM_EXEC | VM_WRITE | VM_READ:
+               return PAGE_COPY_X;
+       case VM_SHARED:
+               return PAGE_NONE;
+       case VM_SHARED | VM_READ:
+               return PAGE_READONLY_X;
+       case VM_SHARED | VM_WRITE:
+               return PAGE_SHARED;
+       case VM_SHARED | VM_WRITE | VM_READ:
+               return PAGE_SHARED_X;
+       case VM_SHARED | VM_EXEC:
+               return PAGE_READONLY;
+       case VM_SHARED | VM_EXEC | VM_READ:
+               return PAGE_READONLY_X;
+       case VM_SHARED | VM_EXEC | VM_WRITE:
+               return PAGE_SHARED;
+       case VM_SHARED | VM_EXEC | VM_WRITE | VM_READ:
+               return PAGE_SHARED_X;
+       default:
+               BUILD_BUG();
+       }
+}
+EXPORT_SYMBOL(vm_get_page_prot);
-- 
2.25.1


_______________________________________________
linux-snps-arc mailing list
linux-snps-arc@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-snps-arc

Reply via email to