X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fio_apic.c;h=506b7af745074fe40eb13d973f68c1e872e7bf06;hb=a02f23087d0ea3df6dbd494de90754b3302ee9a5;hp=e6a9f3aed0259a7ad802fcb15daa3f57e5f73bf8;hpb=65e038cb9940879f002209382eeafae6f58934b6;p=palacios.git

diff --git a/palacios/src/devices/io_apic.c b/palacios/src/devices/io_apic.c
index e6a9f3a..506b7af 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;
   
 };
 
@@ -157,8 +156,8 @@ static void init_ioapic_state(struct io_apic_state * ioapic, uint32_t id) {
     }
     
     // special case redir_tbl[0] for pin 0 as ExtInt for Virtual Wire Mode
-    ioapic->redir_tbl[0].del_mode=EXTINT;
-    ioapic->redir_tbl[0].mask=0;
+    // ioapic->redir_tbl[0].del_mode=EXTINT;
+    // ioapic->redir_tbl[0].mask=0;
 }
 
 
@@ -186,7 +185,7 @@ static int ioapic_read(struct guest_info * core, addr_t guest_addr, void * dst,
 		break;
 	    default: {
 		uint_t redir_index = (ioapic->index_reg - IOAPIC_REDIR_BASE_REG) >> 1;
-		uint_t hi_val = (ioapic->index_reg - IOAPIC_REDIR_BASE_REG) % 1;
+		uint_t hi_val = (ioapic->index_reg - IOAPIC_REDIR_BASE_REG) & 1;
 		
 		if (redir_index > 0x3f) {
 		    PrintError("ioapic %u: Invalid redirection table entry %x\n", ioapic->ioapic_id.id, (uint32_t)redir_index);
@@ -217,6 +216,7 @@ static int ioapic_write(struct guest_info * core, addr_t guest_addr, void * src,
     PrintDebug("ioapic %u: IOAPIC Write at %p (val = %d)\n",  ioapic->ioapic_id.id, (void *)guest_addr, *(uint32_t *)src);
 
     if (reg_tgt == 0x00) {
+	PrintDebug("ioapic %u: Setting ioapic index register to 0x%x.\n", ioapic->ioapic_id.id, op_val);
 	ioapic->index_reg = op_val;
     } else if (reg_tgt == 0x10) {
 	// IOWIN register
@@ -235,10 +235,10 @@ static int ioapic_write(struct guest_info * core, addr_t guest_addr, void * src,
 	    default:
 		{
 		    uint_t redir_index = (ioapic->index_reg - IOAPIC_REDIR_BASE_REG) >> 1;
-		    uint_t hi_val = (ioapic->index_reg - IOAPIC_REDIR_BASE_REG) % 1;
-
-
+		    uint_t hi_val = (ioapic->index_reg - IOAPIC_REDIR_BASE_REG) & 1;
 
+		    PrintDebug("ioapic %u: Writing value 0x%x to redirection entry %u (%s)\n",
+			       ioapic->ioapic_id.id, op_val, redir_index, hi_val ? "hi" : "low");
 
 		    if (redir_index > 0x3f) {
 			PrintError("ioapic %u: Invalid redirection table entry %x\n", ioapic->ioapic_id.id, (uint32_t)redir_index);
@@ -275,25 +275,19 @@ static int ioapic_raise_irq(struct v3_vm_info * vm, void * private_data, int irq
 
     if (irq_entry->mask == 0) {
 
-	PrintDebug("ioapic %u: IOAPIC Signalling APIC to raise INTR %d\n", ioapic->ioapic_id.id, irq_entry->vec);
-
+	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);
+	// May need these for future reference
+	//	icr.val = irq_entry->val;
+	//	icr.trig_mode = irq_entry->trig_mode;
+
+	PrintDebug("io apic: raising irq %u\n", irq);
+
+	// Need to add destination argument here...
+	v3_apic_raise_intr(vm, ioapic->apic_dev, irq, irq_entry->vec);
+
     }
 
     return 0;
@@ -329,19 +323,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);
 
@@ -356,8 +346,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);