Merge branch 'devel' of ssh://palacios@newskysaw/home/palacios/palacios into devel

Conflicts:

	palacios/src/devices/apic.c

diff --git a/palacios/src/devices/apic.c b/palacios/src/devices/apic.c
index f240957..348fff7 100644 (file)
--- a/palacios/src/devices/apic.c
+++ b/palacios/src/devices/apic.c
@@ -32,6 +32,25 @@
 #define PrintDebug(fmt, args...)
 #endif
 
+#ifdef CONFIG_DEBUG_APIC
+static char *shorthand_str[] = { 
+    "(no shorthand)",
+    "(self)",
+    "(all)",
+    "(all-but-me)",
+};
+
+static char *deliverymode_str[] = { 
+    "(fixed)",
+    "(lowest priority)",
+    "(SMI)",
+    "(reserved)",
+    "(NMI)",
+    "(INIT)",
+    "(Start Up)",
+    "(ExtInt)",
+};
+#endif
 
 typedef enum { APIC_TMR_INT, APIC_THERM_INT, APIC_PERF_INT, 
               APIC_LINT0_INT, APIC_LINT1_INT, APIC_ERR_INT } apic_irq_type_t;
@@ -329,7 +348,7 @@ static int activate_apic_irq(struct apic_state * apic, uint32_t irq_num) {
 
 
     if (irq_num <= 15) {
-//     PrintError("apic %u: core ?: Attempting to raise an invalid interrupt: %d\n", apic->lapic_id.val,irq_num);
+       PrintError("apic %u: core ?: Attempting to raise an invalid interrupt: %d\n", apic->lapic_id.val,irq_num);
        return -1;
     }
 
@@ -502,7 +521,7 @@ static inline int should_deliver_cluster_ipi(struct guest_info * dst_core,
        return 1;
     } else {
        PrintDebug("apic %u core %u: rejecting clustered IRQ (mda 0x%x != log_dst 0x%x)\n",
-                  dst_apic->lapic_id.val, dst_core->cpu_id, mda, dst_
+                  dst_apic->lapic_id.val, dst_core->cpu_id, mda, 
                   dst_apic->log_dst.dst_log_id);
        return 0;
     }
@@ -633,7 +652,7 @@ static int deliver_ipi(struct apic_state * src_apic,
            dst_core->segments.cs.base = vector << 12;
 
            PrintDebug(" SIPI delivery (0x%x -> 0x%x:0x0) to core %u\n",
-                      vec, dst_core->segments.cs.selector, dst_core->cpu_id);
+                      vector, dst_core->segments.cs.selector, dst_core->cpu_id);
            // Maybe need to adjust the APIC?
            
            // We transition the target core to SIPI state
@@ -665,12 +684,12 @@ static int route_ipi(struct apic_dev_state * apic_dev,
                     struct int_cmd_reg * icr) {
     struct apic_state * dest_apic = NULL;
 
-    PrintDebug("icc_bus: icc_bus=%p, src_apic=%u, icr_data=%llx, extirq=%u\n", 
-              icc_bus, src_apic, icr_data, extirq);
+    PrintDebug("route_ipi: src_apic=%p, icr_data=%x", 
+              src_apic, icr_val);
 
 
     if ((icr->dst_mode == 0) && (icr->dst >= apic_dev->num_apics)) { 
-       PrintError("icc_bus: Attempted send to unregistered apic id=%u\n", 
+       PrintError("route_ipi: Attempted send to unregistered apic id=%u\n", 
                   icr->dst);
        return -1;
     }
@@ -678,15 +697,14 @@ static int route_ipi(struct apic_dev_state * apic_dev,
     dest_apic =  &(apic_dev->apics[icr->dst]);
 
 
-    PrintDebug("icc_bus: IPI %s %u from %s %u to %s %s %u (icr=0x%llx, extirq=%u)\n",
+    PrintDebug("route_ipi: IPI %s %u from apic %p to %s %s %u (icr=0x%llx)\n",
               deliverymode_str[icr->del_mode], 
               icr->vec, 
               src_apic,               
               (icr->dst_mode == 0) ? "(physical)" : "(logical)", 
               shorthand_str[icr->dst_shorthand], 
               icr->dst,
-              icr->val,
-              extirq);
+              icr->val);
 
 
     switch (icr->dst_shorthand) {
@@ -1299,6 +1317,8 @@ int v3_apic_raise_intr(struct v3_vm_info * vm, struct vm_device * dev,
     struct apic_dev_state * apic_dev = (struct apic_dev_state *)(dev->private_data);
     struct apic_state * apic = &(apic_dev->apics[dst]); 
 
+    PrintDebug("apic %u core ?: raising interrupt IRQ %u (dst = %u).\n", apic->lapic_id.val, irq, dst); 
+
     activate_apic_irq(apic, irq);
 
     if (V3_Get_CPU() != dst) {
@@ -1326,8 +1346,8 @@ static int apic_begin_irq(struct guest_info * core, void * private_data, int irq
        *req_location &= ~flag;
     } else {
        // do nothing... 
-       PrintDebug("apic %u: core %u: begin irq for %d ignored since I don't own it\n",
-                  apic->lapic_id.val, info->cpu_id, irq);
+       //PrintDebug("apic %u: core %u: begin irq for %d ignored since I don't own it\n",
+       //         apic->lapic_id.val, core->cpu_id, irq);
     }
 
     return 0;
@@ -1407,13 +1427,13 @@ static void apic_update_time(struct guest_info * core,
 
        // raise irq
        PrintDebug("apic %u: core %u: Raising APIC Timer interrupt (periodic=%d) (icnt=%d) (div=%d)\n",
-                  apic->lapic_id.val, info->cpu_id,
+                  apic->lapic_id.val, core->cpu_id,
                   apic->tmr_vec_tbl.tmr_mode, apic->tmr_init_cnt, shift_num);
 
        if (apic_intr_pending(core, priv_data)) {
            PrintDebug("apic %u: core %u: Overriding pending IRQ %d\n", 
-                      apic->lapic_id.val, info->cpu_id, 
-                      apic_get_intr_number(info, priv_data));
+                      apic->lapic_id.val, core->cpu_id, 
+                      apic_get_intr_number(core, priv_data));
        }
 
        if (activate_internal_irq(apic, APIC_TMR_INT) == -1) {

diff --git a/test/geekos_test_vm/src/common/fmtout.c b/test/geekos_test_vm/src/common/fmtout.c
index c097eb4..ca7f6c0 100644 (file)
--- a/test/geekos_test_vm/src/common/fmtout.c
+++ b/test/geekos_test_vm/src/common/fmtout.c
@@ -78,7 +78,8 @@ enum ranks {
 #define PTRDIFF_T_RANK rank_long
 
 /* DHH */
-#define EMIT(x) do { (q)->Emit((q), (x)); } while (0)
+#include <geekos/vm_cons.h>
+#define EMIT(x) do { if (q == NULL) {(q)->Emit((q), (x));} } while (0)
 
 /*
  * DHH - As a hack, we buffer this many digits when generating

diff --git a/test/geekos_test_vm/src/geekos/bget.c b/test/geekos_test_vm/src/geekos/bget.c
index cccbe16..d13c3e0 100644 (file)
--- a/test/geekos_test_vm/src/geekos/bget.c
+++ b/test/geekos_test_vm/src/geekos/bget.c
@@ -525,10 +525,9 @@ struct bfhead {
 };
 #define BFH(p) ((struct bfhead *) (p))
 
-static struct bfhead freelist = {     /* List of free buffers */
-    {0, 0},
-    {&freelist, &freelist}
-};
+static struct bfhead freelist;     /* List of free buffers */
+
+
 
 
 #ifdef BufStats
@@ -1017,6 +1016,14 @@ void bpool(buf, len)
 
     assert(len - sizeof(struct bhead) <= -((bufsize) ESent + 1));
 
+    /* Initialize Free list since compile time static initializations appear to be broken */
+    freelist.bh.prevfree = 0;
+    freelist.bh.bsize = 0;
+    freelist.ql.flink = &freelist;
+    freelist.ql.blink = &freelist;
+
+
+
     /* Clear  the  backpointer at  the start of the block to indicate that
        there  is  no  free  block  prior  to  this   one.    That   blocks
        recombination when the first block in memory is released. */

diff --git a/test/geekos_test_vm/src/geekos/main.c b/test/geekos_test_vm/src/geekos/main.c
index a163378..8dd05ab 100644 (file)
--- a/test/geekos_test_vm/src/geekos/main.c
+++ b/test/geekos_test_vm/src/geekos/main.c
@@ -241,18 +241,15 @@ void Main(struct Boot_Info* bootInfo)
 {
   struct Kernel_Thread * key_thread;
   struct Kernel_Thread * spkr_thread;
-
-
-  //  VMConsPutLineN("hello\n", 6);
-
   ulong_t doIBuzz = 0;
 
   Init_BSS();
+  Init_VMCons();
   Init_Screen();
   InitSerial();
-
-  Init_VMCons();
+  Print("Initializing Memory\n");
   Init_Mem(bootInfo);
+  Print("Memory Done\n");
   Init_CRC32();
   Init_TSS();
   Init_Interrupts();
@@ -268,10 +265,6 @@ void Main(struct Boot_Info* bootInfo)
 
 
 
-
-
-
-
   PrintBoth("\n\nHello, Welcome to this horrid output-only serial interface\n");
   PrintBoth("Eventually, this will let us control the VMM\n\n");
  

diff --git a/test/geekos_test_vm/src/geekos/malloc.c b/test/geekos_test_vm/src/geekos/malloc.c
index ea76959..269f0a2 100644 (file)
--- a/test/geekos_test_vm/src/geekos/malloc.c
+++ b/test/geekos_test_vm/src/geekos/malloc.c
@@ -19,7 +19,7 @@
  */
 void Init_Heap(ulong_t start, ulong_t size)
 {
-    /*Print("Creating kernel heap: start=%lx, size=%ld\n", start, size);*/
+    Print("Creating kernel heap: start=%lx, size=%ld\n", start, size);
     bpool((void*) start, size);
 }
 

diff --git a/test/geekos_test_vm/src/geekos/mem.c b/test/geekos_test_vm/src/geekos/mem.c
index 2f44520..6ab2051 100644 (file)
--- a/test/geekos_test_vm/src/geekos/mem.c
+++ b/test/geekos_test_vm/src/geekos/mem.c
@@ -109,7 +109,11 @@ void Init_Mem(struct Boot_Info* bootInfo)
     ulong_t pageListAddr;
     ulong_t kernEnd;
 
+
+    memset(&s_freeList, 0, sizeof(struct Page_List));
+    
     KASSERT(bootInfo->memSizeKB > 0);
+    Print("Booting with %d KB memory\n", bootInfo->memSizeKB);
 
     /*
      * Before we do anything, switch from setup.asm's temporary GDT
@@ -180,10 +184,12 @@ void Init_Mem(struct Boot_Info* bootInfo)
 
     /* Initialize the kernel heap */
     //    Init_Heap(HIGHMEM_START, KERNEL_HEAP_SIZE);
+
+    Print("Initing heap\n");
     Init_Heap(kernEnd, KERNEL_HEAP_SIZE);
 
     Print("%uKB memory detected, %u pages in freelist, %d bytes in kernel heap\n",
-       bootInfo->memSizeKB, g_freePageCount, KERNEL_HEAP_SIZE);
+         bootInfo->memSizeKB, g_freePageCount, KERNEL_HEAP_SIZE);
 }
 
 /*

diff --git a/test/geekos_test_vm/src/geekos/screen.c b/test/geekos_test_vm/src/geekos/screen.c
index 077112f..5323e3c 100644 (file)
--- a/test/geekos_test_vm/src/geekos/screen.c
+++ b/test/geekos_test_vm/src/geekos/screen.c
@@ -14,6 +14,7 @@
 #include <geekos/int.h>
 #include <geekos/fmtout.h>
 #include <geekos/screen.h>
+#include <geekos/vm_cons.h>
 
 /*
  * Information sources for VT100 and ANSI escape sequences:
@@ -387,20 +388,6 @@ static void Update_Cursor(void)
  * Public functions
  * ---------------------------------------------------------------------- */
 
-/*
- * Initialize the screen module.
- */
-void Init_Screen(void)
-{
-    bool iflag = Begin_Int_Atomic();
-
-    s_cons.row = s_cons.col = 0;
-    s_cons.currentAttr = DEFAULT_ATTRIBUTE;
-    Clear_Screen();
-
-    End_Int_Atomic(iflag);
-    Print("Screen Inited\n");
-}
 
 /*
  * Clear the screen using the current attribute.
@@ -512,7 +499,7 @@ void Put_Buf(const char* buf, ulong_t length)
 /* Support for Print(). */
 static void Print_Emit(struct Output_Sink *o, int ch) { Put_Char_Imp(ch); }
 static void Print_Finish(struct Output_Sink *o) { Update_Cursor(); }
-static struct Output_Sink s_outputSink = { &Print_Emit, &Print_Finish };
+static struct Output_Sink s_outputSink;
 
 /*
  * Print to console using printf()-style formatting.
@@ -542,3 +529,22 @@ void PrintList(const char * fmt, va_list ap) {
     PrintInternal(fmt, ap);
     End_Int_Atomic(iflag);
 }
+
+
+/*
+ * Initialize the screen module.
+ */
+void Init_Screen(void)
+{
+    bool iflag = Begin_Int_Atomic();
+    
+    s_outputSink.Emit = &Print_Emit;
+    s_outputSink.Finish = &Print_Finish;
+
+    s_cons.row = s_cons.col = 0;
+    s_cons.currentAttr = DEFAULT_ATTRIBUTE;
+    Clear_Screen();
+
+    End_Int_Atomic(iflag);
+    Print("Screen Inited\n");
+}