s390/mm: cleanup page table definitions

Improve the encoding of the different pte types and the naming of the
page, segment table and region table bits. Due to the different pte
encoding the hugetlbfs primitives need to be adapted as well. To improve
compatability with common code make the huge ptes use the encoding of
normal ptes. The conversion between the pte and pmd encoding for a huge
pte is done with set_huge_pte_at and huge_ptep_get.
Overall the code is now easier to understand.

Reviewed-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/arch/s390/lib/uaccess_pt.c b/arch/s390/lib/uaccess_pt.c
index 50ea137a2d3c..1694d738b175 100644
--- a/arch/s390/lib/uaccess_pt.c
+++ b/arch/s390/lib/uaccess_pt.c
@@ -86,28 +86,28 @@ static unsigned long follow_table(struct mm_struct *mm,
         switch (mm->context.asce_bits & _ASCE_TYPE_MASK) {
         case _ASCE_TYPE_REGION1:
                 table = table + ((address >> 53) & 0x7ff);
-                if (unlikely(*table & _REGION_ENTRY_INV))
+                if (unlikely(*table & _REGION_ENTRY_INVALID))
                         return -0x39UL;
                 table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
                 /* fallthrough */
         case _ASCE_TYPE_REGION2:
                 table = table + ((address >> 42) & 0x7ff);
-                if (unlikely(*table & _REGION_ENTRY_INV))
+                if (unlikely(*table & _REGION_ENTRY_INVALID))
                         return -0x3aUL;
                 table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
                 /* fallthrough */
         case _ASCE_TYPE_REGION3:
                 table = table + ((address >> 31) & 0x7ff);
-                if (unlikely(*table & _REGION_ENTRY_INV))
+                if (unlikely(*table & _REGION_ENTRY_INVALID))
                         return -0x3bUL;
                 table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
                 /* fallthrough */
         case _ASCE_TYPE_SEGMENT:
                 table = table + ((address >> 20) & 0x7ff);
-                if (unlikely(*table & _SEGMENT_ENTRY_INV))
+                if (unlikely(*table & _SEGMENT_ENTRY_INVALID))
                         return -0x10UL;
                 if (unlikely(*table & _SEGMENT_ENTRY_LARGE)) {
-                        if (write && (*table & _SEGMENT_ENTRY_RO))
+                        if (write && (*table & _SEGMENT_ENTRY_PROTECT))
                                 return -0x04UL;
                         return (*table & _SEGMENT_ENTRY_ORIGIN_LARGE) +
                                 (address & ~_SEGMENT_ENTRY_ORIGIN_LARGE);
@@ -117,7 +117,7 @@ static unsigned long follow_table(struct mm_struct *mm,
         table = table + ((address >> 12) & 0xff);
         if (unlikely(*table & _PAGE_INVALID))
                 return -0x11UL;
-        if (write && (*table & _PAGE_RO))
+        if (write && (*table & _PAGE_PROTECT))
                 return -0x04UL;
         return (*table & PAGE_MASK) + (address & ~PAGE_MASK);
 }
@@ -130,13 +130,13 @@ static unsigned long follow_table(struct mm_struct *mm,
         unsigned long *table = (unsigned long *)__pa(mm->pgd);
 
         table = table + ((address >> 20) & 0x7ff);
-        if (unlikely(*table & _SEGMENT_ENTRY_INV))
+        if (unlikely(*table & _SEGMENT_ENTRY_INVALID))
                 return -0x10UL;
         table = (unsigned long *)(*table & _SEGMENT_ENTRY_ORIGIN);
         table = table + ((address >> 12) & 0xff);
         if (unlikely(*table & _PAGE_INVALID))
                 return -0x11UL;
-        if (write && (*table & _PAGE_RO))
+        if (write && (*table & _PAGE_PROTECT))
                 return -0x04UL;
         return (*table & PAGE_MASK) + (address & ~PAGE_MASK);
 }