Corrected delivery of PIT interrupts via the IOAPIC

[palacios.git] / palacios / src / devices / io_apic.c

diff --git a/palacios/src/devices/io_apic.c b/palacios/src/devices/io_apic.c
index 757e96e..0d7c3dc 100644 (file)
--- a/palacios/src/devices/io_apic.c
+++ b/palacios/src/devices/io_apic.c
@@ -23,7 +23,7 @@
 #include <devices/apic.h>
 #include <palacios/vm_guest.h>
 
-#ifndef CONFIG_DEBUG_IO_APIC
+#ifndef V3_CONFIG_DEBUG_IO_APIC
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -136,6 +136,10 @@ struct io_apic_state {
     struct redir_tbl_entry redir_tbl[24];
 
     void * apic_dev_data;
+
+    void * router_handle;
+
+    struct v3_vm_info * vm;
   
 };
 
@@ -263,6 +267,17 @@ static int ioapic_raise_irq(struct v3_vm_info * vm, void * private_data, int irq
     struct io_apic_state * ioapic = (struct io_apic_state *)(private_data);  
     struct redir_tbl_entry * irq_entry = NULL;
 
+    if (irq==0) { 
+      // IRQ 0 being raised, in the Palacios context, means the PIT
+      // However, the convention is that it is the PIC that is connected
+      // to PIN 0 of the IOAPIC and the PIT is connected to pin 2
+      // Hence we convert this to the relvant pin.  In the future,
+      // the PIC may signal to the IOAPIC in a different path.
+      // Yes, this is kind of hideous, but it is needed to have the
+      // PIT correctly show up via the IOAPIC
+      irq=2;
+    }
+
     if (irq > 24) {
        PrintDebug("ioapic %u: IRQ out of range of IO APIC\n", ioapic->ioapic_id.id);
        return -1;
@@ -273,7 +288,7 @@ static int ioapic_raise_irq(struct v3_vm_info * vm, void * private_data, int irq
     if (irq_entry->mask == 0) {
        struct v3_gen_ipi ipi;
 
-       PrintDebug("ioapic %u: IOAPIC Signalling APIC to raise INTR %d\n", 
+       PrintDebug("ioapic %u: IOAPIC Signaling APIC to raise INTR %d\n", 
                   ioapic->ioapic_id.id, irq_entry->vec);
 
 
@@ -284,6 +299,9 @@ static int ioapic_raise_irq(struct v3_vm_info * vm, void * private_data, int irq
        ipi.dst = irq_entry->dst_field;
        ipi.dst_shorthand = 0;
 
+
+       PrintDebug("ioapic %u: IPI: vector 0x%x, mode 0x%x, logical 0x%x, trigger 0x%x, dst 0x%x, shorthand 0x%x\n",
+                  ioapic->ioapic_id.id, ipi.vector, ipi.mode, ipi.logical, ipi.trigger_mode, ipi.dst, ipi.dst_shorthand);
        // Need to add destination argument here...
        if (v3_apic_send_ipi(vm, &ipi, ioapic->apic_dev_data) == -1) {
            PrintError("Error sending IPI to apic %d\n", ipi.dst);
@@ -307,16 +325,53 @@ static struct intr_router_ops router_ops = {
 
 
 
-static int io_apic_free(struct vm_device * dev) {
-    //  struct guest_info * info = dev->vm;
+static int io_apic_free(struct io_apic_state * ioapic) {
+
+    v3_remove_intr_router(ioapic->vm, ioapic->router_handle);
+
+    // unhook memory
+
+    V3_Free(ioapic);
 
     return 0;
 }
 
+#ifdef V3_CONFIG_CHECKPOINT
+static int io_apic_save(struct v3_chkpt_ctx * ctx, void * private_data) {
+    struct io_apic_state * io_apic = (struct io_apic_state *)private_data;
 
-static struct v3_device_ops dev_ops = {
-    .free = io_apic_free,
+    V3_CHKPT_STD_SAVE(ctx, io_apic->base_addr);
+    V3_CHKPT_STD_SAVE(ctx, io_apic->index_reg);
+    V3_CHKPT_STD_SAVE(ctx, io_apic->ioapic_id);
+    V3_CHKPT_STD_SAVE(ctx, io_apic->ioapic_ver);
+    V3_CHKPT_STD_SAVE(ctx, io_apic->ioapic_arb_id);
+    V3_CHKPT_STD_SAVE(ctx, io_apic->redir_tbl);
+
+    return 0;
+}
 
+static int io_apic_load(struct v3_chkpt_ctx * ctx, void * private_data) {
+    struct io_apic_state * io_apic = (struct io_apic_state *)private_data;
+
+    V3_CHKPT_STD_LOAD(ctx, io_apic->base_addr);
+    V3_CHKPT_STD_LOAD(ctx, io_apic->index_reg);
+    V3_CHKPT_STD_LOAD(ctx, io_apic->ioapic_id);
+    V3_CHKPT_STD_LOAD(ctx, io_apic->ioapic_ver);
+    V3_CHKPT_STD_LOAD(ctx, io_apic->ioapic_arb_id);
+    V3_CHKPT_STD_LOAD(ctx, io_apic->redir_tbl);
+
+    return 0;
+}
+#endif
+
+
+
+static struct v3_device_ops dev_ops = {
+    .free = (int (*)(void *))io_apic_free,
+#ifdef V3_CONFIG_CHECKPOINT
+    .save = io_apic_save, 
+    .load = io_apic_load
+#endif
 };
 
 
@@ -332,16 +387,16 @@ static int ioapic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     ioapic->apic_dev_data = apic_dev;
 
-    struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, ioapic);
-
+    struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, ioapic);
 
-    if (v3_attach_device(vm, dev) == -1) {
+    if (dev == NULL) {
        PrintError("ioapic: Could not attach device %s\n", dev_id);
+       V3_Free(ioapic);
        return -1;
     }
 
-
-    v3_register_intr_router(vm, &router_ops, ioapic);
+    ioapic->router_handle = v3_register_intr_router(vm, &router_ops, ioapic);
+    ioapic->vm = vm;
 
     init_ioapic_state(ioapic, vm->num_cores);