X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8259a.c;h=7db595f2ad771f859a48f3fa615e4551dce264f4;hb=1da53ce8f6ab61d298d38cf3f1c4fcd9b1050ce8;hp=c674d7496775257f1f239d2efcae04f2191874f9;hpb=7c11601d0b92517069ef802f54a4c770cdcce423;p=palacios.git

diff --git a/palacios/src/devices/8259a.c b/palacios/src/devices/8259a.c
index c674d74..7db595f 100644
--- a/palacios/src/devices/8259a.c
+++ b/palacios/src/devices/8259a.c
@@ -129,11 +129,14 @@ static int pic_raise_intr(void * private_data, int irq, int error_code) {
     irq = 9;
   }
 
+  PrintDebug("Raising irq %d in the PIC\n", irq);
+
   if (irq <= 7) {
     state->master_irr |= 0x01 << irq;
   } else if ((irq > 7) && (irq < 16)) {
     state->slave_irr |= 0x01 << (irq - 7);
   } else {
+    PrintDebug("Invalid IRQ raised (%d)\n", irq);
     return -1;
   }
 
@@ -158,13 +161,17 @@ static int pic_get_intr_number(void * private_data) {
   for (i = 0; i < 16; i++) {
     if (i <= 7) {
       if (((state->master_irr & ~(state->master_imr)) >> i) == 0x01) {
-	state->master_isr |= (0x1 << i);
+	//state->master_isr |= (0x1 << i);
+	// reset the irr
+	//state->master_irr &= ~(0x1 << i);
+	PrintDebug("IRQ: %d, icw2: %x\n", i, state->master_icw2);
 	return i + state->master_icw2;
       }
     } else {
-      if (((state->slave_irr & ~(state->slave_imr)) >> i) == 0x01) {
-	state->slave_isr |= (0x1 << i);
-	return i + state->slave_icw2;
+      if (((state->slave_irr & ~(state->slave_imr)) >> (i - 8)) == 0x01) {
+	//state->slave_isr |= (0x1 << (i - 8));
+	//state->slave_irr &= ~(0x1 << (i - 8));
+	return (i - 8) + state->slave_icw2;
       }
     }
   }
@@ -173,7 +180,28 @@ static int pic_get_intr_number(void * private_data) {
 }
 
 
+/* The IRQ number is the number returned by pic_get_intr_number(), not the pin number */
 static int pic_begin_irq(void * private_data, int irq) {
+  struct pic_internal * state = (struct pic_internal*)private_data;
+
+  if ((irq >= state->master_icw2) && (irq <= state->master_icw2 + 7)) {
+    irq &= 0x7;
+  } else if ((irq >= state->slave_icw2) && (irq <= state->slave_icw2 + 7)) {
+    irq &= 0x7;
+    irq += 8;
+  } else {
+    return -1;
+  }
+
+  if (irq <= 7) {
+    if (((state->master_irr & ~(state->master_imr)) >> irq) == 0x01) {
+      state->master_isr |= (0x1 << irq);
+      state->master_irr &= ~(0x1 << irq);
+    }
+  } else {
+    state->slave_isr |= (0x1 << (irq - 8));
+    state->slave_irr &= ~(0x1 << (irq - 8));
+  }
 
   return 0;
 }
@@ -195,9 +223,6 @@ static struct intr_ctrl_ops intr_ops = {
 
 
 
-
-
-
 int read_master_port1(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) {
@@ -267,17 +292,27 @@ int write_master_port1(ushort_t port, void * src, uint_t length, struct vm_devic
   if (state->master_state == ICW1) {
     state->master_icw1 = cw;
     state->master_state = ICW2;
+
   } else if (state->master_state == READY) {
     if (IS_OCW2(cw)) {
       // handle the EOI here
       struct ocw2 * cw2 =  (struct ocw2*)&cw;
+
       
       if ((cw2->EOI) && (!cw2->R) && (cw2->SL)) {
 	// specific EOI;
 	state->master_isr &= ~(0x01 << cw2->level);
       } else if ((cw2->EOI) & (!cw2->R) && (!cw2->SL)) {
+	int i;
 	// Non-specific EOI
-	
+	PrintDebug("Pre ISR = %x\n", state->master_isr);
+	for (i = 0; i < 8; i++) {
+	  if (state->master_isr & (0x01 << i)) {
+	    state->master_isr &= ~(0x01 << i);
+	    break;
+	  }
+	}	
+       	PrintDebug("Post ISR = %x\n", state->master_isr);
       } else {
 	// error;
       }
@@ -306,6 +341,7 @@ int write_master_port2(ushort_t port, void * src, uint_t length, struct vm_devic
     if (state->master_state == ICW2) {
       struct icw1 * cw1 = (struct icw1 *)&(state->master_icw1);
 
+      PrintDebug("Setting ICW2 = %x\n", cw);
       state->master_icw2 = cw;
 
       if (cw1->sngl == 0) {
@@ -359,7 +395,16 @@ int write_slave_port1(ushort_t port, void * src, uint_t length, struct vm_device
 	// specific EOI;
 	state->slave_isr &= ~(0x01 << cw2->level);
       } else if ((cw2->EOI) & (!cw2->R) && (!cw2->SL)) {
-	// non specific EOI
+	int i;
+	// Non-specific EOI
+	PrintDebug("Pre ISR = %x\n", state->slave_isr);
+	for (i = 0; i < 8; i++) {
+	  if (state->slave_isr & (0x01 << i)) {
+	    state->slave_isr &= ~(0x01 << i);
+	    break;
+	  }
+	}	
+       	PrintDebug("Post ISR = %x\n", state->slave_isr);
       } else {
 	// error;
       }
@@ -493,7 +538,7 @@ static struct vm_device_ops dev_ops = {
 
 struct vm_device * create_pic() {
   struct pic_internal * state = NULL;
-  VMMMalloc(struct pic_internal *, state, sizeof(struct pic_internal));
+  V3_Malloc(struct pic_internal *, state, sizeof(struct pic_internal));
 
   struct vm_device *device = create_device("8259A", &dev_ops, state);