X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_intr.c;h=bc36d05cc57c00657d62a1201a6563eefc518cad;hp=ccbfd9fd5a5388144c4154c4879d7b3d3f3e29b2;hb=888c2dd8a3914f9a08e2b0e006ff96c5cc5cd792;hpb=7bb4a918835892e9071ffbdef1ea8e57f9a12950

diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c
index ccbfd9f..bc36d05 100644
--- a/palacios/src/palacios/vmm_intr.c
+++ b/palacios/src/palacios/vmm_intr.c
@@ -22,8 +22,11 @@
 #include <palacios/vmm.h>
 
 #include <palacios/vm_guest.h>
+#include <palacios/vmm_ctrl_regs.h>
 
-#ifndef DEBUG_INTERRUPTS
+#include <palacios/vmm_lock.h>
+
+#ifndef CONFIG_DEBUG_INTERRUPTS
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -32,28 +35,33 @@
 
 
 struct intr_controller {
-  struct intr_ctrl_ops * ctrl_ops;
-
-  void * priv_data;
-  struct list_head ctrl_node;
+    struct intr_ctrl_ops * ctrl_ops;
+    
+    void * priv_data;
+    struct list_head ctrl_node;
 };
 
 
 void v3_init_interrupt_state(struct guest_info * info) {
-  info->intr_state.excp_pending = 0;
-  info->intr_state.excp_num = 0;
-  info->intr_state.excp_error_code = 0;
 
-  memset((uchar_t *)(info->intr_state.hooks), 0, sizeof(struct v3_irq_hook *) * 256);
+    info->intr_state.irq_pending = 0;
+    info->intr_state.irq_started = 0;
+    info->intr_state.irq_vector = 0;
+
+    INIT_LIST_HEAD(&(info->intr_state.controller_list));
+
+    v3_lock_init(&(info->intr_state.irq_lock));
+
+    memset((uchar_t *)(info->intr_state.hooks), 0, sizeof(struct v3_irq_hook *) * 256);
 }
 
 void v3_register_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * state) {
-  struct intr_controller * ctrlr = (struct intr_controller *)V3_Malloc(sizeof(struct intr_controller));
+    struct intr_controller * ctrlr = (struct intr_controller *)V3_Malloc(sizeof(struct intr_controller));
 
-  ctrlr->priv_data = state;
-  ctrlr->ctrl_ops = ops;
+    ctrlr->priv_data = state;
+    ctrlr->ctrl_ops = ops;
 
-  list_add(&(ctrlr->ctrl_node), &(info->intr_state.controller_list));
+    list_add(&(ctrlr->ctrl_node), &(info->intr_state.controller_list));
 
 }
 
