X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fapic.c;h=f45e7b8b56af7adb8f45948e18a628ff1c6348e2;hb=fa3ef2ff5003b7cd27bfe11e970760c940525966;hp=3d524ed21536fa8888f849ff741126fb8a1a1e6a;hpb=083af1763ddaecb78ff222141d78ba17df26aa47;p=palacios-OLD.git diff --git a/palacios/src/devices/apic.c b/palacios/src/devices/apic.c index 3d524ed..f45e7b8 100644 --- a/palacios/src/devices/apic.c +++ b/palacios/src/devices/apic.c @@ -22,7 +22,8 @@ #include #include #include - +#include +#include #ifndef CONFIG_DEBUG_APIC #undef PrintDebug @@ -180,9 +181,14 @@ struct apic_state { uint32_t eoi; + uint32_t my_apic_id; + struct vm_device *icc_bus; + v3_lock_t lock; }; +static int apic_read(addr_t guest_addr, void * dst, uint_t length, void * priv_data); +static int apic_write(addr_t guest_addr, void * src, uint_t length, void * priv_data); static void init_apic_state(struct apic_state * apic) { apic->base_addr = DEFAULT_BASE_ADDR; @@ -228,6 +234,8 @@ static void init_apic_state(struct apic_state * apic) { apic->ext_apic_feature.val = 0x00040007; apic->ext_apic_ctrl.val = 0x00000000; apic->spec_eoi.val = 0x00000000; + + v3_lock_init(&(apic->lock)); } @@ -236,18 +244,39 @@ static void init_apic_state(struct apic_state * apic) { static int read_apic_msr(uint_t msr, v3_msr_t * dst, void * priv_data) { struct vm_device * dev = (struct vm_device *)priv_data; struct apic_state * apic = (struct apic_state *)dev->private_data; + v3_lock(apic->lock); dst->value = apic->base_addr; + v3_unlock(apic->lock); return 0; } static int write_apic_msr(uint_t msr, v3_msr_t src, void * priv_data) { - // struct vm_device * dev = (struct vm_device *)priv_data; - // struct apic_state * apic = (struct apic_state *)dev->private_data; + struct vm_device * dev = (struct vm_device *)priv_data; + struct apic_state * apic = (struct apic_state *)dev->private_data; + struct v3_shadow_region * old_reg = v3_get_shadow_region(dev->vm, apic->base_addr); - PrintError("WRITING APIC BASE ADDR: HI=%x LO=%x\n", src.hi, src.lo); - return -1; + if (old_reg == NULL) { + // uh oh... + PrintError("APIC Base address region does not exit...\n"); + return -1; + } + + v3_lock(apic->lock); + + v3_delete_shadow_region(dev->vm, old_reg); + + apic->base_addr = src.value; + + if (v3_hook_full_mem(dev->vm, apic->base_addr, apic->base_addr + PAGE_SIZE_4KB, apic_read, apic_write, dev) == -1) { + PrintError("Could not hook new APIC Base address\n"); + v3_unlock(apic->lock); + return -1; + } + + v3_unlock(apic->lock); + return 0; } @@ -266,6 +295,10 @@ static int activate_apic_irq(struct apic_state * apic, uint32_t irq_num) { PrintDebug("Raising APIC IRQ %d\n", irq_num); + if (*req_location & flag) { + //V3_Print("Interrupts coallescing\n"); + } + if (*en_location & flag) { *req_location |= flag; } else { @@ -348,7 +381,7 @@ static int apic_do_eoi(struct apic_state * apic) { } #endif } else { - PrintError("Spurious EOI...\n"); + //PrintError("Spurious EOI...\n"); } return 0; @@ -669,6 +702,9 @@ static int apic_read(addr_t guest_addr, void * dst, uint_t length, void * priv_d } +/** + * + */ static int apic_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) { struct vm_device * dev = (struct vm_device *)priv_data; struct apic_state * apic = (struct apic_state *)dev->private_data; @@ -824,7 +860,12 @@ static int apic_write(addr_t guest_addr, void * src, uint_t length, void * priv_ break; case INT_CMD_LO_OFFSET: + apic->int_cmd.lo = op_val; + v3_icc_send_ipi(apic->icc_bus, apic->int_cmd.dst, apic->int_cmd.val); + break; case INT_CMD_HI_OFFSET: + apic->int_cmd.hi = op_val; + break; // Unhandled Registers case EXT_APIC_CMD_OFFSET: @@ -873,6 +914,7 @@ static int apic_get_intr_number(struct guest_info * info, void * private_data) { return -1; } +#if 0 static int apic_raise_intr(struct guest_info * info, void * private_data, int irq) { #ifdef CONFIG_CRAY_XT // The Seastar is connected directly to the LAPIC via LINT0 on the ICC bus @@ -891,6 +933,7 @@ static int apic_raise_intr(struct guest_info * info, void * private_data, int ir static int apic_lower_intr(struct guest_info * info, void * private_data, int irq) { return 0; } +#endif static int apic_begin_irq(struct guest_info * info, void * private_data, int irq) { struct vm_device * dev = (struct vm_device *)private_data; @@ -918,12 +961,17 @@ static int apic_begin_irq(struct guest_info * info, void * private_data, int irq int v3_apic_raise_intr(struct guest_info * info, struct vm_device * apic_dev, int intr_num) { struct apic_state * apic = (struct apic_state *)apic_dev->private_data; + // Special cases go here + // startup, etc + if (activate_apic_irq(apic, intr_num) == -1) { PrintError("Error: Could not activate apic_irq\n"); return -1; } - v3_interrupt_cpu(info, 0); + // Don't need this since we'll have the IPI force an exit if + // This is called on a different core + /* v3_interrupt_cpu(info, 0); */ return 0; } @@ -931,7 +979,7 @@ int v3_apic_raise_intr(struct guest_info * info, struct vm_device * apic_dev, in /* Timer Functions */ -static void apic_update_time(ullong_t cpu_cycles, ullong_t cpu_freq, void * priv_data) { +static void apic_update_time(struct guest_info * info, ullong_t cpu_cycles, ullong_t cpu_freq, void * priv_data) { struct vm_device * dev = (struct vm_device *)priv_data; struct apic_state * apic = (struct apic_state *)dev->private_data; // The 32 bit GCC runtime is a pile of shit @@ -999,8 +1047,8 @@ static void apic_update_time(ullong_t cpu_cycles, ullong_t cpu_freq, void * priv 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 (apic_intr_pending(dev->vm, priv_data)) { - PrintDebug("Overriding pending IRQ %d\n", apic_get_intr_number(dev->vm, priv_data)); + if (apic_intr_pending(info, priv_data)) { + PrintDebug("Overriding pending IRQ %d\n", apic_get_intr_number(info, priv_data)); } if (activate_internal_irq(apic, APIC_TMR_INT) == -1) { @@ -1017,13 +1065,10 @@ static void apic_update_time(ullong_t cpu_cycles, ullong_t cpu_freq, void * priv } - static struct intr_ctrl_ops intr_ops = { .intr_pending = apic_intr_pending, .get_intr_number = apic_get_intr_number, - .raise_intr = apic_raise_intr, .begin_irq = apic_begin_irq, - .lower_intr = apic_lower_intr, }; @@ -1035,9 +1080,9 @@ static struct vm_timer_ops timer_ops = { static int apic_free(struct vm_device * dev) { - struct guest_info * info = dev->vm; + // struct apic_state * apic = (struct apic_state *)dev->private_data; - v3_unhook_msr(info, BASE_ADDR_MSR); + v3_unhook_msr(dev->vm, BASE_ADDR_MSR); return 0; } @@ -1052,23 +1097,37 @@ static struct v3_device_ops dev_ops = { -static int apic_init(struct guest_info * vm, void * cfg_data) { +static int apic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { PrintDebug("Creating APIC\n"); + char * name = v3_cfg_val(cfg, "name"); + char * icc_name = v3_cfg_val(cfg,"irq_bus"); + int i; + struct vm_device * icc = v3_find_dev(vm, icc_name); + + if (!icc) { + PrintError("Cannot find device %s\n", icc_name); + return -1; + } struct apic_state * apic = (struct apic_state *)V3_Malloc(sizeof(struct apic_state)); - struct vm_device * dev = v3_allocate_device("LAPIC", &dev_ops, apic); + struct vm_device * dev = v3_allocate_device(name, &dev_ops, apic); if (v3_attach_device(vm, dev) == -1) { - PrintError("Could not attach device %s\n", "LAPIC"); + PrintError("Could not attach device %s\n", name); return -1; } - v3_register_intr_controller(vm, &intr_ops, dev); - v3_add_timer(vm, &timer_ops, dev); + for (i = 0; i < vm->num_cores; i++) + { + v3_register_intr_controller(&vm->cores[i], &intr_ops, dev); + v3_add_timer(&vm->cores[i], &timer_ops, dev); + } init_apic_state(apic); + v3_icc_register_apic(vm, icc, dev,apic->my_apic_id); + v3_hook_msr(vm, BASE_ADDR_MSR, read_apic_msr, write_apic_msr, dev); v3_hook_full_mem(vm, apic->base_addr, apic->base_addr + PAGE_SIZE_4KB, apic_read, apic_write, dev);