Changeset bfb87df in mainline for arch/ia32

Timestamp:

2006-02-09T17:02:36Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8f00329

Parents:

874878a

Message:

Remove WAKEUP_IPI stuff.

Make it possible to use PAGE_GLOBAL on ia32, amd64 and mips32.
Make ia32 and amd64 map the kernel using PAGE_GLOBAL.

Location:

arch/ia32

Files:

• include/interrupt.h (modified) (2 diffs)
• include/mm/page.h (modified) (3 diffs)
• src/ia32.c (modified) (1 diff)
• src/interrupt.c (modified) (1 diff)
• src/mm/page.c (modified) (2 diffs)

arch/ia32/include/interrupt.h

@@ -60 +60 @@
 #define VECTOR_SYSCALL                  (IVT_FREEBASE+0)
 #define VECTOR_TLB_SHOOTDOWN_IPI        (IVT_FREEBASE+1)
-#define VECTOR_WAKEUP_IPI               (IVT_FREEBASE+2)
 
 extern void (* disable_irqs_function)(__u16 irqmask);
@@ -73 +72 @@
 extern void syscall(int n, void *stack);
 extern void tlb_shootdown_ipi(int n, void *stack);
-extern void wakeup_ipi(int n, void *stack);
 
 extern void trap_virtual_enable_irqs(__u16 irqmask);

arch/ia32/include/mm/page.h

@@ -86 +86 @@
         unsigned accessed : 1;
         unsigned dirty : 1;
-        unsigned : 2;
+        unsigned pat : 1;
+        unsigned global : 1;
         unsigned avl : 3;
         unsigned frame_address : 20;
@@ -101 +102 @@
                 1<<PAGE_READ_SHIFT |
                 p->writeable<<PAGE_WRITE_SHIFT |
-                1<<PAGE_EXEC_SHIFT
+                1<<PAGE_EXEC_SHIFT |
+                p->global<<PAGE_GLOBAL_SHIFT
         );
 }
@@ -113 +115 @@
         p->uaccessible = (flags & PAGE_USER) != 0;
         p->writeable = (flags & PAGE_WRITE) != 0;
+        p->global = (flags & PAGE_GLOBAL) != 0;
 }
 

arch/ia32/src/ia32.c

@@ -66 +66 @@
                 exc_register(VECTOR_TLB_SHOOTDOWN_IPI, "tlb_shootdown",
                              tlb_shootdown_ipi);
-                exc_register(VECTOR_WAKEUP_IPI, "wakeup_ipi", wakeup_ipi);
                 #endif /* CONFIG_SMP */
         }

arch/ia32/src/interrupt.c

@@ -128 +128 @@
 }
 
-void wakeup_ipi(int n, void *stack)
-{
-        trap_virtual_eoi();
-}
-
 void trap_virtual_enable_irqs(__u16 irqmask)
 {

arch/ia32/src/mm/page.c

@@ -46 +46 @@
 {
         __address cur;
+        int flags;
 
         if (config.cpu_active == 1) {
@@ -53 +54 @@
                  * PA2KA(identity) mapping for all frames until last_frame.
                  */
-                for (cur = 0; cur < last_frame; cur += FRAME_SIZE)
-                        page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, PAGE_CACHEABLE);
+                for (cur = 0; cur < last_frame; cur += FRAME_SIZE) {
+                        flags = PAGE_CACHEABLE;
+                        if ((PA2KA(cur) >= config.base) && (PA2KA(cur) < config.base + config.kernel_size))
+                                flags |= PAGE_GLOBAL;
+                        page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
+                }
 
                 exc_register(14, "page_fault", page_fault);