@@ -61,8 +69,8 @@ void v3_register_intr_controller(struct guest_info * info, struct intr_ctrl_ops
 
 
 static inline struct v3_irq_hook * get_irq_hook(struct guest_info * info, uint_t irq) {
-  V3_ASSERT(irq <= 256);
-  return info->intr_state.hooks[irq];
+    V3_ASSERT(irq <= 256);
+    return info->intr_state.hooks[irq];
 }
 
 
@@ -71,54 +79,50 @@ int v3_hook_irq(struct guest_info * info,
 		int (*handler)(struct guest_info * info, struct v3_interrupt * intr, void * priv_data),
 		void  * priv_data) 
 {
-  struct v3_irq_hook * hook = (struct v3_irq_hook *)V3_Malloc(sizeof(struct v3_irq_hook));
+    struct v3_irq_hook * hook = (struct v3_irq_hook *)V3_Malloc(sizeof(struct v3_irq_hook));
 
-  if (hook == NULL) { 
-    return -1; 
-  }
+    if (hook == NULL) { 
+	return -1; 
+    }
 
-  if (get_irq_hook(info, irq) != NULL) {
-    PrintError("IRQ %d already hooked\n", irq);
-    return -1;
-  }
+    if (get_irq_hook(info, irq) != NULL) {
+	PrintError("IRQ %d already hooked\n", irq);
+	return -1;
+    }
 
-  hook->handler = handler;
-  hook->priv_data = priv_data;
+    hook->handler = handler;
+    hook->priv_data = priv_data;
   
-  info->intr_state.hooks[irq] = hook;
-
-  if (V3_Hook_Interrupt(info, irq)) { 
-    PrintError("hook_irq: failed to hook irq %d\n", irq);
-    return -1;
-  } else {
-    PrintDebug("hook_irq: hooked irq %d\n", irq);
-    return 0;
-  }
+    info->intr_state.hooks[irq] = hook;
+
+    if (V3_Hook_Interrupt(info, irq)) { 
+	PrintError("hook_irq: failed to hook irq %d\n", irq);
+	return -1;
+    } else {
+	PrintDebug("hook_irq: hooked irq %d\n", irq);
+	return 0;
+    }
 }
 
 
 
-static int passthrough_irq_handler(struct guest_info * info, struct v3_interrupt * intr, void * priv_data)
-{
-
-  PrintDebug("[passthrough_irq_handler] raise_irq=%d (guest=0x%p)\n", 
-	     intr->irq, (void *)info);
-  return v3_raise_irq(info, intr->irq);
+static int passthrough_irq_handler(struct guest_info * info, struct v3_interrupt * intr, void * priv_data) {
+    PrintDebug("[passthrough_irq_handler] raise_irq=%d (guest=0x%p)\n", 
+	       intr->irq, (void *)info);
 
+    return v3_raise_irq(info, intr->irq);
 }
 
-int v3_hook_passthrough_irq(struct guest_info * info, uint_t irq)
-{
-
-  int rc = v3_hook_irq(info, irq, passthrough_irq_handler, NULL);
+int v3_hook_passthrough_irq(struct guest_info * info, uint_t irq) {
+    int rc = v3_hook_irq(info, irq, passthrough_irq_handler, NULL);
 
-  if (rc) { 
-    PrintError("guest_irq_injection: failed to hook irq 0x%x (guest=0x%p)\n", irq, (void *)info);
-    return -1;
-  } else {
-    PrintDebug("guest_irq_injection: hooked irq 0x%x (guest=0x%p)\n", irq, (void *)info);
-    return 0;
-  }
+    if (rc) { 
+	PrintError("guest_irq_injection: failed to hook irq 0x%x (guest=0x%p)\n", irq, (void *)info);
+	return -1;
+    } else {
+	PrintDebug("guest_irq_injection: hooked irq 0x%x (guest=0x%p)\n", irq, (void *)info);
+	return 0;
+    }
 }
 
 
@@ -126,174 +130,202 @@ int v3_hook_passthrough_irq(struct guest_info * info, uint_t irq)
 
 
 int v3_deliver_irq(struct guest_info * info, struct v3_interrupt * intr) {
-  PrintDebug("v3_deliver_irq: irq=%d state=0x%p, \n", intr->irq, (void *)intr);
+    PrintDebug("v3_deliver_irq: irq=%d state=0x%p, \n", intr->irq, (void *)intr);
   
-  struct v3_irq_hook * hook = get_irq_hook(info, intr->irq);
+    struct v3_irq_hook * hook = get_irq_hook(info, intr->irq);
 
-  if (hook == NULL) {
-    PrintError("Attempting to deliver interrupt to non registered hook(irq=%d)\n", intr->irq);
-    return -1;
-  }
+    if (hook == NULL) {
+	PrintError("Attempting to deliver interrupt to non registered hook(irq=%d)\n", intr->irq);
+	return -1;
+    }
   
-  return hook->handler(info, intr, hook->priv_data);
+    return hook->handler(info, intr, hook->priv_data);
 }
 
 
 
 
 
+int v3_raise_virq(struct guest_info * info, int irq) {
+    struct v3_intr_state * intr_state = &(info->intr_state);
+    int major = irq / 8;
+    int minor = irq % 8;
 
+    intr_state->virq_map[major] |= (1 << minor);
+   
+    return 0;
+}
 
+int v3_lower_virq(struct guest_info * info, int irq) {
+    struct v3_intr_state * intr_state = &(info->intr_state);
+    int major = irq / 8;
+    int minor = irq % 8;
 
-int v3_raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t error_code) {
-  struct v3_intr_state * intr_state = &(info->intr_state);
-
-  if (intr_state->excp_pending == 0) {
-    intr_state->excp_pending = 1;
-    intr_state->excp_num = excp;
-    intr_state->excp_error_code = error_code;
-    intr_state->excp_error_code_valid = 1;
-    PrintDebug("[v3_raise_exception_with_error] error code: %x\n", error_code);
-  } else {
-    PrintError("exception already pending, currently not implemented\n");
-    return -1;
-  }
-
-  return 0;
-}
+    intr_state->virq_map[major] &= ~(1 << minor);
 
-int v3_raise_exception(struct guest_info * info, uint_t excp) {
-  struct v3_intr_state * intr_state = &(info->intr_state);
-  PrintDebug("[v3_raise_exception]\n");
-  if (intr_state->excp_pending == 0) {
-    intr_state->excp_pending = 1;
-    intr_state->excp_num = excp;
-    intr_state->excp_error_code = 0;
-    intr_state->excp_error_code_valid = 0;
-  } else {
-    PrintError("exception already pending, currently not implemented\n");
-    return -1;
-  }
-
-  return 0;
+    return 0;
 }
 
 
 int v3_lower_irq(struct guest_info * info, int irq) {
-  struct intr_controller * ctrl = NULL;
-  struct v3_intr_state * intr_state = &(info->intr_state);
+    struct intr_controller * ctrl = NULL;
+    struct v3_intr_state * intr_state = &(info->intr_state);
 
-  PrintDebug("[v3_lower_irq]\n");
+    //    PrintDebug("[v3_lower_irq]\n");
+    addr_t irq_state = v3_lock_irqsave(intr_state->irq_lock);
 
-  list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
-    ctrl->ctrl_ops->lower_intr(ctrl->priv_data, irq);
-  }
+    list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
+	ctrl->ctrl_ops->lower_intr(info, ctrl->priv_data, irq);
+    }
  
-  return 0;
+    v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
+
+    return 0;
 }
 
 int v3_raise_irq(struct guest_info * info, int irq) {
-  struct intr_controller * ctrl = NULL;
-  struct v3_intr_state * intr_state = &(info->intr_state);
+    struct intr_controller * ctrl = NULL;
+    struct v3_intr_state * intr_state = &(info->intr_state);
+
+    //  PrintDebug("[v3_raise_irq (%d)]\n", irq);
+    addr_t irq_state = v3_lock_irqsave(intr_state->irq_lock);
 
-  PrintDebug("[v3_raise_irq]\n");
+    list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
+	ctrl->ctrl_ops->raise_intr(info, ctrl->priv_data, irq);
+    }
 
-  list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
-    ctrl->ctrl_ops->raise_intr(ctrl->priv_data, irq);
-  }
+    v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
 
