X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8259a.c;h=248fbb032dfff784c765d53dec2e484cf5b334a7;hb=eb5eb0f70b84003972a96060c76bd7efad340be4;hp=e7d59befb9d62a0d625c7e5e867943c05bee301a;hpb=3e5e5a12e64630d7a37ed32b8d7e2d993c79f7e0;p=palacios.git

diff --git a/palacios/src/devices/8259a.c b/palacios/src/devices/8259a.c
index e7d59be..248fbb0 100644
--- a/palacios/src/devices/8259a.c
+++ b/palacios/src/devices/8259a.c
@@ -209,7 +209,7 @@ static int pic_raise_intr(struct v3_vm_info * vm, void * private_data, int irq)
 	return -1;
     }
 
-    v3_interrupt_cpu(vm, 0);
+    v3_interrupt_cpu(vm, 0, 0);
 
     return 0;
 }
@@ -258,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);
@@ -267,23 +267,26 @@ 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;
 	    }
 	}
     }
 
+#if 1
     if ((i == 15) || (i == 6)) { 
 	DumpPICState(state);
     }
+#endif
   
     if (i == 16) { 
 	return -1;
     } else {
+	PrintDebug("8259 PIC: get num is returning %d\n",irq);
 	return irq;
     }
 }
@@ -305,19 +308,29 @@ 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))) {
                state->master_irr &= ~(0x1 << irq);
            }
+       } else {
+	   PrintDebug("8259 PIC: (master) Ignoring begin_irq for %d since I don't own it\n",irq);
        }
+
     } else {
-       state->slave_isr |= (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));
+	   }
+	} else {
+	   PrintDebug("8259 PIC: (slave) Ignoring begin_irq for %d since I don't own it\n",irq);
+	}
 
-       if (!(state->slave_elcr & (0x1 << irq))) {
-           state->slave_irr &= ~(0x1 << (irq - 8));
-       }
     }
 
     return 0;
@@ -344,8 +357,8 @@ static struct intr_router_ops router_ops = {
 };
 
 
