X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fio_apic.c;h=35187af42b8706ce83aa02d51436ac1c3626d4d7;hb=bc5ee3e07affac4810227d61c407011c05298518;hp=fc6fdb96dbbb62c9fc692b5103c2d858168c4074;hpb=d2d752b3690d4f8ce114864724a69d0282279d58;p=palacios.git

diff --git a/palacios/src/devices/io_apic.c b/palacios/src/devices/io_apic.c
index fc6fdb9..35187af 100644
--- a/palacios/src/devices/io_apic.c
+++ b/palacios/src/devices/io_apic.c
@@ -20,8 +20,7 @@
 
 #include <palacios/vmm.h>
 #include <palacios/vmm_dev_mgr.h>
-#include <devices/icc_bus.h>
-#include <devices/apic_regs.h>
+#include <devices/apic.h>
 #include <palacios/vm_guest.h>
 
 #ifndef CONFIG_DEBUG_IO_APIC
@@ -136,7 +135,7 @@ struct io_apic_state {
   
     struct redir_tbl_entry redir_tbl[24];
 
-    struct vm_device * icc_bus;
+    struct vm_device * apic_dev;
   
 };
 
@@ -246,7 +245,7 @@ static int ioapic_write(struct guest_info * core, addr_t guest_addr, void * src,
 			return -1;
 		    }
 		    if (hi_val) {
-			PrintDebug("ioapic %u: Writing to hi of pin %d\n", ioapic->ioapic_id.val, redir_index);
+			PrintDebug("ioapic %u: Writing to hi of pin %d\n", ioapic->ioapic_id.id, redir_index);
 			ioapic->redir_tbl[redir_index].hi = op_val;
 		    } else {
 			PrintDebug("ioapic %u: Writing to lo of pin %d\n", ioapic->ioapic_id.id, redir_index);
@@ -275,27 +274,24 @@ static int ioapic_raise_irq(struct v3_vm_info * vm, void * private_data, int irq
     irq_entry = &(ioapic->redir_tbl[irq]);
 
     if (irq_entry->mask == 0) {
+	struct v3_gen_ipi ipi;
 
-	PrintDebug("ioapic %u: IOAPIC Signalling APIC to raise INTR %d\n", ioapic->ioapic_id.id, irq_entry->vec);
-
-
-	// the format of the redirection table entry is just slightly 
-	// different than that of the lapic's cmd register, which is the other
-	// way an IPI is initiated.   So we will translate
-	//
-	struct int_cmd_reg icr;
-	
-	icr.val = irq_entry->val;
-	icr.rsvd1=0;
-	icr.lvl=1;
-	icr.trig_mode=irq_entry->trig_mode;
-	icr.rem_rd_status=0;
-	icr.dst_shorthand=0; // no shorthand
-	icr.rsvd2=0;
-
-	PrintDebug("io apic %u: raising irq %u on ICC bus.\n",
-		   ioapic->ioapic_id.id, irq);
-	v3_icc_send_ipi(ioapic->icc_bus, ioapic->ioapic_id.id,icr.val, irq);
+	PrintDebug("ioapic %u: IOAPIC Signalling APIC to raise INTR %d\n", 
+		   ioapic->ioapic_id.id, irq_entry->vec);
+
+
+	ipi.vector = irq_entry->vec;
+	ipi.mode = irq_entry->del_mode;
+	ipi.logical = irq_entry->dst_mode;
+	ipi.trigger_mode = irq_entry->trig_mode;
+	ipi.dst = irq_entry->dst_field;
+	ipi.dst_shorthand = 0;
+
+	// Need to add destination argument here...
+	if (v3_apic_send_ipi(vm, ioapic->apic_dev, &ipi) == -1) {
+	    PrintError("Error sending IPI to apic %d\n", ipi.dst);
+	    return -1;
+	}
     }
 
     return 0;
@@ -331,19 +327,15 @@ static struct v3_device_ops dev_ops = {
 
 
 static int ioapic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
-    struct vm_device * icc_bus = v3_find_dev(vm, v3_cfg_val(cfg, "bus"));
+    struct vm_device * apic_dev = v3_find_dev(vm, v3_cfg_val(cfg, "apic"));
     char * dev_id = v3_cfg_val(cfg, "ID");
 
-    if (!icc_bus) {
-	PrintError("ioapic: Could not locate ICC BUS device (%s)\n", v3_cfg_val(cfg, "bus"));
-	return -1;
-    }
 
     PrintDebug("ioapic: Creating IO APIC\n");
 
     struct io_apic_state * ioapic = (struct io_apic_state *)V3_Malloc(sizeof(struct io_apic_state));
 
-    ioapic->icc_bus = icc_bus;
+    ioapic->apic_dev = apic_dev;
 
     struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, ioapic);
 
@@ -358,8 +350,6 @@ static int ioapic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     init_ioapic_state(ioapic,vm->num_cores);
 
-    v3_icc_register_ioapic(vm,icc_bus,ioapic->ioapic_id.id);
-
     v3_hook_full_mem(vm, V3_MEM_CORE_ANY, ioapic->base_addr, ioapic->base_addr + PAGE_SIZE_4KB, 
 		     ioapic_read, ioapic_write, dev);