-  return 0;
+    return 0;
 }
 
 
+void v3_clear_pending_intr(struct guest_info * core) {
+    struct v3_intr_state * intr_state = &(core->intr_state);
+
+    intr_state->irq_pending = 0;
+
+}
 
-int v3_intr_pending(struct guest_info * info) {
-  struct v3_intr_state * intr_state = &(info->intr_state);
 
-  //  PrintDebug("[intr_pending]\n");
-  if (intr_state->excp_pending == 1) {
-    return 1;
-  } else {
+v3_intr_type_t v3_intr_pending(struct guest_info * info) {
+    struct v3_intr_state * intr_state = &(info->intr_state);
     struct intr_controller * ctrl = NULL;
+    int ret = V3_INVALID_INTR;
+    int i = 0;
+
+    //  PrintDebug("[intr_pending]\n");
+    addr_t irq_state = v3_lock_irqsave(intr_state->irq_lock);
+
+    // VIRQs have priority
+    for (i = 0; i < MAX_IRQ / 8; i++) {
+	if (intr_state->virq_map[i] != 0) {   
+	    ret = V3_VIRTUAL_IRQ;
+	    break;
+	}
+    }
 
-    list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
-      if (ctrl->ctrl_ops->intr_pending(ctrl->priv_data) == 1) {
-	return 1;
-      }
+    if (ret == V3_INVALID_INTR) {
+	list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
+	    if (ctrl->ctrl_ops->intr_pending(info, ctrl->priv_data) == 1) {
+		ret = V3_EXTERNAL_IRQ;
+		break;
+	    }
+	}
     }
-  }
 
-  return 0;
-}
+    v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
 
+    return ret;
+}
 
