Fixed merge of apic.c

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

diff --git a/palacios/src/devices/apic.c b/palacios/src/devices/apic.c
index 763b538..bb19a66 100644 (file)
--- a/palacios/src/devices/apic.c
+++ b/palacios/src/devices/apic.c
@@ -810,6 +810,8 @@ static int apic_write(struct guest_info * core, addr_t guest_addr, void * src, u
            apic->task_prio.val = op_val;
            break;
        case LDR_OFFSET:
+           PrintDebug("apic %u: core %u: setting log_dst.val to 0x%x\n",
+                      apic->lapic_id.val, core->cpu_id, op_val);
            apic->log_dst.val = op_val;
            break;
        case DFR_OFFSET:
@@ -904,7 +906,7 @@ static int apic_write(struct guest_info * core, addr_t guest_addr, void * src, u
            PrintDebug("apic %u: core %u: sending cmd 0x%llx to apic %u\n", 
                       apic->lapic_id.val, core->cpu_id,
                       apic->int_cmd.val, apic->int_cmd.dst);
-           if (v3_icc_send_ipi(apic->icc_bus, apic->lapic_id.val, apic->int_cmd.val,apic->dst_fmt.val,0)==-1) { 
+           if (v3_icc_send_ipi(apic->icc_bus, apic->lapic_id.val, apic->int_cmd.val,0)==-1) { 
                return -1;
            }
            break;
@@ -1098,7 +1100,7 @@ static struct intr_ctrl_ops intr_ops = {
 
 
 static struct vm_timer_ops timer_ops = {
-    .update_time = apic_update_time,
+    .update_timer = apic_update_timer,
 };
 
 
@@ -1123,16 +1125,18 @@ static struct v3_device_ops dev_ops = {
     .stop = NULL,
 };
 
-
-
 static int apic_should_deliver_flat(struct guest_info * core, uint8_t mda, void * private_data)
 {
   struct apic_state * apic = (struct apic_state *)private_data;
 
   if (mda==0xff ||                         // broadcast or
       (apic->log_dst.dst_log_id & mda)) {  // I am in the set 
+       PrintDebug("apic %u core %u: accepting flat IRQ (mda 0x%x == log_dst 0x%x)\n",
+                  apic->lapic_id.val, core->cpu_id, mda, apic->log_dst.dst_log_id);
       return 1;
   } else {
+       PrintDebug("apic %u core %u: rejecting flat IRQ (mda 0x%x != log_dst 0x%x)\n",
+                  apic->lapic_id.val, core->cpu_id, mda, apic->log_dst.dst_log_id);
       return 0;
   }
 }
@@ -1144,20 +1148,35 @@ static int apic_should_deliver_cluster(struct guest_info * core, uint8_t mda, vo
   if (mda==0xff ||                                                 // broadcast or
       ( ((mda & 0xf0) == (apic->log_dst.dst_log_id & 0xf0)) &&     // (I am in the cluster and
         ((mda & 0x0f)  & (apic->log_dst.dst_log_id & 0x0f)) ) ) {  //  I am in the set)
+       PrintDebug("apic %u core %u: accepting clustered IRQ (mda 0x%x == log_dst 0x%x)\n",
+                  apic->lapic_id.val, core->cpu_id, mda, apic->log_dst.dst_log_id);
+                  
       return 1;
   } else {
+       PrintDebug("apic %u core %u: rejecting clustered IRQ (mda 0x%x != log_dst 0x%x)\n",
+                  apic->lapic_id.val, core->cpu_id, mda, apic->log_dst.dst_log_id);
       return 0;
   }
 }
 
+static int apic_should_deliver(struct guest_info * core, uint8_t mda, void *private_data)
+{
+    struct apic_state * apic = (struct apic_state *)private_data;
+    if (apic->dst_fmt.model == 0xf) {
+       return apic_should_deliver_cluster(core, mda, private_data);
+    } else if (apic->dst_fmt.model == 0x0) {
+       return apic_should_deliver_flat(core, mda, private_data);
+    } else {
+       PrintError("apic %u core %u: invalid destination format register value 0x%x for logical mode delivery.\n", apic->lapic_id.val, core->cpu_id, apic->dst_fmt.model);
+       return 0;
+    }
+}
+
 static struct v3_icc_ops icc_ops = {
     .raise_intr = apic_raise_intr,
-    .should_deliver_flat = apic_should_deliver_flat,
-    .should_deliver_cluster = apic_should_deliver_cluster,
+    .should_deliver = apic_should_deliver,
 };
 
-
-
 static int apic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     PrintDebug("apic: creating an APIC for each core\n");
     char * dev_id = v3_cfg_val(cfg, "ID");