Changeset 7d3d641 in mainline for kernel/arch/xen32/src

Timestamp:

2006-08-01T20:45:26Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

5b23a82

Parents:

3e5cc686

Message:

xen32: initialize virtual IDT

Location:

kernel/arch/xen32/src

Files:

• asm.S (modified) (2 diffs)
• pm.c (modified) (4 diffs)
• proc/scheduler.c (modified) (2 diffs)
• proc/task.c (modified) (2 diffs)
• proc/thread.c (modified) (3 diffs)
• xen32.c (modified) (3 diffs)

kernel/arch/xen32/src/asm.S

@@ -35 +35 @@
 .text
 
+.global xen_callback
+.global xen_failsafe_callback
 .global enable_l_apic_in_msr
 .global interrupt_handlers
@@ -42 +44 @@
 .global memcpy_to_uspace
 .global memcpy_to_uspace_failover_address
+
+
+xen_callback:
+        iret
+
+xen_failsafe_callback:
+        iret
 
 

kernel/arch/xen32/src/pm.c

@@ -76 +76 @@
 };
 
-static idescriptor_t idt[IDT_ITEMS];
+static trap_info_t traps[IDT_ITEMS + 1];
 
 static tss_t tss;
@@ -99 +99 @@
 }
 
-void idt_setoffset(idescriptor_t *d, uintptr_t offset)
-{
-        /*
-         * Offset is a linear address.
-         */
-        d->offset_0_15 = offset & 0xffff;
-        d->offset_16_31 = offset >> 16;
-}
-
 void tss_initialize(tss_t *t)
 {
@@ -113 +104 @@
 }
 
-/*
- * This function takes care of proper setup of IDT and IDTR.
- */
-void idt_init(void)
-{
-        idescriptor_t *d;
-        int i;
-
+void traps_init(void)
+{
+        index_t i;
+        
         for (i = 0; i < IDT_ITEMS; i++) {
-                d = &idt[i];
-
-                d->unused = 0;
-                d->selector = selector(KTEXT_DES);
-
-                d->access = AR_PRESENT | AR_INTERRUPT;  /* masking interrupt */
-
-                if (i == VECTOR_SYSCALL) {
-                        /*
-                         * The syscall interrupt gate must be calleable from userland.
-                         */
-                        d->access |= DPL_USER;
-                }
+                traps[i].vector = i;
                 
-                idt_setoffset(d, ((uintptr_t) interrupt_handlers) + i*interrupt_handler_size);
+                if (i == VECTOR_SYSCALL)
+                        traps[i].flags = 3;
+                else
+                        traps[i].flags = 0;
+                
+                traps[i].cs = XEN_CS;
+                traps[i].address = ((uintptr_t) interrupt_handlers) + i * interrupt_handler_size;
                 exc_register(i, "undef", (iroutine) null_interrupt);
         }
+        traps[IDT_ITEMS].vector = 0;
+        traps[IDT_ITEMS].flags = 0;
+        traps[IDT_ITEMS].cs = 0;
+        traps[IDT_ITEMS].address = NULL;
+        
         exc_register(13, "gp_fault", (iroutine) gp_fault);
         exc_register( 7, "nm_fault", (iroutine) nm_fault);
@@ -173 +159 @@
 {
         descriptor_t *gdt_p = (descriptor_t *) gdtr.base;
-        ptr_16_32_t idtr;
-
-        /*
-         * Update addresses in GDT and IDT to their virtual counterparts.
-         */
-        idtr.limit = sizeof(idt);
-        idtr.base = (uintptr_t) idt;
+
 //      gdtr_load(&gdtr);
-//      idtr_load(&idtr);
-        
-        /*
-         * Each CPU has its private GDT and TSS.
-         * All CPUs share one IDT.
-         */
-
-//      if (config.cpu_active == 1) {
-//              idt_init();
-//              /*
-//               * NOTE: bootstrap CPU has statically allocated TSS, because
-//               * the heap hasn't been initialized so far.
-//               */
+        
+        if (config.cpu_active == 1) {
+                traps_init();
+                xen_set_trap_table(traps);
+                /*
+                 * NOTE: bootstrap CPU has statically allocated TSS, because
+                 * the heap hasn't been initialized so far.
+                 */
                 tss_p = &tss;
-//      }
-//      else {
-//              tss_p = (tss_t *) malloc(sizeof(tss_t), FRAME_ATOMIC);
-//              if (!tss_p)
-//                      panic("could not allocate TSS\n");
-//      }
+        } else {
+                tss_p = (tss_t *) malloc(sizeof(tss_t), FRAME_ATOMIC);
+                if (!tss_p)
+                        panic("could not allocate TSS\n");
+        }
 
 //      tss_initialize(tss_p);

kernel/arch/xen32/src/proc/scheduler.c

@@ -27 +27 @@
  */
 
- /** @addtogroup ia32proc
+/** @addtogroup xen32proc
  * @{
  */
@@ -78 +78 @@
 }
 
- /** @}
+/** @}
  */
-

kernel/arch/xen32/src/proc/task.c

@@ -27 +27 @@
  */
 
- /** @addtogroup ia32proc
+/** @addtogroup xen32proc
  * @{
  */
@@ -58 +58 @@
 }
 
- /** @}
+/** @}
  */
-

kernel/arch/xen32/src/proc/thread.c

@@ -27 +27 @@
  */
 
- /** @addtogroup ia32proc
+/** @addtogroup xen32proc
  * @{
  */
@@ -35 +35 @@
 #include <proc/thread.h>
 
-/** Perform ia32 specific thread initialization.
+/** Perform xen32 specific thread initialization.
  *
  * @param t Thread to be initialized.
@@ -44 +44 @@
 }
 
- /** @}
+/** @}
  */
-

kernel/arch/xen32/src/xen32.c

@@ -65 +65 @@
 memzone_t meminfo;
 
+extern void xen_callback(void);
+extern void xen_failsafe_callback(void);
+
 void arch_pre_main(void)
 {
@@ -76 +79 @@
         pte.frame_address = ADDR2PFN((uintptr_t) start_info.shared_info);
         xen_update_va_mapping(&shared_info, pte, UVMF_INVLPG);
+        
+        xen_set_callbacks(XEN_CS, xen_callback, XEN_CS, xen_failsafe_callback);
         
         /* Create identity mapping */
@@ -117 +122 @@
 //              bios_init();
                 
-//              exc_register(VECTOR_SYSCALL, "syscall", (iroutine) syscall);
+                exc_register(VECTOR_SYSCALL, "syscall", (iroutine) syscall);
                 
                 #ifdef CONFIG_SMP
-//              exc_register(VECTOR_TLB_SHOOTDOWN_IPI, "tlb_shootdown",
-//                           (iroutine) tlb_shootdown_ipi);
+                exc_register(VECTOR_TLB_SHOOTDOWN_IPI, "tlb_shootdown",
+                             (iroutine) tlb_shootdown_ipi);
                 #endif /* CONFIG_SMP */
         }