-uint_t v3_get_intr_number(struct guest_info * info) {
-  struct v3_intr_state * intr_state = &(info->intr_state);
 
-  if (intr_state->excp_pending == 1) {
-    return intr_state->excp_num;
-  } else {
+uint32_t v3_get_intr(struct guest_info * info) {
+    struct v3_intr_state * intr_state = &(info->intr_state);
     struct intr_controller * ctrl = NULL;
+    uint_t ret = 0;
+    int i = 0;
+    int j = 0;
+
+    addr_t irq_state = v3_lock_irqsave(intr_state->irq_lock);    
+
+    // virqs have priority
+    for (i = 0; i < MAX_IRQ / 8; i++) {
+	if (intr_state->virq_map[i] != 0) {
+	    for (j = 0; j < 8; j++) {
+		if (intr_state->virq_map[i] & (1 << j)) {
+		    ret = (i * 8) + j;
+		    break;
+		}
+	    }
+	    break;
+	}
+    }
 
-    list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
-      if (ctrl->ctrl_ops->intr_pending(ctrl->priv_data)) {
-	uint_t intr_num = ctrl->ctrl_ops->get_intr_number(ctrl->priv_data);
-
-	PrintDebug("[get_intr_number] intr_number = %d\n", intr_num);
-
-	return intr_num;
-      }
+    if (!ret) {
+	list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
+	    if (ctrl->ctrl_ops->intr_pending(info, ctrl->priv_data)) {
+		uint_t intr_num = ctrl->ctrl_ops->get_intr_number(info, ctrl->priv_data);
+		
+		//	PrintDebug("[get_intr_number] intr_number = %d\n", intr_num);
+		ret = intr_num;
+		break;
+	    }
+	}
     }
-  }
 
-  return 0;
-}
+    v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
 
+    return ret;
+}
 
+/*
 intr_type_t v3_get_intr_type(struct guest_info * info) {
-  struct v3_intr_state * intr_state = &(info->intr_state);
-
-  if (intr_state->excp_pending) {
-    PrintDebug("[get_intr_type] Exception\n");
-    return EXCEPTION;
-  } else {
+    struct v3_intr_state * intr_state = &(info->intr_state);
     struct intr_controller * ctrl = NULL;
+    intr_type_t type = V3_INVALID_INTR;
+
+    addr_t irq_state = v3_lock_irqsave(intr_state->irq_lock);  
 
     list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
-      if (ctrl->ctrl_ops->intr_pending(ctrl->priv_data) == 1) {
-	PrintDebug("[get_intr_type] External_irq\n");
-	return EXTERNAL_IRQ;
-      }
+	if (ctrl->ctrl_ops->intr_pending(ctrl->priv_data) == 1) {
+	    //PrintDebug("[get_intr_type] External_irq\n");
+	    type = V3_EXTERNAL_IRQ;	    
+	    break;
+	}
+    }
+
+#ifdef CONFIG_DEBUG_INTERRUPTS
+    if (type == V3_INVALID_INTR) {
+	PrintError("[get_intr_type] Invalid_Intr\n");
     }
-  }
+#endif
+
+    v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
 
-  PrintDebug("[get_intr_type] Invalid_Intr\n");
-  return INVALID_INTR;
+    return type;
 }
+*/
 
 
 
 
 
+int v3_injecting_intr(struct guest_info * info, uint_t intr_num, v3_intr_type_t type) {
+    struct v3_intr_state * intr_state = &(info->intr_state);
 
-int v3_injecting_intr(struct guest_info * info, uint_t intr_num, intr_type_t type) {
-  struct v3_intr_state * intr_state = &(info->intr_state);
+    if (type == V3_EXTERNAL_IRQ) {
+	struct intr_controller * ctrl = NULL;
 
-  if (type == EXCEPTION) {
-    PrintDebug("[injecting_intr] Exception\n");
-    intr_state->excp_pending = 0;
-    intr_state->excp_num = 0;
-    intr_state->excp_error_code = 0;
-    intr_state->excp_error_code_valid = 0;
-    
-  } else if (type == EXTERNAL_IRQ) {
-    struct intr_controller * ctrl = NULL;
+	addr_t irq_state = v3_lock_irqsave(intr_state->irq_lock); 
 
-    list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
-      PrintDebug("[injecting_intr] External_Irq with intr_num = %x\n", intr_num);
-      ctrl->ctrl_ops->begin_irq(ctrl->priv_data, intr_num);
+	//	PrintDebug("[injecting_intr] External_Irq with intr_num = %x\n", intr_num);
+	list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
+	    ctrl->ctrl_ops->begin_irq(info, ctrl->priv_data, intr_num);
+	}
+
+	v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
     }
-  }
 
-  return 0;
+    return 0;
 }