Changeset 725d038 in mainline for kernel/genarch/src/mm/page_pt.c

Timestamp:

2012-07-05T20:23:28Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4bec78f

Parents:

7ca22e5 (diff), 5e4f22b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline changes.

File:

• kernel/genarch/src/mm/page_pt.c (modified) (7 diffs)

kernel/genarch/src/mm/page_pt.c

@@ -43 +43 @@
 #include <arch/mm/page.h>
 #include <arch/mm/as.h>
+#include <arch/barrier.h>
 #include <typedefs.h>
 #include <arch/asm.h>
@@ -86 +87 @@
                 SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page), KA2PA(newpt));
                 SET_PTL1_FLAGS(ptl0, PTL0_INDEX(page),
-                    PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
+                    PAGE_NOT_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
                     PAGE_WRITE);
+                write_barrier();
+                SET_PTL1_PRESENT(ptl0, PTL0_INDEX(page));
         }
         
@@ -98 +101 @@
                 SET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page), KA2PA(newpt));
                 SET_PTL2_FLAGS(ptl1, PTL1_INDEX(page),
-                    PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
+                    PAGE_NOT_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
                     PAGE_WRITE);
+                write_barrier();
+                SET_PTL2_PRESENT(ptl1, PTL1_INDEX(page));       
         }
         
@@ -110 +115 @@
                 SET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page), KA2PA(newpt));
                 SET_PTL3_FLAGS(ptl2, PTL2_INDEX(page),
-                    PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
+                    PAGE_NOT_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
                     PAGE_WRITE);
+                write_barrier();
+                SET_PTL3_PRESENT(ptl2, PTL2_INDEX(page));
         }
         
@@ -117 +124 @@
         
         SET_FRAME_ADDRESS(ptl3, PTL3_INDEX(page), frame);
-        SET_FRAME_FLAGS(ptl3, PTL3_INDEX(page), flags);
+        SET_FRAME_FLAGS(ptl3, PTL3_INDEX(page), flags | PAGE_NOT_PRESENT);
+        write_barrier();
+        SET_FRAME_PRESENT(ptl3, PTL3_INDEX(page));
 }
 
@@ -279 +288 @@
         if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT)
                 return NULL;
+
+        read_barrier();
         
         pte_t *ptl1 = (pte_t *) PA2KA(GET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page)));
         if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT)
                 return NULL;
+
+#if (PTL1_ENTRIES != 0)
+        read_barrier();
+#endif
         
         pte_t *ptl2 = (pte_t *) PA2KA(GET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page)));
         if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT)
                 return NULL;
+
+#if (PTL2_ENTRIES != 0)
+        read_barrier();
+#endif
         
         pte_t *ptl3 = (pte_t *) PA2KA(GET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page)));
@@ -346 +365 @@
                 SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(addr), KA2PA(l1));
                 SET_PTL1_FLAGS(ptl0, PTL0_INDEX(addr),
-                    PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
-                    PAGE_WRITE);
+                    PAGE_PRESENT | PAGE_USER | PAGE_CACHEABLE |
+                    PAGE_EXEC | PAGE_WRITE | PAGE_READ);
         }
 }