Change the direct network bridge interface

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

diff --git a/palacios/src/devices/apic.c b/palacios/src/devices/apic.c
index 8e07132..1872bb3 100644 (file)
--- a/palacios/src/devices/apic.c
+++ b/palacios/src/devices/apic.c
@@ -207,6 +207,8 @@ struct apic_state {
 
     struct guest_info * core;
 
+    void * controller_handle;
+
     struct v3_timer * timer;
 
     uint32_t eoi;
@@ -225,6 +227,8 @@ struct apic_dev_state {
 
 
 
+
+
 static int apic_read(struct guest_info * core, addr_t guest_addr, void * dst, uint_t length, void * priv_data);
 static int apic_write(struct guest_info * core, addr_t guest_addr, void * src, uint_t length, void * priv_data);
 
@@ -597,7 +601,11 @@ static int deliver_ipi(struct apic_state * src_apic,
                //     host maitains logical proc->phsysical proc
                PrintDebug(" non-local core, forcing it to exit\n"); 
 
+#ifdef CONFIG_MULTITHREAD_OS
                v3_interrupt_cpu(dst_core->vm_info, dst_core->cpu_id, 0);
+#else
+               V3_ASSERT(0);
+#endif
            }
 
            break;
@@ -698,14 +706,15 @@ static int route_ipi(struct apic_dev_state * apic_dev,
     dest_apic =  &(apic_dev->apics[icr->dst]);
 
 
-    PrintDebug("route_ipi: IPI %s %u from apic %p to %s %s %u (icr=0x%llx)\n",
+    PrintDebug("route_ipi: IPI %s %u from apic %p to %s %s %u (icr=0x%llx) (destapic=%p\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);
+              icr->val,
+              dest_apic);
 
     switch (icr->dst_shorthand) {
 
@@ -723,7 +732,6 @@ static int route_ipi(struct apic_dev_state * apic_dev,
                // logical delivery
                int i;
                uint8_t mda = icr->dst;
-
                for (i = 0; i < apic_dev->num_apics; i++) { 
                     dest_apic = &(apic_dev->apics[i]);
                     int del_flag = should_deliver_ipi(dest_apic->core, dest_apic, mda);
@@ -1291,13 +1299,13 @@ static int apic_get_intr_number(struct guest_info * core, void * private_data) {
 
 
 int v3_apic_send_ipi(struct v3_vm_info * vm, struct v3_gen_ipi * ipi, void * dev_data) {
-    struct apic_dev_state * apic_dev = (struct apic_dev_state *)dev_data;
+    struct apic_dev_state * apic_dev = (struct apic_dev_state *)
+       (((struct vm_device *)dev_data)->private_data);
     struct int_cmd_reg tmp_icr;
 
     // zero out all the fields
     tmp_icr.val = 0;
 
-
     tmp_icr.vec = ipi->vector;
     tmp_icr.del_mode = ipi->mode;
     tmp_icr.dst_mode = ipi->logical;
@@ -1311,7 +1319,8 @@ int v3_apic_send_ipi(struct v3_vm_info * vm, struct v3_gen_ipi * ipi, void * dev
 
 
 int v3_apic_raise_intr(struct v3_vm_info * vm, uint32_t irq, uint32_t dst, void * dev_data) {
-    struct apic_dev_state * apic_dev = (struct apic_dev_state *)(dev_data);
+    struct apic_dev_state * apic_dev = (struct apic_dev_state *)
+       (((struct vm_device*)dev_data)->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); 
@@ -1319,7 +1328,11 @@ int v3_apic_raise_intr(struct v3_vm_info * vm, uint32_t irq, uint32_t dst, void
     activate_apic_irq(apic, irq);
 
     if (V3_Get_CPU() != dst) {
+#ifdef CONFIG_MULTITHREAD_OS
        v3_interrupt_cpu(vm, dst, 0);
+#else
+       V3_ASSERT(0);
+#endif
     }
 
     return 0;
@@ -1462,16 +1475,17 @@ static struct v3_timer_ops timer_ops = {
 
 
 
-static int apic_free(struct vm_device * dev) {
-    struct apic_dev_state * apic_dev = (struct apic_dev_state *)dev->private_data;
+static int apic_free(struct apic_dev_state * apic_dev) {
     int i = 0;
+    struct v3_vm_info * vm = NULL;
 
-    for (i = 0; i < dev->vm->num_cores; i++) {
+    for (i = 0; i < apic_dev->num_apics; i++) {
        struct apic_state * apic = &(apic_dev->apics[i]);
-       struct guest_info * core = &(dev->vm->cores[i]);
+       struct guest_info * core = apic->core;
        
+       vm = core->vm_info;
 
-       // unregister intr controller
+       v3_remove_intr_controller(core, apic->controller_handle);
 
        if (apic->timer) {
            v3_remove_timer(core, apic->timer);
@@ -1481,7 +1495,7 @@ static int apic_free(struct vm_device * dev) {
 
     }
 
-    v3_unhook_msr(dev->vm, BASE_ADDR_MSR);
+    v3_unhook_msr(vm, BASE_ADDR_MSR);
 
     V3_Free(apic_dev);
     return 0;
@@ -1489,7 +1503,7 @@ static int apic_free(struct vm_device * dev) {
 
 
 static struct v3_device_ops dev_ops = {
-    .free = apic_free,
+    .free = (int (*)(void *))apic_free,
 };
 
 
@@ -1525,7 +1539,7 @@ static int apic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
        init_apic_state(apic, i);
 
-       v3_register_intr_controller(core, &intr_ops, apic_dev);
+       apic->controller_handle = v3_register_intr_controller(core, &intr_ops, apic_dev);
 
        apic->timer = v3_add_timer(core, &timer_ops, apic_dev);
 
@@ -1543,8 +1557,8 @@ static int apic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 #ifdef CONFIG_DEBUG_APIC
     for (i = 0; i < vm->num_cores; i++) {
        struct apic_state * apic = &(apic_dev->apics[i]);
-       PrintDebug("apic: sanity check: apic %u (at %p) has id %u and msr value %llx\n",
-                  i, apic, apic->lapic_id.val, apic->base_addr_msr.value);
+       PrintDebug("apic: sanity check: apic %u (at %p) has id %u and msr value %llx and core at %p\n",
+                  i, apic, apic->lapic_id.val, apic->base_addr_msr.value,apic->core);
     }
 #endif