WebSVN – HelenOS-historic – Path Comparison – / – /kernel/ Rev 1209 and /kernel/ Rev 1210

Ignore whitespace Rev 1209 → Rev 1210

 /kernel/trunk/kernel.config
 ,6 → 77,9
 # Save all interrupt registers
 ! [CONFIG_DEBUG=y&(ARCH=amd64|ARCH=mips32|ARCH=ia32)] CONFIG_DEBUG_ALLREGS (y/n)
+# Use VHPT
+! [ARCH=ia64] CONFIG_VHPT (y/n)
 ## Run-time configuration directives
 # Kernel test type

 /kernel/trunk/generic/src/proc/thread.c
 ,25 → 453,25
  */
 __native sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name)
 {
-        thread_t *t;
-        char namebuf[THREAD_NAME_BUFLEN];
+    thread_t *t;
+    char namebuf[THREAD_NAME_BUFLEN];
     uspace_arg_t *kernel_uarg;
     __u32 tid;
-        copy_from_uspace(namebuf, uspace_name, THREAD_NAME_BUFLEN);
+    copy_from_uspace(namebuf, uspace_name, THREAD_NAME_BUFLEN);
     kernel_uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t), 0);
     copy_from_uspace(kernel_uarg, uspace_uarg, sizeof(uspace_arg_t));
-        if ((t = thread_create(uinit, kernel_uarg, TASK, 0, namebuf))) {
+    if ((t = thread_create(uinit, kernel_uarg, TASK, 0, namebuf))) {
         tid = t->tid;
-                thread_ready(t);
+        thread_ready(t);
         return (__native) tid;
-        } else {
+    } else {
         free(kernel_uarg);
-        }
+    }
-        return (__native) -1;
+    return (__native) -1;
 }
 /** Process syscall to terminate thread.
 ,7 → 479,7
  */
 __native sys_thread_exit(int uspace_status)
 {
-        thread_exit();
-        /* Unreachable */
-        return 0;
+    thread_exit();
+    /* Unreachable */
+    return 0;
 }

 /kernel/trunk/Makefile
 ,6 → 78,9
 ifeq ($(CONFIG_DEBUG_ALLREGS),y)
     DEFS += -DCONFIG_DEBUG_ALLREGS
 endif
+ifeq ($(CONFIG_VHPT),y)
+    DEFS += -DCONFIG_VHPT
+endif
 ## Toolchain configuration
 #

/kernel/trunk/arch/ia64/include/mm/page.h
60,7 → 60,6

#define VHPT_WIDTH 20 /* 1M */
#define VHPT_SIZE (1 << VHPT_WIDTH)
#define VHPT_BASE 0 /* Must be aligned to VHPT_SIZE */

#define PTA_BASE_SHIFT 15

 /kernel/trunk/arch/ia64/include/mm/vhpt.h
 ,0 → 1,25
+#ifndef __ia64_VHPT_H__
+#define __ia64_VHPT_H__
+#include <arch/mm/tlb.h>
+#include <arch/mm/page.h>
+__address vhpt_set_up(void);
+static inline vhpt_entry_t tlb_entry_t2vhpt_entry_t(tlb_entry_t tentry)
+{
+    vhpt_entry_t ventry;
+    ventry.word[0]=tentry.word[0];
+    ventry.word[1]=tentry.word[1];
+    return ventry;
+}
+void vhpt_mapping_insert(__address va, asid_t asid, tlb_entry_t entry);
+void vhpt_invalidate_all(void);
+void vhpt_invalidate_asid(asid_t asid);
+#endif

/kernel/trunk/arch/ia64/Makefile.inc
84,6 → 84,7
arch/$(ARCH)/src/mm/frame.c \
arch/$(ARCH)/src/mm/page.c \
arch/$(ARCH)/src/mm/tlb.c \
arch/$(ARCH)/src/mm/vhpt.c \
arch/$(ARCH)/src/proc/scheduler.c \
arch/$(ARCH)/src/ddi/ddi.c \
arch/$(ARCH)/src/drivers/it.c

 /kernel/trunk/arch/ia64/src/mm/tlb.c
 ,6 → 36,7
 #include <mm/as.h>
 #include <arch/mm/tlb.h>
 #include <arch/mm/page.h>
