Changeset 94d211e in mainline for kernel/arch/arm32/include/arch/mm/page_armv6.h

Timestamp:

2018-03-21T19:32:48Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

1c7a170

Parents:

973be387

Message:

Change the way page flags work. TODO description

File:

• kernel/arch/arm32/include/arch/mm/page_armv6.h (modified) (6 diffs)

kernel/arch/arm32/include/arch/mm/page_armv6.h

@@ -49 +49 @@
 #define PTE_GET_FRAME_ARCH(pte) \
         (((uintptr_t) ((pte_t *) (pte))->l1.frame_base_addr) << FRAME_WIDTH)
+#define PTE_READABLE_ARCH(pte) \
+        1
 #define PTE_WRITABLE_ARCH(pte) \
         (((pte_t *) (pte))->l1.access_permission_1 != PTE_AP1_RO)
@@ -171 +173 @@
         const unsigned np = (p->descriptor_type == PTE_DESCRIPTOR_NOT_PRESENT);
 
-        return (np << PAGE_PRESENT_SHIFT) | (1 << PAGE_USER_SHIFT) |
-            (1 << PAGE_READ_SHIFT) | (1 << PAGE_WRITE_SHIFT) |
-            (1 << PAGE_EXEC_SHIFT) | (1 << PAGE_CACHEABLE_SHIFT);
+        return (np << PAGE_NOT_PRESENT_SHIFT) | PAGE_NEXT_LEVEL_PT;
 }
 
@@ -190 +190 @@
         const unsigned ap1 = p->access_permission_1;
 
-        return ((dt == PTE_DESCRIPTOR_NOT_PRESENT) << PAGE_PRESENT_SHIFT) |
+        return ((dt == PTE_DESCRIPTOR_NOT_PRESENT) << PAGE_NOT_PRESENT_SHIFT) |
             ((dt != PTE_DESCRIPTOR_SMALL_PAGE_NX) << PAGE_EXEC_SHIFT) |
             ((ap0 == PTE_AP0_USER_LIMITED_KERNEL_FULL) << PAGE_READ_SHIFT) |
@@ -198 +198 @@
             (((ap1 != PTE_AP1_RO) && (ap0 == PTE_AP0_USER_FULL_KERNEL_FULL)) << PAGE_WRITE_SHIFT) |
             (((ap1 != PTE_AP1_RO) && (ap0 == PTE_AP0_USER_NO_KERNEL_FULL)) << PAGE_WRITE_SHIFT) |
-            (p->bufferable << PAGE_CACHEABLE);
+            (p->bufferable ? PAGE_CACHEABLE : PAGE_NOT_CACHEABLE);
 }
 
@@ -249 +249 @@
                 p->descriptor_type = PTE_DESCRIPTOR_NOT_PRESENT;
         } else {
-                if (flags & PAGE_EXEC)
+                if (flags & _PAGE_EXEC)
                         p->descriptor_type = PTE_DESCRIPTOR_SMALL_PAGE;
                 else
@@ -288 +288 @@
         p->access_permission_0 = PTE_AP0_USER_NO_KERNEL_FULL;
 
-        if (flags & PAGE_USER) {
+        if (flags & PAGE_USER)
                 p->access_permission_0 = PTE_AP0_USER_FULL_KERNEL_FULL;
-                // TODO Fix kernel to use PAGE_WRITE flag properly and
-                // apply this for kernel pages as well.
-                if (!(flags & PAGE_WRITE))
-                        p->access_permission_1 = PTE_AP1_RO;
-        }
+
+        if (!(flags & _PAGE_WRITE))
+                p->access_permission_1 = PTE_AP1_RO;
+
         pt_coherence(p);
 }