minor fixes. Can now successfully boot up when Qemu rarely exposes a plausible TSC...

[palacios.git] / palacios / src / devices / apic.c

diff --git a/palacios/src/devices/apic.c b/palacios/src/devices/apic.c
index f240957..234c2fc 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;
@@ -136,7 +155,9 @@ struct apic_msr {
 
 
 
-typedef enum {INIT_ST, SIPI, STARTED} ipi_state_t; 
+typedef enum {INIT_ST, 
+             SIPI, 
+             STARTED} ipi_state_t; 
 
 struct apic_dev_state;
 
@@ -329,22 +350,23 @@ 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 %d: Attempting to raise an invalid interrupt: %d\n", 
+                  apic->lapic_id.val, apic->core->cpu_id, irq_num);
        return -1;
     }
 
 
-    PrintDebug("apic %u: core ?: Raising APIC IRQ %d\n", apic->lapic_id.val, irq_num);
+    PrintDebug("apic %u: core %d: Raising APIC IRQ %d\n", apic->lapic_id.val, apic->core->cpu_id, irq_num);
 
     if (*req_location & flag) {
-       //V3_Print("Interrupts coallescing\n");
+       PrintDebug("Interrupt %d  coallescing\n", irq_num);
     }
 
     if (*en_location & flag) {
        *req_location |= flag;
     } else {
-       PrintDebug("apic %u: core ?: Interrupt  not enabled... %.2x\n", 
-                  apic->lapic_id.val, *en_location);
+       PrintDebug("apic %u: core %d: Interrupt  not enabled... %.2x\n", 
+                  apic->lapic_id.val, apic->core->cpu_id,*en_location);
        return 0;
     }
 
@@ -502,7 +524,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;
     }
@@ -565,7 +587,7 @@ static int deliver_ipi(struct apic_state * src_apic,
 
        case 0:  //fixed
        case 1: // lowest priority
-           PrintDebug(" delivering IRQ to core %u\n", dst_core->cpu_id); 
+           PrintDebug("delivering IRQ %d to core %u\n", vector, dst_core->cpu_id); 
 
            activate_apic_irq(dst_apic, vector);
 
@@ -577,7 +599,7 @@ static int deliver_ipi(struct apic_state * src_apic,
                //     host maitains logical proc->phsysical proc
                PrintDebug(" non-local core, forcing it to exit\n"); 
 
-               v3_interrupt_cpu(core->vm_info, dst_core->cpu_id, 0);
+               v3_interrupt_cpu(dst_core->vm_info, dst_core->cpu_id, 0);
            }
 
            break;
@@ -590,7 +612,7 @@ static int deliver_ipi(struct apic_state * src_apic,
            // Sanity check
            if (dst_apic->ipi_state != INIT_ST) { 
                PrintError(" Warning: core %u is not in INIT state (mode = %d), ignored\n",
-                          dst_core->cpu_id, dst_core->cpu_mode);
+                          dst_core->cpu_id, dst_apic->ipi_state);
                // Only a warning, since INIT INIT SIPI is common
                break;
            }
@@ -613,7 +635,7 @@ static int deliver_ipi(struct apic_state * src_apic,
            // Sanity check
            if (dst_apic->ipi_state != SIPI) { 
                PrintError(" core %u is not in SIPI state (mode = %d), ignored!\n",
-                          dst_core->cpu_id, dst_core->cpu_mode);
+                          dst_core->cpu_id, dst_apic->ipi_state);
                break;
            }
 
@@ -633,7 +655,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 +687,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=%p\n", 
+              src_apic, (void *)(addr_t)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 +700,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) {
@@ -739,7 +760,7 @@ static int route_ipi(struct apic_dev_state * apic_dev,
                }
            } else {
                // logical delivery
-               PrintError("icc_bus: use of logical delivery in self is not yet supported.\n");
+               PrintError("use of logical delivery in self is not yet supported.\n");
                return -1;
            }
            break;
@@ -1289,8 +1310,7 @@ int v3_apic_send_ipi(struct v3_vm_info * vm, struct vm_device * dev,
     tmp_icr.dst = ipi->dst;
     
 
-    route_ipi(apic_dev, NULL, &tmp_icr);
-    return -1;
+    return route_ipi(apic_dev, NULL, &tmp_icr);
 }
 
 
@@ -1299,6 +1319,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 +1348,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 +1429,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) {