X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fapic.c;h=407d3af4a15407cdd54ea372a1a29162aa32562e;hb=0e6a3e3539a88b57bf06dea3864cd6fe5078643d;hp=0bb591a6b42b47ad1579d391e1904e43cfb0e122;hpb=13103a78ed1840c7933a5bbafb128f3d33fc0639;p=palacios.git diff --git a/palacios/src/devices/apic.c b/palacios/src/devices/apic.c index 0bb591a..407d3af 100644 --- a/palacios/src/devices/apic.c +++ b/palacios/src/devices/apic.c @@ -168,6 +168,7 @@ struct apic_state { uint32_t tmr_init_cnt; + struct local_vec_tbl_reg ext_intr_vec_tbl[4]; uint32_t rem_rd_data; @@ -223,6 +224,7 @@ static void init_apic_state(struct apic_state * apic) { apic->lint1_vec_tbl.val = 0x00010000; apic->err_vec_tbl.val = 0x00010000; apic->tmr_div_cfg.val = 0x00000000; + //apic->ext_apic_feature.val = 0x00000007; apic->ext_apic_feature.val = 0x00040007; apic->ext_apic_ctrl.val = 0x00000000; apic->spec_eoi.val = 0x00000000; @@ -277,7 +279,7 @@ static int activate_apic_irq(struct apic_state * apic, uint32_t irq_num) { -static int apic_do_eoi(struct apic_state * apic) { +static int get_highest_isr(struct apic_state * apic) { int i = 0, j = 0; // We iterate backwards to find the highest priority @@ -288,13 +290,72 @@ static int apic_do_eoi(struct apic_state * apic) { for (j = 7; j >= 0; j--) { uchar_t flag = 0x1 << j; if ((*svc_major) & flag) { - *svc_major &= ~flag; - return 0; + + + return ((i * 8) + j); + } + } + } + } + + return -1; +} + + + +static int get_highest_irr(struct apic_state * apic) { + int i = 0, j = 0; + + // We iterate backwards to find the highest priority + for (i = 31; i >= 0; i--) { + uchar_t * req_major = apic->int_req_reg + i; + + if ((*req_major) & 0xff) { + for (j = 7; j >= 0; j--) { + uchar_t flag = 0x1 << j; + if ((*req_major) & flag) { + + + return ((i * 8) + j); } } } } + return -1; +} + + + + +static int apic_do_eoi(struct apic_state * apic) { + int isr_irq = get_highest_isr(apic); + + if (isr_irq != -1) { + int major_offset = (isr_irq & ~0x00000007) >> 3; + int minor_offset = isr_irq & 0x00000007; + uchar_t flag = 0x1 << minor_offset; + uchar_t * svc_location = apic->int_svc_reg + major_offset; + + PrintDebug("Received APIC EOI\n"); + + *svc_location &= ~flag; + +#ifdef CRAY_XT + + if ((isr_irq == 238) || + (isr_irq == 239)) { + PrintError("Acking IRQ %d\n", isr_irq); + } + + if (isr_irq == 238) { + V3_ACK_IRQ(238); + } +#endif + } else { + PrintError("Spurious EOI...\n"); + } + return 0; } @@ -563,9 +624,19 @@ static int apic_read(addr_t guest_addr, void * dst, uint_t length, void * priv_d // Unhandled Registers case EXT_INT_LOC_VEC_TBL_OFFSET0: + val = apic->ext_intr_vec_tbl[0].val; + break; case EXT_INT_LOC_VEC_TBL_OFFSET1: + val = apic->ext_intr_vec_tbl[1].val; + break; case EXT_INT_LOC_VEC_TBL_OFFSET2: + val = apic->ext_intr_vec_tbl[2].val; + break; case EXT_INT_LOC_VEC_TBL_OFFSET3: + val = apic->ext_intr_vec_tbl[3].val; + break; + + case EXT_APIC_FEATURE_OFFSET: case EXT_APIC_CMD_OFFSET: case SEOI_OFFSET: @@ -736,22 +807,31 @@ static int apic_write(addr_t guest_addr, void * src, uint_t length, void * priv_ case IER_OFFSET7: *(uint32_t *)(apic->int_en_reg + 28) = op_val; break; - - // Action Registers - case INT_CMD_LO_OFFSET: - case INT_CMD_HI_OFFSET: - case EOI_OFFSET: - { - // do eoi - apic_do_eoi(apic); - break; - } - // Unhandled Registers case EXT_INT_LOC_VEC_TBL_OFFSET0: + apic->ext_intr_vec_tbl[0].val = op_val; + break; case EXT_INT_LOC_VEC_TBL_OFFSET1: + apic->ext_intr_vec_tbl[1].val = op_val; + break; case EXT_INT_LOC_VEC_TBL_OFFSET2: + apic->ext_intr_vec_tbl[2].val = op_val; + break; case EXT_INT_LOC_VEC_TBL_OFFSET3: + apic->ext_intr_vec_tbl[3].val = op_val; + break; + + + // Action Registers + case EOI_OFFSET: + // do eoi + apic_do_eoi(apic); + break; + + case INT_CMD_LO_OFFSET: + case INT_CMD_HI_OFFSET: + // Unhandled Registers + case EXT_APIC_CMD_OFFSET: case SEOI_OFFSET: default: @@ -768,39 +848,31 @@ static int apic_write(addr_t guest_addr, void * src, uint_t length, void * priv_ /* Interrupt Controller Functions */ +// returns 1 if an interrupt is pending, 0 otherwise static int apic_intr_pending(void * private_data) { struct vm_device * dev = (struct vm_device *)private_data; struct apic_state * apic = (struct apic_state *)dev->private_data; - int i = 0; + int req_irq = get_highest_irr(apic); + int svc_irq = get_highest_isr(apic); - - // just scan the request register looking for any set bit - // we should probably just do this with uint64 casts - for (i = 0; i < 32; i++) { - if (apic->int_req_reg[i] & 0xff) { - return 1; - } + if ((req_irq >= 0) && + (req_irq > svc_irq)) { + return 1; } + return 0; } static int apic_get_intr_number(void * private_data) { struct vm_device * dev = (struct vm_device *)private_data; struct apic_state * apic = (struct apic_state *)dev->private_data; - int i = 0, j = 0; - + int req_irq = get_highest_irr(apic); + int svc_irq = get_highest_isr(apic); - // We iterate backwards to find the highest priority - for (i = 31; i >= 0; i--) { - uchar_t req_major = apic->int_req_reg[i]; - - if (req_major & 0xff) { - for (j = 7; j >= 0; j--) { - if ((req_major >> j) == 0x1) { - return (i * 8) + j; - } - } - } + if (svc_irq == -1) { + return req_irq; + } else if (svc_irq < req_irq) { + return req_irq; } return -1; @@ -836,6 +908,12 @@ static int apic_begin_irq(void * private_data, int irq) { *svc_location |= flag; *req_location &= ~flag; +#ifdef CRAY_XT + if ((irq == 238) || (irq == 239)) { + PrintError("APIC: Begin IRQ %d (ISR=%x), (IRR=%x)\n", irq, *svc_location, *req_location); + } +#endif + return 0; } @@ -905,7 +983,7 @@ static void apic_update_time(ullong_t cpu_cycles, ullong_t cpu_freq, void * priv } tmr_ticks = cpu_cycles >> shift_num; - // PrintDebug("Timer Ticks: %p\n", (void *)tmr_ticks); + PrintDebug("Timer Ticks: %p\n", (void *)tmr_ticks); if (tmr_ticks < apic->tmr_cur_cnt) { apic->tmr_cur_cnt -= tmr_ticks; @@ -916,6 +994,7 @@ static void apic_update_time(ullong_t cpu_cycles, ullong_t cpu_freq, void * priv // raise irq PrintDebug("Raising APIC Timer interrupt (periodic=%d) (icnt=%d) (div=%d)\n", apic->tmr_vec_tbl.tmr_mode, apic->tmr_init_cnt, shift_num); + if (activate_internal_irq(apic, APIC_TMR_INT) == -1) { PrintError("Could not raise Timer interrupt\n"); }