Palacios Public Git Repository

To checkout Palacios execute 

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute 
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.

projects / palacios.git / blobdiff
? search: re
summary | shortlog | log | commit | commitdiff | tree
raw
Fix interrupt injection bug due to caching irq vectors after vector mappings have...
[palacios.git] / palacios / src / devices / 8259a.c
diff --git a/palacios/src/devices/8259a.c b/palacios/src/devices/8259a.c
index 336c0d7..34851dd 100644 (file)
--- a/palacios/src/devices/8259a.c
+++ b/palacios/src/devices/8259a.c
@@ -24,7 +24,7 @@
 #include <palacios/vmm.h>
 #include <palacios/vmm_dev_mgr.h>
 
-#ifndef DEBUG_PIC
+#ifndef CONFIG_DEBUG_PIC
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -190,7 +190,7 @@ static void DumpPICState(struct pic_internal *p)
 }
 
 
-static int pic_raise_intr(void * private_data, int irq) {
+static int pic_raise_intr(struct guest_info * info, void * private_data, int irq) {
     struct pic_internal * state = (struct pic_internal*)private_data;
 
     if (irq == 2) {
@@ -209,13 +209,14 @@ static int pic_raise_intr(void * private_data, int irq) {
        return -1;
     }
 
+    v3_interrupt_cpu(info, 0);
+
     return 0;
 }
 
 
-static int pic_lower_intr(void *private_data, int irq) {
-
-    struct pic_internal *state = (struct pic_internal*)private_data;
+static int pic_lower_intr(struct guest_info * info, 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);
     if (irq <= 7) {
@@ -236,7 +237,7 @@ static int pic_lower_intr(void *private_data, int irq) {
 
 
 
-static int pic_intr_pending(void * private_data) {
+static int pic_intr_pending(struct guest_info * info, void * private_data) {
     struct pic_internal * state = (struct pic_internal*)private_data;
 
     if ((state->master_irr & ~(state->master_imr)) || 
@@ -247,7 +248,7 @@ static int pic_intr_pending(void * private_data) {
     return 0;
 }
 
-static int pic_get_intr_number(void * private_data) {
+static int pic_get_intr_number(struct guest_info * info, void * private_data) {
     struct pic_internal * state = (struct pic_internal *)private_data;
     int i = 0;
     int irq = -1;
@@ -290,33 +291,33 @@ 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) {
+static int pic_begin_irq(struct guest_info * info, 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;
+       irq &= 0x7;
     } else if ((irq >= state->slave_icw2) && (irq <= state->slave_icw2 + 7)) {
-       irq &= 0x7;
-       irq += 8;
+       irq &= 0x7;
+       irq += 8;
     } else {
-       //    PrintError("8259 PIC: Could not find IRQ (0x%x) to Begin\n",irq);
-       return -1;
+       //    PrintError("8259 PIC: Could not find IRQ (0x%x) to Begin\n",irq);
+       return -1;
     }
-
+    
     if (irq <= 7) {
-       if (((state->master_irr & ~(state->master_imr)) >> irq) == 0x01) {
-           state->master_isr |= (0x1 << irq);
+       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);
-           }
-       }
+           if (!(state->master_elcr & (0x1 << irq))) {
+               state->master_irr &= ~(0x1 << irq);
+           }
+       }
     } else {
-       state->slave_isr |= (0x1 << (irq - 8));
+       state->slave_isr |= (0x1 << (irq - 8));
 
-       if (!(state->slave_elcr & (0x1 << irq))) {
-           state->slave_irr &= ~(0x1 << (irq - 8));
-       }
+       if (!(state->slave_elcr & (0x1 << irq))) {
+           state->slave_irr &= ~(0x1 << (irq - 8));
+       }
     }
 
     return 0;
@@ -416,56 +417,58 @@ static int write_master_port1(ushort_t port, void * src, uint_t length, struct v
     PrintDebug("8259 PIC: Write master port 1 with 0x%x\n",cw);
 
     if (length != 1) {
-       PrintError("8259 PIC: Invalid Write length (wr_Master1)\n");
-       return -1;
+        PrintError("8259 PIC: Invalid Write length (wr_Master1)\n");
+        return -1;
     }
-  
-    if (IS_ICW1(cw)) {
 
-       PrintDebug("8259 PIC: Setting ICW1 = %x (wr_Master1)\n", cw);
-    
-       state->master_icw1 = cw;
-       state->master_state = ICW2;
+    v3_clear_pending_intr(dev->vm);
 
-    } else if (state->master_state == READY) {
-       if (IS_OCW2(cw)) {
-           // handle the EOI here
-           struct ocw2 * cw2 =  (struct ocw2*)&cw;
+    if (IS_ICW1(cw)) {
 
-           PrintDebug("8259 PIC: Handling OCW2 = %x (wr_Master1)\n", 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("8259 PIC: Pre ISR = %x (wr_Master1)\n", state->master_isr);
-               for (i = 0; i < 8; i++) {
-                   if (state->master_isr & (0x01 << i)) {
-                       state->master_isr &= ~(0x01 << i);
-                       break;
-                   }
-               }       
-               PrintDebug("8259 PIC: Post ISR = %x (wr_Master1)\n", state->master_isr);
-           } else {
-               PrintError("8259 PIC: Command not handled, or in error (wr_Master1)\n");
-               return -1;
-           }
+        PrintDebug("8259 PIC: Setting ICW1 = %x (wr_Master1)\n", cw);
 
-           state->master_ocw2 = cw;
-       } else if (IS_OCW3(cw)) {
-           PrintDebug("8259 PIC: Handling OCW3 = %x (wr_Master1)\n", cw);
-           state->master_ocw3 = cw;
-       } else {
-           PrintError("8259 PIC: Invalid OCW to PIC (wr_Master1)\n");
-           PrintError("8259 PIC: CW=%x\n", cw);
-           return -1;
-       }
+        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;
+
+            PrintDebug("8259 PIC: Handling OCW2 = %x (wr_Master1)\n", 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("8259 PIC: Pre ISR = %x (wr_Master1)\n", state->master_isr);
+                for (i = 0; i < 8; i++) {
+                    if (state->master_isr & (0x01 << i)) {
+                        state->master_isr &= ~(0x01 << i);
+                        break;
+                    }
+                }      
+                PrintDebug("8259 PIC: Post ISR = %x (wr_Master1)\n", state->master_isr);
+            } else {
+                PrintError("8259 PIC: Command not handled, or in error (wr_Master1)\n");
+                return -1;
+            }
+
+            state->master_ocw2 = cw;
+        } else if (IS_OCW3(cw)) {
+            PrintDebug("8259 PIC: Handling OCW3 = %x (wr_Master1)\n", cw);
+            state->master_ocw3 = cw;
+        } else {
+            PrintError("8259 PIC: Invalid OCW to PIC (wr_Master1)\n");
+            PrintError("8259 PIC: CW=%x\n", cw);
+            return -1;
+        }
     } else {
-       PrintError("8259 PIC: Invalid PIC State (wr_Master1)\n");
-       PrintError("8259 PIC: CW=%x\n", cw);
-       return -1;
+        PrintError("8259 PIC: Invalid PIC State (wr_Master1)\n");
+        PrintError("8259 PIC: CW=%x\n", cw);
+        return -1;
     }
 
     return 1;
@@ -476,50 +479,57 @@ static int write_master_port2(ushort_t port, void * src, uint_t length, struct v
     uchar_t cw = *(uchar_t *)src;    
 
     PrintDebug("8259 PIC: Write master port 2 with 0x%x\n",cw);
-  
+
     if (length != 1) {
-       PrintError("8259 PIC: Invalid Write length (wr_Master2)\n");
-       return -1;
+        PrintError("8259 PIC: Invalid Write length (wr_Master2)\n");
+        return -1;
     }
-    
+
+    v3_clear_pending_intr(dev->vm);
+
     if (state->master_state == ICW2) {
-       struct icw1 * cw1 = (struct icw1 *)&(state->master_icw1);
+        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) {
+            state->master_state = ICW4;
+        } else {
+            state->master_state = READY;
+        }
 
-       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) {
-           state->master_state = ICW4;
-       } else {
-           state->master_state = READY;
-       }
 
     } else if (state->master_state == ICW3) {
-       struct icw1 * cw1 = (struct icw1 *)&(state->master_icw1);
+        struct icw1 * cw1 = (struct icw1 *)&(state->master_icw1);
 
-       PrintDebug("8259 PIC: Setting ICW3 = %x (wr_Master2)\n", cw);
+        PrintDebug("8259 PIC: Setting ICW3 = %x (wr_Master2)\n", cw);
 
-       state->master_icw3 = cw;
+        state->master_icw3 = cw;
 
-       if (cw1->ic4 == 1) {
-           state->master_state = ICW4;
-       } else {
-           state->master_state = READY;
-       }
+        if (cw1->ic4 == 1) {
+            state->master_state = ICW4;
+        } else {
+            state->master_state = READY;
+        }
 
     } else if (state->master_state == ICW4) {
-       PrintDebug("8259 PIC: Setting ICW4 = %x (wr_Master2)\n", cw);
-       state->master_icw4 = cw;
-       state->master_state = READY;
-    } else if (state->master_state == READY) {
-       PrintDebug("8259 PIC: Setting IMR = %x (wr_Master2)\n", cw);
-       state->master_imr = cw;
+        PrintDebug("8259 PIC: Setting ICW4 = %x (wr_Master2)\n", cw);
+        state->master_icw4 = cw;
+        state->master_state = READY;
+    } else if ((state->master_state == ICW1) || (state->master_state == READY)) {
+        PrintDebug("8259 PIC: Setting IMR = %x (wr_Master2)\n", cw);
+        state->master_imr = cw;
     } else {
-       // error
-       PrintError("8259 PIC: Invalid master PIC State (wr_Master2)\n");
-       return -1;
+        // error
+        PrintError("8259 PIC: Invalid master PIC State (wr_Master2) (state=%d)\n", 
+                state->master_state);
+        return -1;
     }
 
     return 1;
@@ -537,6 +547,8 @@ static int write_slave_port1(ushort_t port, void * src, uint_t length, struct vm
        return -1;
     }
 
+    v3_clear_pending_intr(dev->vm);
+
     if (IS_ICW1(cw)) {
        PrintDebug("8259 PIC: Setting ICW1 = %x (wr_Slave1)\n", cw);
        state->slave_icw1 = cw;
@@ -591,48 +603,51 @@ static int write_slave_port2(ushort_t port, void * src, uint_t length, struct vm
     PrintDebug("8259 PIC: Write slave port 2 with 0x%x\n",cw);
 
     if (length != 1) {
-       PrintError("8259 PIC: Invalid write length (wr_Slave2)\n");
-       return -1;
+        PrintError("8259 PIC: Invalid write length (wr_Slave2)\n");
+        return -1;
     }
 
+    v3_clear_pending_intr(dev->vm);
+
+
     if (state->slave_state == ICW2) {
-       struct icw1 * cw1 =  (struct icw1 *)&(state->master_icw1);
+        struct icw1 * cw1 =  (struct icw1 *)&(state->master_icw1);
 
-       PrintDebug("8259 PIC: Setting ICW2 = %x (wr_Slave2)\n", cw);
+        PrintDebug("8259 PIC: Setting ICW2 = %x (wr_Slave2)\n", cw);
 
-       state->slave_icw2 = cw;
+        state->slave_icw2 = cw;
 
-       if (cw1->sngl == 0) {
-           state->slave_state = ICW3;
-       } else if (cw1->ic4 == 1) {
-           state->slave_state = ICW4;
-       } else {
-           state->slave_state = READY;
-       }
+        if (cw1->sngl == 0) {
+            state->slave_state = ICW3;
+        } else if (cw1->ic4 == 1) {
+            state->slave_state = ICW4;
+        } else {
+            state->slave_state = READY;
+        }
 
     } else if (state->slave_state == ICW3) {
-       struct icw1 * cw1 =  (struct icw1 *)&(state->master_icw1);
+        struct icw1 * cw1 =  (struct icw1 *)&(state->master_icw1);
 
-       PrintDebug("8259 PIC: Setting ICW3 = %x (wr_Slave2)\n", cw);
+        PrintDebug("8259 PIC: Setting ICW3 = %x (wr_Slave2)\n", cw);
 
-       state->slave_icw3 = cw;
+        state->slave_icw3 = cw;
 
-       if (cw1->ic4 == 1) {
-           state->slave_state = ICW4;
-       } else {
-           state->slave_state = READY;
-       }
+        if (cw1->ic4 == 1) {
+            state->slave_state = ICW4;
+        } else {
+            state->slave_state = READY;
+        }
 
     } else if (state->slave_state == ICW4) {
-       PrintDebug("8259 PIC: Setting ICW4 = %x (wr_Slave2)\n", cw);
-       state->slave_icw4 = cw;
-       state->slave_state = READY;
-    } else if (state->slave_state == READY) {
-       PrintDebug("8259 PIC: Setting IMR = %x (wr_Slave2)\n", cw);
-       state->slave_imr = cw;
+        PrintDebug("8259 PIC: Setting ICW4 = %x (wr_Slave2)\n", cw);
+        state->slave_icw4 = cw;
+        state->slave_state = READY;
+    } else if ((state->slave_state == ICW1) || (state->slave_state == READY)) {
+        PrintDebug("8259 PIC: Setting IMR = %x (wr_Slave2)\n", cw);
+        state->slave_imr = cw;
     } else {
-       PrintError("8259 PIC: Invalid State at write (wr_Slave2)\n");
-       return -1;
+        PrintError("8259 PIC: Invalid State at write (wr_Slave2)\n");
+        return -1;
     }
 
     return 1;
@@ -713,15 +728,17 @@ static struct v3_device_ops dev_ops = {
 
 
 
-static int pic_init(struct guest_info * vm, void * cfg_data) {
+static int pic_init(struct guest_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");
+
     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;
     }
 
Public Palacios Development Repository for the V3VEE Project