Changes in kernel/arch/ia64/src/mm/page.c [d99c1d2:98000fb] in mainline

File:

• kernel/arch/ia64/src/mm/page.c (modified) (7 diffs)

kernel/arch/ia64/src/mm/page.c

@@ -39 +39 @@
 #include <arch/mm/asid.h>
 #include <arch/mm/vhpt.h>
-#include <typedefs.h>
+#include <arch/types.h>
 #include <print.h>
 #include <mm/page.h>
@@ -63 +63 @@
 void set_environment(void)
 {
-        region_register_t rr;
-        pta_register_t pta;
+        region_register rr;
+        pta_register pta;
         int i;
 #ifdef CONFIG_VHPT
@@ -71 +71 @@
 
         /*
-         * Set up kernel region registers.
-         * VRN_KERNEL has already been set in start.S.
-         * For paranoia reasons, we set it again.
+         * First set up kernel region register.
+         * This is redundant (see start.S) but we keep it here just for sure.
+         */
+        rr.word = rr_read(VRN_KERNEL);
+        rr.map.ve = 0;                  /* disable VHPT walker */
+        rr.map.ps = PAGE_WIDTH;
+        rr.map.rid = ASID2RID(ASID_KERNEL, VRN_KERNEL);
+        rr_write(VRN_KERNEL, rr.word);
+        srlz_i();
+        srlz_d();
+
+        /*
+         * And setup the rest of region register.
          */
         for(i = 0; i < REGION_REGISTERS; i++) {
+                /* skip kernel rr */
+                if (i == VRN_KERNEL)
+                        continue;
+        
                 rr.word = rr_read(i);
                 rr.map.ve = 0;          /* disable VHPT walker */
-                rr.map.rid = ASID2RID(ASID_KERNEL, i);
+                rr.map.rid = RID_KERNEL;
                 rr.map.ps = PAGE_WIDTH;
                 rr_write(i, rr.word);
@@ -117 +131 @@
 vhpt_entry_t *vhpt_hash(uintptr_t page, asid_t asid)
 {
-        region_register_t rr_save, rr;
+        region_register rr_save, rr;
         size_t vrn;
         rid_t rid;
@@ -162 +176 @@
 bool vhpt_compare(uintptr_t page, asid_t asid, vhpt_entry_t *v)
 {
-        region_register_t rr_save, rr;
+        region_register rr_save, rr;    
         size_t vrn;
         rid_t rid;
@@ -209 +223 @@
     int flags)
 {
-        region_register_t rr_save, rr;
+        region_register rr_save, rr;    
         size_t vrn;
         rid_t rid;
@@ -243 +257 @@
         v->present.ma = (flags & PAGE_CACHEABLE) ?
             MA_WRITEBACK : MA_UNCACHEABLE;
-        v->present.a = false;  /* not accessed */
-        v->present.d = false;  /* not dirty */
+        v->present.a = false;   /* not accessed */
+        v->present.d = false;   /* not dirty */
         v->present.pl = (flags & PAGE_USER) ? PL_USER : PL_KERNEL;
         v->present.ar = (flags & PAGE_WRITE) ? AR_WRITE : AR_READ;
         v->present.ar |= (flags & PAGE_EXEC) ? AR_EXECUTE : 0; 
         v->present.ppn = frame >> PPN_SHIFT;
-        v->present.ed = false;  /* exception not deffered */
+        v->present.ed = false;  /* exception not deffered */
         v->present.ps = PAGE_WIDTH;
         v->present.key = 0;