X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8259a.c;h=fb0ab432461bd82f49e24e762397846230a3d655;hb=639ddb8ebf0b5126a62431fb6a98e257806eebeb;hp=5edec8c82865a209d4fa380e205c0ac211cd01b6;hpb=19b2e4b4ce85ae4e683a3ede33360bdf7547b069;p=palacios.git

diff --git a/palacios/src/devices/8259a.c b/palacios/src/devices/8259a.c
index 5edec8c..fb0ab43 100644
--- a/palacios/src/devices/8259a.c
+++ b/palacios/src/devices/8259a.c
@@ -190,7 +190,7 @@ static void DumpPICState(struct pic_internal *p)
 }
 
 
-static int pic_raise_intr(struct guest_info * info, void * private_data, int irq) {
+static int pic_raise_intr(struct v3_vm_info * vm, void * private_data, int irq) {
     struct pic_internal * state = (struct pic_internal*)private_data;
 
     if (irq == 2) {
@@ -209,11 +209,13 @@ static int pic_raise_intr(struct guest_info * info, void * private_data, int irq
 	return -1;
     }
 
+    v3_interrupt_cpu(vm, 0, 0);
+
     return 0;
 }
 
 
-static int pic_lower_intr(struct guest_info * info, void * private_data, int irq) {
+static int pic_lower_intr(struct v3_vm_info * vm, void * private_data, int irq) {
     struct pic_internal * state = (struct pic_internal*)private_data;
 
     PrintDebug("[pic_lower_intr] IRQ line %d now low\n", irq);
@@ -256,7 +258,7 @@ static int pic_get_intr_number(struct guest_info * info, void * private_data) {
 
     for (i = 0; i < 16; i++) {
 	if (i <= 7) {
-	    if (((state->master_irr & ~(state->master_imr)) >> i) == 0x01) {
+	    if (((state->master_irr & ~(state->master_imr)) >> i) & 0x01) {
 		//state->master_isr |= (0x1 << i);
 		// reset the irr
 		//state->master_irr &= ~(0x1 << i);
@@ -265,11 +267,11 @@ static int pic_get_intr_number(struct guest_info * info, void * private_data) {
 		break;
 	    }
 	} else {
-	    if (((state->slave_irr & ~(state->slave_imr)) >> (i - 8)) == 0x01) {
+	    if (((state->slave_irr & ~(state->slave_imr)) >> (i - 8)) & 0x01) {
 		//state->slave_isr |= (0x1 << (i - 8));
 		//state->slave_irr &= ~(0x1 << (i - 8));
 		PrintDebug("8259 PIC: IRQ: %d, slave_icw2: %x\n", i, state->slave_icw2);
-		irq=  (i - 8) + state->slave_icw2;
+		irq = (i - 8) + state->slave_icw2;
 		break;
 	    }
 	}
@@ -303,7 +305,8 @@ static int pic_begin_irq(struct guest_info * info, void * private_data, int irq)
     }
     
     if (irq <= 7) {
-       if (((state->master_irr & ~(state->master_imr)) >> irq) == 0x01) {
+	// This should always be true: See pic_get_intr_number
+       if (((state->master_irr & ~(state->master_imr)) >> irq) & 0x01) {
            state->master_isr |= (0x1 << irq);
 
            if (!(state->master_elcr & (0x1 << irq))) {
@@ -311,10 +314,13 @@ static int pic_begin_irq(struct guest_info * info, void * private_data, int irq)
            }
        }
     } else {
-       state->slave_isr |= (0x1 << (irq - 8));
-
-       if (!(state->slave_elcr & (0x1 << irq))) {
-           state->slave_irr &= ~(0x1 << (irq - 8));
+	// This should always be true: See pic_get_intr_number
+	if (((state->slave_irr & ~(state->slave_imr)) >> (irq - 8)) & 0x01) {
+	   state->slave_isr |= (0x1 << (irq - 8));
+	   
+	   if (!(state->slave_elcr & (0x1 << (irq - 8)))) {
+	       state->slave_irr &= ~(0x1 << (irq - 8));
+	   }
        }
     }
 
@@ -333,16 +339,16 @@ static int pic_begin_irq(struct guest_info * info, void * private_data, int irq)
 static struct intr_ctrl_ops intr_ops = {
     .intr_pending = pic_intr_pending,
     .get_intr_number = pic_get_intr_number,
-    .raise_intr = pic_raise_intr,
-    .begin_irq = pic_begin_irq,
-    .lower_intr = pic_lower_intr, 
-
+    .begin_irq = pic_begin_irq
 };
 
+static struct intr_router_ops router_ops = {
+    .raise_intr = pic_raise_intr,
+    .lower_intr = pic_lower_intr
+};
 
 
-
-static int read_master_port1(ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
+static int read_master_port1(struct guest_info * core, ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
     struct pic_internal * state = (struct pic_internal*)dev->private_data;
 
     if (length != 1) {
@@ -361,7 +367,7 @@ static int read_master_port1(ushort_t port, void * dst, uint_t length, struct vm
     return 1;
 }
 
-static int read_master_port2(ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
+static int read_master_port2(struct guest_info * core, ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
     struct pic_internal * state = (struct pic_internal*)dev->private_data;
 
     if (length != 1) {
@@ -375,7 +381,7 @@ static int read_master_port2(ushort_t port, void * dst, uint_t length, struct vm
   
 }
 
-static int read_slave_port1(ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
+static int read_slave_port1(struct guest_info * core, ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
     struct pic_internal * state = (struct pic_internal*)dev->private_data;
 
     if (length != 1) {
@@ -394,7 +400,7 @@ static int read_slave_port1(ushort_t port, void * dst, uint_t length, struct vm_
     return 1;
 }
 
-static int read_slave_port2(ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
+static int read_slave_port2(struct guest_info * core, ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
     struct pic_internal * state = (struct pic_internal*)dev->private_data;
 
     if (length != 1) {
@@ -408,7 +414,7 @@ static int read_slave_port2(ushort_t port, void * dst, uint_t length, struct vm_
 }
 
 
-static int write_master_port1(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
+static int write_master_port1(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev) {
     struct pic_internal * state = (struct pic_internal*)dev->private_data;
     uchar_t cw = *(uchar_t *)src;
 
@@ -419,6 +425,8 @@ static int write_master_port1(ushort_t port, void * src, uint_t length, struct v
         return -1;
     }
 
+    v3_clear_pending_intr(core);
+
     if (IS_ICW1(cw)) {
 
         PrintDebug("8259 PIC: Setting ICW1 = %x (wr_Master1)\n", cw);
@@ -470,7 +478,7 @@ static int write_master_port1(ushort_t port, void * src, uint_t length, struct v
     return 1;
 }
 
-static int write_master_port2(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
+static int write_master_port2(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev) {
     struct pic_internal * state = (struct pic_internal*)dev->private_data;
     uchar_t cw = *(uchar_t *)src;    
 
@@ -481,12 +489,16 @@ static int write_master_port2(ushort_t port, void * src, uint_t length, struct v
         return -1;
     }
 
+    v3_clear_pending_intr(core);
+
     if (state->master_state == ICW2) {
         struct icw1 * cw1 = (struct icw1 *)&(state->master_icw1);
 
         PrintDebug("8259 PIC: Setting ICW2 = %x (wr_Master2)\n", cw);
         state->master_icw2 = cw;
 
+
+
         if (cw1->sngl == 0) {
             state->master_state = ICW3;
         } else if (cw1->ic4 == 1) {
@@ -495,6 +507,8 @@ static int write_master_port2(ushort_t port, void * src, uint_t length, struct v
             state->master_state = READY;
         }
 
+
+
     } else if (state->master_state == ICW3) {
         struct icw1 * cw1 = (struct icw1 *)&(state->master_icw1);
 
@@ -525,7 +539,7 @@ static int write_master_port2(ushort_t port, void * src, uint_t length, struct v
     return 1;
 }
 
-static int write_slave_port1(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
+static int write_slave_port1(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev) {
     struct pic_internal * state = (struct pic_internal*)dev->private_data;
     uchar_t cw = *(uchar_t *)src;
 
@@ -537,6 +551,8 @@ static int write_slave_port1(ushort_t port, void * src, uint_t length, struct vm
 	return -1;
     }
 
+    v3_clear_pending_intr(core);
+
     if (IS_ICW1(cw)) {
 	PrintDebug("8259 PIC: Setting ICW1 = %x (wr_Slave1)\n", cw);
 	state->slave_icw1 = cw;
@@ -584,7 +600,7 @@ static int write_slave_port1(ushort_t port, void * src, uint_t length, struct vm
     return 1;
 }
 
-static int write_slave_port2(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
+static int write_slave_port2(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev) {
     struct pic_internal * state = (struct pic_internal*)dev->private_data;
     uchar_t cw = *(uchar_t *)src;    
 
@@ -595,6 +611,9 @@ static int write_slave_port2(ushort_t port, void * src, uint_t length, struct vm
         return -1;
     }
 
+    v3_clear_pending_intr(core);
+
+
     if (state->slave_state == ICW2) {
         struct icw1 * cw1 =  (struct icw1 *)&(state->master_icw1);
 
@@ -641,7 +660,7 @@ static int write_slave_port2(ushort_t port, void * src, uint_t length, struct vm
 
 
 
-static int read_elcr_port(ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
+static int read_elcr_port(struct guest_info * core, ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
     struct pic_internal * state = (struct pic_internal*)dev->private_data;
     
     if (length != 1) {
@@ -663,7 +682,7 @@ static int read_elcr_port(ushort_t port, void * dst, uint_t length, struct vm_de
 }
 
 
-static int write_elcr_port(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
+static int write_elcr_port(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev) {
     struct pic_internal * state = (struct pic_internal*)dev->private_data;
     
     if (length != 1) {
@@ -713,20 +732,29 @@ static struct v3_device_ops dev_ops = {
 
 
 
-static int pic_init(struct guest_info * vm, void * cfg_data) {
+#include <palacios/vm_guest.h>
+
+static int pic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     struct pic_internal * state = NULL;
     state = (struct pic_internal *)V3_Malloc(sizeof(struct pic_internal));
+    char * name = v3_cfg_val(cfg, "name");
+
+    // PIC is only usable in non-multicore environments
+    // just hardcode the core context
+    struct guest_info * core = &(vm->cores[0]);
+
     V3_ASSERT(state != NULL);
 
-    struct vm_device * dev = v3_allocate_device("8259A", &dev_ops, state);
+    struct vm_device * dev = v3_allocate_device(name, &dev_ops, state);
 
     if (v3_attach_device(vm, dev) == -1) {
-	PrintError("Could not attach device %s\n", "8259A");
+	PrintError("Could not attach device %s\n", name);
 	return -1;
     }
 
 
-    v3_register_intr_controller(vm, &intr_ops, state);
+    v3_register_intr_controller(core, &intr_ops, state);
+    v3_register_intr_router(vm, &router_ops, state);
 
     state->master_irr = 0;
     state->master_isr = 0;