+#include <arch/mm/vhpt.h>
 #include <arch/barrier.h>
 #include <arch/interrupt.h>
 #include <arch/pal/pal.h>
 ,6 → 79,9
         srlz_d();
         srlz_i();
+#ifdef CONFIG_VHPT
+        vhpt_invalidate_all();
+#endif
 }
 /** Invalidate entries belonging to an address space.
 ,6 → 389,9
     entry.ps = PAGE_WIDTH;
     dtc_mapping_insert(t->page, t->as->asid, entry);
+#ifdef CONFIG_VHPT
+    vhpt_mapping_insert(t->page, t->as->asid, entry);
+#endif
 }
 /** Copy content of PTE into instruction translation cache.
 ,6 → 416,9
     entry.ps = PAGE_WIDTH;
     itc_mapping_insert(t->page, t->as->asid, entry);
+#ifdef CONFIG_VHPT
+    vhpt_mapping_insert(t->page, t->as->asid, entry);
+#endif
 }
 /** Instruction TLB fault handler for faults with VHPT turned off.

 /kernel/trunk/arch/ia64/src/mm/vhpt.c
 ,0 → 1,59
+#include <arch/mm/vhpt.h>
+#include <mm/frame.h>
+#include <print.h>
+static vhpt_entry_t* vhpt_base;
+__address vhpt_set_up(void)
+{
+    vhpt_base=(vhpt_entry_t*) PA2KA(PFN2ADDR(frame_alloc(VHPT_WIDTH-FRAME_WIDTH,FRAME_KA)));
+    if(!vhpt_base) panic("Kernel configured with VHPT but no memory for table.");
+    vhpt_invalidate_all();
+    return (__address) vhpt_base;
+}
+void vhpt_mapping_insert(__address va, asid_t asid, tlb_entry_t entry)
+{
+    region_register rr_save, rr;
+    index_t vrn;
+    rid_t rid;
+    __u64 tag;
+    vhpt_entry_t *ventry;
+    vrn = va >> VRN_SHIFT;
+    rid = ASID2RID(asid, vrn);
+  rr_save.word = rr_read(vrn);
+  rr.word = rr_save.word;
+  rr.map.rid = rid;
+  rr_write(vrn, rr.word);
+  srlz_i();
+    ventry = (vhpt_entry_t *) thash(va);
+  tag = ttag(va);
+  rr_write(vrn, rr_save.word);
+  srlz_i();
+  srlz_d();
+    ventry->word[0]=entry.word[0];
+    ventry->word[1]=entry.word[1];
+    ventry->present.tag.tag_word = tag;
+}
+void vhpt_invalidate_all()
+{
+    memsetb((__address)vhpt_base,1<<VHPT_WIDTH,0);
+}
+void vhpt_invalidate_asid(asid_t asid)
+{
+    vhpt_invalidate_all();
+}

 /kernel/trunk/arch/ia64/src/mm/page.c
 ,6 → 31,7
 #include <genarch/mm/page_ht.h>
 #include <mm/asid.h>
 #include <arch/mm/asid.h>
+#include <arch/mm/vhpt.h>
 #include <arch/types.h>
 #include <typedefs.h>
 #include <print.h>
 ,6 → 59,9
     region_register rr;
     pta_register pta;
     int i;
+#ifdef CONFIG_VHPT
+    __address vhpt_base;
+#endif
     /*
      * First set up kernel region register.
 ,14 → 92,22
         srlz_d();
     }
+#ifdef CONFIG_VHPT
+    vhpt_base = vhpt_set_up();
+#endif
     /*
      * Set up PTA register.
      */
     pta.word = pta_read();
+#ifndef CONFIG_VHPT
     pta.map.ve = 0;                   /* disable VHPT walker */
+    pta.map.base = 0 >> PTA_BASE_SHIFT;
+#else
+    pta.map.ve = 1;                   /* enable VHPT walker */
+    pta.map.base = vhpt_base >> PTA_BASE_SHIFT;
+#endif
     pta.map.vf = 1;                   /* large entry format */
     pta.map.size = VHPT_WIDTH;
-    pta.map.base = VHPT_BASE >> PTA_BASE_SHIFT;
     pta_write(pta.word);
     srlz_i();
     srlz_d();