Changeset 94d211e in mainline for kernel/arch/arm32/include/arch/mm/page_armv4.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_armv4.h (modified) (5 diffs)

kernel/arch/arm32/include/arch/mm/page_armv4.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_0 == PTE_AP_USER_RW_KERNEL_RW)
@@ -138 +140 @@
         int 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;
 }
 
@@ -156 +156 @@
         int ap = p->access_permission_0;
 
-        return ((dt == PTE_DESCRIPTOR_NOT_PRESENT) << PAGE_PRESENT_SHIFT) |
+        return ((dt == PTE_DESCRIPTOR_NOT_PRESENT) << PAGE_NOT_PRESENT_SHIFT) |
             ((ap == PTE_AP_USER_RO_KERNEL_RW) << PAGE_READ_SHIFT) |
             ((ap == PTE_AP_USER_RW_KERNEL_RW) << PAGE_READ_SHIFT) |
@@ -164 +164 @@
             ((ap == PTE_AP_USER_NO_KERNEL_RW) << PAGE_WRITE_SHIFT) |
             (1 << PAGE_EXEC_SHIFT) |
-            (p->bufferable << PAGE_CACHEABLE);
+            (p->bufferable ? PAGE_CACHEABLE : PAGE_NOT_CACHEABLE);
 }
 
@@ -220 +220 @@
 
         if (flags & PAGE_USER)  {
-                if (flags & PAGE_READ) {
+                if (flags & _PAGE_READ) {
                         p->access_permission_0 = p->access_permission_1 =
                             p->access_permission_2 = p->access_permission_3 =
                             PTE_AP_USER_RO_KERNEL_RW;
                 }
-                if (flags & PAGE_WRITE) {
+                if (flags & _PAGE_WRITE) {
                         p->access_permission_0 = p->access_permission_1 =
                             p->access_permission_2 = p->access_permission_3 =