X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fapic.c;h=ccb89e3e82113225f8f774604982713d72cd3b3d;hp=407d3af4a15407cdd54ea372a1a29162aa32562e;hb=123a1ba27ea09c8fa77a1b36ce625b43d7c48b14;hpb=0e6a3e3539a88b57bf06dea3864cd6fe5078643d

diff --git a/palacios/src/devices/apic.c b/palacios/src/devices/apic.c
index 407d3af..ccb89e3 100644
--- a/palacios/src/devices/apic.c
+++ b/palacios/src/devices/apic.c
@@ -22,9 +22,9 @@
 #include <devices/apic_regs.h>
 #include <palacios/vmm.h>
 #include <palacios/vmm_msr.h>
+#include <palacios/vm_guest.h>
 
-
-#ifndef DEBUG_APIC
+#ifndef CONFIG_DEBUG_APIC
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -183,6 +183,8 @@ struct apic_state {
 
 };
 
+static int apic_read(addr_t guest_addr, void * dst, uint_t length, void * priv_data);
+static int apic_write(addr_t guest_addr, void * src, uint_t length, void * priv_data);
 
 static void init_apic_state(struct apic_state * apic) {
     apic->base_addr = DEFAULT_BASE_ADDR;
@@ -236,19 +238,32 @@ static void init_apic_state(struct apic_state * apic) {
 static int read_apic_msr(uint_t msr, v3_msr_t * dst, void * priv_data) {
     struct vm_device * dev = (struct vm_device *)priv_data;
     struct apic_state * apic = (struct apic_state *)dev->private_data;
-    PrintError("READING APIC BASE ADDR: HI=%x LO=%x\n", apic->base_addr_msr.hi, apic->base_addr_msr.lo);
-
-    return -1;
+    dst->value = apic->base_addr;
+    return 0;
 }
 
 
 static int write_apic_msr(uint_t msr, v3_msr_t src, void * priv_data) {
-    //  struct vm_device * dev = (struct vm_device *)priv_data;
-    //  struct apic_state * apic = (struct apic_state *)dev->private_data;
+    struct vm_device * dev = (struct vm_device *)priv_data;
+    struct apic_state * apic = (struct apic_state *)dev->private_data;
+    struct v3_shadow_region * old_reg = v3_get_shadow_region(dev->vm, apic->base_addr);
 
-    PrintError("WRITING APIC BASE ADDR: HI=%x LO=%x\n", src.hi, src.lo);
+    if (old_reg == NULL) {
+	// uh oh...
+	PrintError("APIC Base address region does not exit...\n");
+	return -1;
+    }
+    
+    v3_delete_shadow_region(dev->vm, old_reg);
 
-    return -1;
+    apic->base_addr = src.value;
+
+    if (v3_hook_full_mem(dev->vm, apic->base_addr, apic->base_addr + PAGE_SIZE_4KB, apic_read, apic_write, dev) == -1) {
+	PrintError("Could not hook new APIC Base address\n");
+	return -1;
+    }
+
+    return 0;
 }
 
 
@@ -267,6 +282,10 @@ static int activate_apic_irq(struct apic_state * apic, uint32_t irq_num) {
 
     PrintDebug("Raising APIC IRQ %d\n", irq_num);
 
+    if (*req_location & flag) {
+	V3_Print("Interrupts coallescing\n");
+    }
+
     if (*en_location & flag) {
 	*req_location |= flag;
     } else {
@@ -290,8 +309,6 @@ static int get_highest_isr(struct apic_state * apic) {
 	    for (j = 7; j >= 0; j--) {
 		uchar_t flag = 0x1 << j;
 		if ((*svc_major) & flag) {
-
-
 		    return ((i * 8) + j);
 		}
 	    }
@@ -314,8 +331,6 @@ static int get_highest_irr(struct apic_state * apic) {
 	    for (j = 7; j >= 0; j--) {
 		uchar_t flag = 0x1 << j;
 		if ((*req_major) & flag) {
-
-
 		    return ((i * 8) + j);
 		}
 	    }
@@ -337,11 +352,11 @@ static int apic_do_eoi(struct apic_state * apic) {
 	uchar_t flag = 0x1 << minor_offset;
 	uchar_t * svc_location = apic->int_svc_reg + major_offset;
 	
-	PrintDebug("Received APIC EOI\n");
+	PrintDebug("Received APIC EOI for IRQ %d\n", isr_irq);
 	
 	*svc_location &= ~flag;
 
-#ifdef CRAY_XT
+#ifdef CONFIG_CRAY_XT
 	
 	if ((isr_irq == 238) || 
 	    (isr_irq == 239)) {
@@ -849,7 +864,7 @@ static int apic_write(addr_t guest_addr, void * src, uint_t length, void * priv_
 /* Interrupt Controller Functions */
 
 // returns 1 if an interrupt is pending, 0 otherwise
-static int apic_intr_pending(void * private_data) {
+static int apic_intr_pending(struct guest_info * info, void * private_data) {
     struct vm_device * dev = (struct vm_device *)private_data;
     struct apic_state * apic = (struct apic_state *)dev->private_data;
     int req_irq = get_highest_irr(apic);
@@ -863,7 +878,7 @@ static int apic_intr_pending(void * private_data) {
     return 0;
 }
 
-static int apic_get_intr_number(void * private_data) {
+static int apic_get_intr_number(struct guest_info * info, void * private_data) {
     struct vm_device * dev = (struct vm_device *)private_data;
     struct apic_state * apic = (struct apic_state *)dev->private_data;
     int req_irq = get_highest_irr(apic);
@@ -878,8 +893,8 @@ static int apic_get_intr_number(void * private_data) {
     return -1;
 }
 
-static int apic_raise_intr(void * private_data, int irq) {
-#ifdef CRAY_XT
+static int apic_raise_intr(struct guest_info * info, void * private_data, int irq) {
+#ifdef CONFIG_CRAY_XT
     // The Seastar is connected directly to the LAPIC via LINT0 on the ICC bus
 
     if (irq == 238) {
@@ -889,14 +904,15 @@ static int apic_raise_intr(void * private_data, int irq) {
 	return activate_apic_irq(apic, irq);
     }
 #endif
+
     return 0;
 }
 
-static int apic_lower_intr(void * private_data, int irq) {
+static int apic_lower_intr(struct guest_info * info, void * private_data, int irq) {
     return 0;
 }
 
-static int apic_begin_irq(void * private_data, int irq) {
+static int apic_begin_irq(struct guest_info * info, void * private_data, int irq) {
     struct vm_device * dev = (struct vm_device *)private_data;
     struct apic_state * apic = (struct apic_state *)dev->private_data;
     int major_offset = (irq & ~0x00000007) >> 3;
@@ -908,7 +924,7 @@ static int apic_begin_irq(void * private_data, int irq) {
     *svc_location |= flag;
     *req_location &= ~flag;
 
-#ifdef CRAY_XT
+#ifdef CONFIG_CRAY_XT
     if ((irq == 238) || (irq == 239)) {
 	PrintError("APIC: Begin IRQ %d (ISR=%x), (IRR=%x)\n", irq, *svc_location, *req_location);
     }
@@ -919,9 +935,17 @@ static int apic_begin_irq(void * private_data, int irq) {
 
 
 
-int v3_apic_raise_intr(struct vm_device * apic_dev, int intr_num) {
+int v3_apic_raise_intr(struct guest_info * info, struct vm_device * apic_dev, int intr_num) {
     struct apic_state * apic = (struct apic_state *)apic_dev->private_data;
-    return activate_apic_irq(apic, intr_num);
+
+    if (activate_apic_irq(apic, intr_num) == -1) {
+	PrintError("Error: Could not activate apic_irq\n");
+	return -1;
+    } 
+
+    v3_interrupt_cpu(info, 0);
+
+    return 0;
 }
 
 
@@ -983,7 +1007,7 @@ static void apic_update_time(ullong_t cpu_cycles, ullong_t cpu_freq, void * priv
     }
 
     tmr_ticks = cpu_cycles >> shift_num;
-    PrintDebug("Timer Ticks: %p\n", (void *)tmr_ticks);
+    //    PrintDebug("Timer Ticks: %p\n", (void *)tmr_ticks);
 
     if (tmr_ticks < apic->tmr_cur_cnt) {
 	apic->tmr_cur_cnt -= tmr_ticks;
@@ -995,6 +1019,10 @@ static void apic_update_time(ullong_t cpu_cycles, ullong_t cpu_freq, void * priv
 	PrintDebug("Raising APIC Timer interrupt (periodic=%d) (icnt=%d) (div=%d)\n", 
 		   apic->tmr_vec_tbl.tmr_mode, apic->tmr_init_cnt, shift_num);
 
+	if (apic_intr_pending(dev->vm, priv_data)) {
+	    PrintDebug("Overriding pending IRQ %d\n", apic_get_intr_number(dev->vm, priv_data));
+	}
+
 	if (activate_internal_irq(apic, APIC_TMR_INT) == -1) {
 	    PrintError("Could not raise Timer interrupt\n");
 	}
@@ -1024,23 +1052,9 @@ static struct vm_timer_ops timer_ops = {
 };
 
 
-static int apic_init(struct vm_device * dev) {
-    struct guest_info * info = dev->vm;
-    struct apic_state * apic = (struct apic_state *)(dev->private_data);
-
-    v3_register_intr_controller(dev->vm, &intr_ops, dev);
-    v3_add_timer(dev->vm, &timer_ops, dev);
-
-    init_apic_state(apic);
 
-    v3_hook_msr(info, BASE_ADDR_MSR, read_apic_msr, write_apic_msr, dev);
 
-    v3_hook_full_mem(info, apic->base_addr, apic->base_addr + PAGE_SIZE_4KB, apic_read, apic_write, dev);
-
-    return 0;
-}
-
-static int apic_deinit(struct vm_device * dev) {
+static int apic_free(struct vm_device * dev) {
     struct guest_info * info = dev->vm;
 
     v3_unhook_msr(info, BASE_ADDR_MSR);
@@ -1049,21 +1063,40 @@ static int apic_deinit(struct vm_device * dev) {
 }
 
 
-static struct vm_device_ops dev_ops = {
-    .init = apic_init,
-    .deinit = apic_deinit,
+static struct v3_device_ops dev_ops = {
+    .free = apic_free,
     .reset = NULL,
     .start = NULL,
     .stop = NULL,
 };
 
 
-struct vm_device * v3_create_apic() {
+
+static int apic_init(struct guest_info * vm, v3_cfg_tree_t * cfg) {
     PrintDebug("Creating APIC\n");
+    char * name = v3_cfg_val(cfg, "name");
 
     struct apic_state * apic = (struct apic_state *)V3_Malloc(sizeof(struct apic_state));
 
-    struct vm_device * device = v3_create_device("APIC", &dev_ops, apic);
-  
-    return device;
+    struct vm_device * dev = v3_allocate_device(name, &dev_ops, apic);
+
+    if (v3_attach_device(vm, dev) == -1) {
+	PrintError("Could not attach device %s\n", name);
+	return -1;
+    }
+
+    v3_register_intr_controller(vm, &intr_ops, dev);
+    v3_add_timer(vm, &timer_ops, dev);
+
+    init_apic_state(apic);
+
+    v3_hook_msr(vm, BASE_ADDR_MSR, read_apic_msr, write_apic_msr, dev);
+
+    v3_hook_full_mem(vm, apic->base_addr, apic->base_addr + PAGE_SIZE_4KB, apic_read, apic_write, dev);
+
+    return 0;
 }
+
+
+
+device_register("LAPIC", apic_init)