X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_intr.c;h=875534ac82df142bf545b6c84e7e9b11de883527;hb=29e825c5f095066bbb5ebbec5a5af1419d883264;hp=7ffd1a8dd63c1e91b08727f6620fdbf9158a2752;hpb=a15677374293739adbe2ce1092172534be5b22ea;p=palacios.git

diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c
index 7ffd1a8..875534a 100644
--- a/palacios/src/palacios/vmm_intr.c
+++ b/palacios/src/palacios/vmm_intr.c
@@ -22,6 +22,7 @@
 #include <palacios/vmm.h>
 
 #include <palacios/vm_guest.h>
+#include <palacios/vmm_ctrl_regs.h>
 
 #ifndef DEBUG_INTERRUPTS
 #undef PrintDebug
@@ -32,30 +33,31 @@
 
 
 struct intr_controller {
-  struct intr_ctrl_ops * ctrl_ops;
+    struct intr_ctrl_ops * ctrl_ops;
 
-  void * priv_data;
-  struct list_head ctrl_node;
+    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;
 
-  INIT_LIST_HEAD(&(info->intr_state.controller_list));
+    info->intr_state.irq_pending = 0;
+    info->intr_state.irq_started = 0;
+    info->intr_state.irq_vector = 0;
 
-  memset((uchar_t *)(info->intr_state.hooks), 0, sizeof(struct v3_irq_hook *) * 256);
+    INIT_LIST_HEAD(&(info->intr_state.controller_list));
+
+    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));
 
 }
 
@@ -63,8 +65,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];
 }
 
 
@@ -73,54 +75,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 v3_hook_passthrough_irq(struct guest_info * info, uint_t irq) {
+    int rc = v3_hook_irq(info, irq, passthrough_irq_handler, NULL);
 
-  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;
+    }
 }
 
 
@@ -128,16 +126,16 @@ 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);
 }
 
 
@@ -147,130 +145,80 @@ int v3_deliver_irq(struct guest_info * info, struct v3_interrupt * intr) {
 
 
 
-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;
-}
-
-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;
-}
-
 
 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");
 
-  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(ctrl->priv_data, irq);
+    }
  
-  return 0;
+    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);
+    //  PrintDebug("[v3_raise_irq (%d)]\n", irq);
 
-  list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
-    ctrl->ctrl_ops->raise_intr(ctrl->priv_data, irq);
-  }
+    list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
+	ctrl->ctrl_ops->raise_intr(ctrl->priv_data, irq);
+    }
 
-  return 0;
+    return 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 {
+    struct v3_intr_state * intr_state = &(info->intr_state);
     struct intr_controller * ctrl = NULL;
-
+    //  PrintDebug("[intr_pending]\n");
+    
     list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
-      if (ctrl->ctrl_ops->intr_pending(ctrl->priv_data) == 1) {
-	return 1;
-      }
+	if (ctrl->ctrl_ops->intr_pending(ctrl->priv_data) == 1) {
+	    return 1;
+	}
     }
-  }
 
-  return 0;
+    return 0;
 }
 
 
 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 {
+    struct v3_intr_state * intr_state = &(info->intr_state);
     struct intr_controller * ctrl = NULL;
 
     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 (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;
+	}
     }
-  }
-
-  return 0;
+    return 0;
 }
 
 
 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;
 
     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");
+	    return EXTERNAL_IRQ;
+	}
     }
-  }
 
-  PrintDebug("[get_intr_type] Invalid_Intr\n");
-  return INVALID_INTR;
+    PrintError("[get_intr_type] Invalid_Intr\n");
+    return INVALID_INTR;
 }
 
 
@@ -279,23 +227,16 @@ intr_type_t v3_get_intr_type(struct guest_info * info) {
 
 
 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 == 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;
+    struct v3_intr_state * intr_state = &(info->intr_state);
 
-    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(ctrl->priv_data, intr_num);
+    if (type == EXTERNAL_IRQ) {
+	struct intr_controller * ctrl = NULL;
+
+	//	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(ctrl->priv_data, intr_num);
+	}
     }
-  }
 
-  return 0;
+    return 0;
 }