From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Fri, 2 May 2008 20:33:38 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: working-cdboot-physical-but-not-qemu~4
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=4b013fe3750a387fc034352a7e4379f025dad7c2

*** empty log message ***
---

diff --git a/palacios/src/devices/8259a.c b/palacios/src/devices/8259a.c
index 52d84e9..31aa28a 100644
--- a/palacios/src/devices/8259a.c
+++ b/palacios/src/devices/8259a.c
@@ -162,12 +162,16 @@ static int pic_get_intr_number(void * private_data) {
     if (i <= 7) {
       if (((state->master_irr & ~(state->master_imr)) >> i) == 0x01) {
 	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;
       }
     }
   }
@@ -198,9 +202,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) {
@@ -270,17 +271,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;
       }
@@ -309,6 +320,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) {
@@ -362,7 +374,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;
       }
diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c
index e6beb43..bc7c727 100644
--- a/palacios/src/geekos/vm.c
+++ b/palacios/src/geekos/vm.c
@@ -315,6 +315,8 @@ int RunVMM(struct Boot_Info * bootInfo) {
       }
 
       hook_irq(&vm_info, 6);
+      hook_irq(&vm_info, 14);
+      hook_irq(&vm_info, 15);
 
       vm_info.rip = 0xfff0;
       vm_info.vm_regs.rsp = 0x0;
diff --git a/palacios/src/geekos/vmm_stubs.c b/palacios/src/geekos/vmm_stubs.c
index 25f300b..6a436b8 100644
--- a/palacios/src/geekos/vmm_stubs.c
+++ b/palacios/src/geekos/vmm_stubs.c
@@ -52,10 +52,9 @@ struct guest_info * irq_map[256];
 static void pic_intr_handler(struct Interrupt_State * state) {
   Begin_IRQ(state);
   struct guest_info * info =   irq_map[state->intNum - 32];
-  SerialPrint("Interrupt %d\n", state->intNum);
+  SerialPrint("Interrupt %d (IRQ=%d)\n", state->intNum, state->intNum - 32);
 
   if (info) {
-    SerialPrint("Calling handler(info=%x)->%x\n", info, info->vm_ops.raise_irq);
     info->vm_ops.raise_irq(info, state->intNum - 32, state->errorCode);
   } else {
     SerialPrint("Interrupt handler error: NULL pointer found, no action taken\n");
diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c
index 55b75fb..8277335 100644
--- a/palacios/src/palacios/svm_handler.c
+++ b/palacios/src/palacios/svm_handler.c
@@ -136,13 +136,10 @@ int handle_svm_exit(struct guest_info * info) {
 
   if (intr_pending(&(info->intr_state))) {
 
-    guest_ctrl->EVENTINJ.vector = get_intr_number(&(info->intr_state));
-    guest_ctrl->EVENTINJ.valid = 1;
-
-    PrintDebug("Injecting Interrupt %d\n", guest_ctrl->EVENTINJ.vector);
- 
     switch (get_intr_type(&(info->intr_state))) {
     case EXTERNAL_IRQ:
+      guest_ctrl->EVENTINJ.vector = get_intr_number(&(info->intr_state));
+      guest_ctrl->EVENTINJ.valid = 1;
       guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXTERNAL_INTR;
       break;
     case NMI:
@@ -165,6 +162,10 @@ int handle_svm_exit(struct guest_info * info) {
       return -1;
     }
 
+
+    PrintDebug("Injecting Interrupt %d\n", guest_ctrl->EVENTINJ.vector);
+ 
+
     // IMPORTANT TODO
     // We need to figure out stack parameters....
 
diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c
index 801e414..dd36143 100644
--- a/palacios/src/palacios/vmm_intr.c
+++ b/palacios/src/palacios/vmm_intr.c
@@ -68,7 +68,7 @@ uint_t get_intr_number(struct vm_intr * intr) {
   if (intr->excp_pending) {
     return intr->excp_num;
   } else if (intr->controller->intr_pending(intr->controller_state)) {
-    return intr->controller->get_intr_number(intr->controller_state) + 32;
+    return intr->controller->get_intr_number(intr->controller_state);
   }
 
   /* someway to get the [A]PIC intr */