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=b65dfefca9c10fb3f44ebad546fb3ce830771cfa;hb=888c2dd8a3914f9a08e2b0e006ff96c5cc5cd792;hpb=87819b4172a7c32186403fc7a03bea5ae65f0e4a diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c index b65dfef..bc36d05 100644 --- a/palacios/src/palacios/vmm_intr.c +++ b/palacios/src/palacios/vmm_intr.c @@ -26,7 +26,7 @@ #include -#ifndef DEBUG_INTERRUPTS +#ifndef CONFIG_DEBUG_INTERRUPTS #undef PrintDebug #define PrintDebug(fmt, args...) #endif @@ -146,8 +146,25 @@ int v3_deliver_irq(struct guest_info * info, struct v3_interrupt * intr) { +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; + + intr_state->virq_map[major] &= ~(1 << minor); + + return 0; +} int v3_lower_irq(struct guest_info * info, int irq) { @@ -158,7 +175,7 @@ int v3_lower_irq(struct guest_info * info, int irq) { 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); + ctrl->ctrl_ops->lower_intr(info, ctrl->priv_data, irq); } v3_unlock_irqrestore(intr_state->irq_lock, irq_state); @@ -174,7 +191,7 @@ int v3_raise_irq(struct guest_info * info, int irq) { 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->raise_intr(ctrl->priv_data, irq); + ctrl->ctrl_ops->raise_intr(info, ctrl->priv_data, irq); } v3_unlock_irqrestore(intr_state->irq_lock, irq_state); @@ -183,69 +200,103 @@ int v3_raise_irq(struct guest_info * info, int irq) { } +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) { + +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 = 0; + int ret = V3_INVALID_INTR; + int i = 0; // PrintDebug("[intr_pending]\n"); - addr_t irq_state = v3_lock_irqsave(intr_state->irq_lock); + 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) { - ret = 1; + // VIRQs have priority + for (i = 0; i < MAX_IRQ / 8; i++) { + if (intr_state->virq_map[i] != 0) { + ret = V3_VIRTUAL_IRQ; break; } } + 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; + } + } + } + v3_unlock_irqrestore(intr_state->irq_lock, irq_state); return ret; } -uint_t v3_get_intr_number(struct guest_info * info) { +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); - 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); - ret = intr_num; + // 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; } } - v3_unlock_irqrestore(intr_state->irq_lock, irq_state); + 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; + } + } + } + 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); struct intr_controller * ctrl = NULL; - intr_type_t type = INVALID_INTR; + 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"); - type = EXTERNAL_IRQ; + type = V3_EXTERNAL_IRQ; break; } } -#ifdef DEBUG_INTERRUPTS - if (type == INVALID_INTR) { +#ifdef CONFIG_DEBUG_INTERRUPTS + if (type == V3_INVALID_INTR) { PrintError("[get_intr_type] Invalid_Intr\n"); } #endif @@ -254,23 +305,23 @@ intr_type_t v3_get_intr_type(struct guest_info * info) { return type; } +*/ - -int v3_injecting_intr(struct guest_info * info, uint_t intr_num, intr_type_t 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); - if (type == EXTERNAL_IRQ) { + if (type == V3_EXTERNAL_IRQ) { struct intr_controller * ctrl = NULL; addr_t irq_state = v3_lock_irqsave(intr_state->irq_lock); // 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); + ctrl->ctrl_ops->begin_irq(info, ctrl->priv_data, intr_num); } v3_unlock_irqrestore(intr_state->irq_lock, irq_state);