Changeset 68091bd in mainline

Timestamp:

2006-04-21T12:55:55Z (19 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

c7c0b89b

Parents:

17b1b99

Message:

Incomplete VHPT walker support for Itanium

Files:

• Makefile (modified) (1 diff)
• arch/ia64/Makefile.inc (modified) (1 diff)
• arch/ia64/include/mm/page.h (modified) (1 diff)
• arch/ia64/include/mm/vhpt.h (added)
• arch/ia64/src/mm/page.c (modified) (3 diffs)
• arch/ia64/src/mm/tlb.c (modified) (4 diffs)
• arch/ia64/src/mm/vhpt.c (added)
• generic/src/proc/thread.c (modified) (2 diffs)
• kernel.config (modified) (1 diff)

Makefile

@@ -78 +78 @@
 ifeq ($(CONFIG_DEBUG_ALLREGS),y)
         DEFS += -DCONFIG_DEBUG_ALLREGS
+endif
+ifeq ($(CONFIG_VHPT),y)
+        DEFS += -DCONFIG_VHPT
 endif
 

arch/ia64/Makefile.inc

@@ -85 +85 @@
         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/ia64/include/mm/page.h

@@ -61 +61 @@
 #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

arch/ia64/src/mm/page.c

@@ -32 +32 @@
 #include <mm/asid.h>
 #include <arch/mm/asid.h>
+#include <arch/mm/vhpt.h>
 #include <arch/types.h>
 #include <typedefs.h>
@@ -59 +60 @@
         pta_register pta;       
         int i;
+#ifdef CONFIG_VHPT      
+        __address vhpt_base;
+#endif
 
         /*
@@ -89 +93 @@
         }
 
+#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();

arch/ia64/src/mm/tlb.c

@@ -37 +37 @@
 #include <arch/mm/tlb.h>
 #include <arch/mm/page.h>
+#include <arch/mm/vhpt.h>
 #include <arch/barrier.h>
 #include <arch/interrupt.h>
@@ -79 +80 @@
                 srlz_d();
                 srlz_i();
+#ifdef CONFIG_VHPT
+                vhpt_invalidate_all();
+#endif  
 }
 
@@ -386 +390 @@
         
         dtc_mapping_insert(t->page, t->as->asid, entry);
+#ifdef CONFIG_VHPT
+        vhpt_mapping_insert(t->page, t->as->asid, entry);
+#endif  
 }
 
@@ -410 +417 @@
         
         itc_mapping_insert(t->page, t->as->asid, entry);
+#ifdef CONFIG_VHPT
+        vhpt_mapping_insert(t->page, t->as->asid, entry);
+#endif  
 }
 

generic/src/proc/thread.c

@@ -454 +454 @@
 __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;
 }
 
@@ -480 +480 @@
 __native sys_thread_exit(int uspace_status)
 {
-        thread_exit();
-        /* Unreachable */
-        return 0;
-}
+        thread_exit();
+        /* Unreachable */
+        return 0;
+}

kernel.config

@@ -78 +78 @@
 ! [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