-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;
+static int read_master_port1(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) {
+    struct pic_internal * state = (struct pic_internal *)priv_data;
 
     if (length != 1) {
 	PrintError("8259 PIC: Invalid Read length (rd_Master1)\n");
@@ -363,8 +376,8 @@ static int read_master_port1(struct guest_info * core, ushort_t port, void * dst
     return 1;
 }
 
-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;
+static int read_master_port2(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) {
+    struct pic_internal * state = (struct pic_internal *)priv_data;
 
     if (length != 1) {
 	PrintError("8259 PIC: Invalid Read length (rd_Master2)\n");
@@ -377,8 +390,8 @@ static int read_master_port2(struct guest_info * core, ushort_t port, void * dst
   
 }
 
-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;
+static int read_slave_port1(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) {
+    struct pic_internal * state = (struct pic_internal *)priv_data;
 
     if (length != 1) {
 	PrintError("8259 PIC: Invalid Read length (rd_Slave1)\n");
@@ -396,8 +409,8 @@ static int read_slave_port1(struct guest_info * core, ushort_t port, void * dst,
     return 1;
 }
 
-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;
+static int read_slave_port2(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) {
+    struct pic_internal * state = (struct pic_internal *)priv_data;
 
     if (length != 1) {
 	PrintError("8259 PIC: Invalid Read length  (rd_Slave2)\n");
@@ -410,8 +423,8 @@ static int read_slave_port2(struct guest_info * core, ushort_t port, void * dst,
 }
 
 
-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;
+static int write_master_port1(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
+    struct pic_internal * state = (struct pic_internal *)priv_data;
     uchar_t cw = *(uchar_t *)src;
 
     PrintDebug("8259 PIC: Write master port 1 with 0x%x\n",cw);
@@ -421,6 +434,8 @@ static int write_master_port1(struct guest_info * core, ushort_t port, void * sr
         return -1;
     }
 
+    v3_clear_pending_intr(core);
+
     if (IS_ICW1(cw)) {
 
         PrintDebug("8259 PIC: Setting ICW1 = %x (wr_Master1)\n", cw);
@@ -449,7 +464,11 @@ static int write_master_port1(struct guest_info * core, ushort_t port, void * sr
                     }
                 }	
                 PrintDebug("8259 PIC: Post ISR = %x (wr_Master1)\n", state->master_isr);
-            } else {
+            } else if (!(cw2->EOI) && (cw2->R) && (cw2->SL)) {
+                PrintDebug("8259 PIC: Ignoring set-priority, priorities not implemented (level=%d, wr_Master1)\n", cw2->level);
+            } else if (!(cw2->EOI) && !(cw2->R) && (cw2->SL)) {
+                PrintDebug("8259 PIC: Ignoring no-op (level=%d, wr_Master1)\n", cw2->level);
+	    } else {
                 PrintError("8259 PIC: Command not handled, or in error (wr_Master1)\n");
                 return -1;
             }
@@ -472,8 +491,8 @@ static int write_master_port1(struct guest_info * core, ushort_t port, void * sr
     return 1;
 }
 
-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;
+static int write_master_port2(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
+    struct pic_internal * state = (struct pic_internal *)priv_data;
     uchar_t cw = *(uchar_t *)src;    
 
     PrintDebug("8259 PIC: Write master port 2 with 0x%x\n",cw);
@@ -483,12 +502,16 @@ static int write_master_port2(struct guest_info * core, ushort_t port, void * sr
         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) {
@@ -497,6 +520,8 @@ static int write_master_port2(struct guest_info * core, ushort_t port, void * sr
             state->master_state = READY;
         }
 
+
+
     } else if (state->master_state == ICW3) {
         struct icw1 * cw1 = (struct icw1 *)&(state->master_icw1);
 
@@ -527,8 +552,8 @@ static int write_master_port2(struct guest_info * core, ushort_t port, void * sr
     return 1;
 }
 
-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;
+static int write_slave_port1(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
+    struct pic_internal * state = (struct pic_internal *)priv_data;
     uchar_t cw = *(uchar_t *)src;
 
     PrintDebug("8259 PIC: Write slave port 1 with 0x%x\n",cw);
@@ -539,6 +564,8 @@ static int write_slave_port1(struct guest_info * core, ushort_t port, void * src
 	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;
@@ -586,8 +613,8 @@ static int write_slave_port1(struct guest_info * core, ushort_t port, void * src
     return 1;
 }
 
-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;
+static int write_slave_port2(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
+    struct pic_internal * state = (struct pic_internal *)priv_data;
     uchar_t cw = *(uchar_t *)src;    
 
     PrintDebug("8259 PIC: Write slave port 2 with 0x%x\n",cw);
@@ -597,6 +624,9 @@ static int write_slave_port2(struct guest_info * core, ushort_t port, void * src
         return -1;
     }
 
+    v3_clear_pending_intr(core);
+
+
     if (state->slave_state == ICW2) {
         struct icw1 * cw1 =  (struct icw1 *)&(state->master_icw1);
 
@@ -643,8 +673,8 @@ static int write_slave_port2(struct guest_info * core, ushort_t port, void * src
 
 
 
-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;
+static int read_elcr_port(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) {
+    struct pic_internal * state = (struct pic_internal *)priv_data;
     
     if (length != 1) {
 	PrintError("ELCR read of invalid length %d\n", length);
@@ -665,8 +695,8 @@ static int read_elcr_port(struct guest_info * core, ushort_t port, void * dst, u
 }
 
 
-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;
+static int write_elcr_port(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
+    struct pic_internal * state = (struct pic_internal *)priv_data;
     
     if (length != 1) {
 	PrintError("ELCR read of invalid length %d\n", length);
@@ -692,10 +722,6 @@ static int write_elcr_port(struct guest_info * core, ushort_t port, void * src,
 
 
 static int pic_free(struct vm_device * dev) {
-    v3_dev_unhook_io(dev, MASTER_PORT1);
-    v3_dev_unhook_io(dev, MASTER_PORT2);
-    v3_dev_unhook_io(dev, SLAVE_PORT1);
-    v3_dev_unhook_io(dev, SLAVE_PORT2);
 
     return 0;
 }
@@ -708,9 +734,7 @@ static int pic_free(struct vm_device * dev) {
 
 static struct v3_device_ops dev_ops = {
     .free = pic_free,
-    .reset = NULL,
-    .start = NULL,
-    .stop = NULL,
+
 };
 
 
@@ -720,7 +744,7 @@ static struct v3_device_ops dev_ops = {
 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");
+    char * dev_id = v3_cfg_val(cfg, "ID");
 
     // PIC is only usable in non-multicore environments
     // just hardcode the core context
@@ -728,10 +752,10 @@ static int pic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     V3_ASSERT(state != NULL);
 
-    struct vm_device * dev = v3_allocate_device(name, &dev_ops, state);
+    struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, state);
 
     if (v3_attach_device(vm, dev) == -1) {
-	PrintError("Could not attach device %s\n", name);
+	PrintError("Could not attach device %s\n", dev_id);
 	return -1;
     }