X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fapic.c;h=7f70d9cac4b813a8d35105765fecea459b33e86e;hb=0d1e0dd23b9c0897c3a315731a859c389273d713;hp=6eaa35fbe10d83c7faf9c1b0de9b754d81eeb2fb;hpb=b4aaeaa7233244ad9d607a0077dbbce719833fe0;p=palacios.git

diff --git a/palacios/src/devices/apic.c b/palacios/src/devices/apic.c
index 6eaa35f..7f70d9c 100644
--- a/palacios/src/devices/apic.c
+++ b/palacios/src/devices/apic.c
@@ -33,14 +33,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_APIC
-static char *shorthand_str[] = { 
+static char * shorthand_str[] = { 
     "(no shorthand)",
     "(self)",
     "(all)",
     "(all-but-me)",
 };
 
-static char *deliverymode_str[] = { 
+static char * deliverymode_str[] = { 
     "(fixed)",
     "(lowest priority)",
     "(SMI)",
@@ -207,6 +207,10 @@ struct apic_state {
 
     struct guest_info * core;
 
+    void * controller_handle;
+
+    struct v3_timer * timer;
+
     uint32_t eoi;
 
     v3_lock_t  lock;
@@ -595,7 +599,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;
@@ -1288,9 +1296,8 @@ static int apic_get_intr_number(struct guest_info * core, void * private_data) {
 }
 
 
-int v3_apic_send_ipi(struct v3_vm_info * vm, struct vm_device * dev, 
-		     struct v3_gen_ipi * ipi) {
-    struct apic_dev_state * apic_dev = (struct apic_dev_state *)(dev->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 int_cmd_reg tmp_icr;
 
     // zero out all the fields
@@ -1309,9 +1316,8 @@ int v3_apic_send_ipi(struct v3_vm_info * vm, struct vm_device * dev,
 }
 
 
-int v3_apic_raise_intr(struct v3_vm_info * vm, struct vm_device * dev, 
-		       uint32_t irq, uint32_t dst) {
-    struct apic_dev_state * apic_dev = (struct apic_dev_state *)(dev->private_data);
+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_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 +1325,11 @@ int v3_apic_raise_intr(struct v3_vm_info * vm, struct vm_device * dev,
     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,23 +1472,35 @@ static struct v3_timer_ops timer_ops = {
 
 
 
-static int apic_free(struct vm_device * dev) {
+static int apic_free(struct apic_dev_state * apic_dev) {
+    int i = 0;
+    struct v3_vm_info * vm = NULL;
 
-    /* TODO: This should crosscall to force an unhook on each CPU */
+    for (i = 0; i < apic_dev->num_apics; i++) {
+	struct apic_state * apic = &(apic_dev->apics[i]);
+	struct guest_info * core = apic->core;
+	
+	vm = core->vm_info;
 
-    //   struct apic_state * apic = (struct apic_state *)dev->private_data;
+	v3_remove_intr_controller(core, apic->controller_handle);
 
-    v3_unhook_msr(dev->vm, BASE_ADDR_MSR);
+	if (apic->timer) {
+	    v3_remove_timer(core, apic->timer);
+	}
 
+	// unhook memory
+
+    }
+
+    v3_unhook_msr(vm, BASE_ADDR_MSR);
+
+    V3_Free(apic_dev);
     return 0;
 }
 
 
 static struct v3_device_ops dev_ops = {
-    .free = apic_free,
-    .reset = NULL,
-    .start = NULL,
-    .stop = NULL,
+    .free = (int (*)(void *))apic_free,
 };
 
 
@@ -1497,10 +1519,11 @@ static int apic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     apic_dev->num_apics = vm->num_cores;
 
-    struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, apic_dev);
+    struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, apic_dev);
 
-    if (v3_attach_device(vm, dev) == -1) {
+    if (dev == NULL) {
 	PrintError("apic: Could not attach device %s\n", dev_id);
+	V3_Free(apic_dev);
 	return -1;
     }
 
@@ -1513,9 +1536,15 @@ 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);
 
-    	v3_add_timer(core, &timer_ops, apic_dev);
+    	apic->timer = v3_add_timer(core, &timer_ops, apic_dev);
+
+	if (apic->timer == NULL) {
+	    PrintError("APIC: Failed to attach timer to core %d\n", i);
+	    v3_remove_device(dev);
+	    return -1;
+	}
 
 	v3_hook_full_mem(vm, core->cpu_id, apic->base_addr, apic->base_addr + PAGE_SIZE_4KB, apic_read, apic_write, apic_dev);