X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fio_apic.c;h=0817e9beaa811071fb7d1023f4672ecd04525fa9;hb=5d1bbcc86de011e3f0d115b6f10fd8645cdf855e;hp=1e032b6c68437c5a1f3b4867f1b79b3c764f00ba;hpb=c0a5974089157e1a5ea18ea443fab587c577296a;p=palacios.git diff --git a/palacios/src/devices/io_apic.c b/palacios/src/devices/io_apic.c index 1e032b6..0817e9b 100644 --- a/palacios/src/devices/io_apic.c +++ b/palacios/src/devices/io_apic.c @@ -17,13 +17,13 @@ * redistribute, and modify it as specified in the file "V3VEE_LICENSE". */ -#include -#include +#include +#include #include +#include - -#ifndef DEBUG_IO_APIC +#ifndef V3_CONFIG_DEBUG_IO_APIC #undef PrintDebug #define PrintDebug(fmt, args...) #endif @@ -135,18 +135,21 @@ struct io_apic_state { struct redir_tbl_entry redir_tbl[24]; - // This is a temporary method of communication between the IOAPIC and the LAPIC - struct vm_device * apic; + void * apic_dev_data; + + void * router_handle; + + struct v3_vm_info * vm; }; -static void init_ioapic_state(struct io_apic_state * ioapic) { +static void init_ioapic_state(struct io_apic_state * ioapic, uint32_t id) { int i = 0; ioapic->base_addr = IO_APIC_BASE_ADDR; ioapic->index_reg = 0; - ioapic->ioapic_id.val = 0x00000000; + ioapic->ioapic_id.id = id; ioapic->ioapic_ver.val = 0x00170011; ioapic->ioapic_arb_id.val = 0x00000000; @@ -155,16 +158,19 @@ static void init_ioapic_state(struct io_apic_state * ioapic) { // Mask all interrupts until they are enabled.... ioapic->redir_tbl[i].mask = 1; } + + // special case redir_tbl[0] for pin 0 as ExtInt for Virtual Wire Mode + // ioapic->redir_tbl[0].del_mode=EXTINT; + // ioapic->redir_tbl[0].mask=0; } -static int ioapic_read(addr_t guest_addr, void * dst, uint_t length, void * priv_data) { - struct vm_device * dev = (struct vm_device *)priv_data; - struct io_apic_state * ioapic = (struct io_apic_state *)(dev->private_data); +static int ioapic_read(struct guest_info * core, addr_t guest_addr, void * dst, uint_t length, void * priv_data) { + struct io_apic_state * ioapic = (struct io_apic_state *)(priv_data); uint32_t reg_tgt = guest_addr - ioapic->base_addr; uint32_t * op_val = (uint32_t *)dst; - PrintDebug("IOAPIC Read at %p\n", (void *)guest_addr); + PrintDebug("ioapic %u: IOAPIC Read at %p\n", ioapic->ioapic_id.id, (void *)guest_addr); if (reg_tgt == 0x00) { *op_val = ioapic->index_reg; @@ -180,47 +186,50 @@ static int ioapic_read(addr_t guest_addr, void * dst, uint_t length, void * priv case IOAPIC_ARB_REG: *op_val = ioapic->ioapic_arb_id.val; break; - default: - { - uint_t redir_index = (ioapic->index_reg - IOAPIC_REDIR_BASE_REG) >> 1; - uint_t hi_val = (ioapic->index_reg - IOAPIC_REDIR_BASE_REG) % 1; - - if (redir_index > 0x3f) { - PrintError("Invalid redirection table entry %x\n", (uint32_t)redir_index); - return -1; - } - if (hi_val) { - *op_val = ioapic->redir_tbl[redir_index].hi; - } else { - *op_val = ioapic->redir_tbl[redir_index].lo; - } + default: { + uint_t redir_index = (ioapic->index_reg - IOAPIC_REDIR_BASE_REG) >> 1; + uint_t hi_val = (ioapic->index_reg - IOAPIC_REDIR_BASE_REG) & 1; + + if (redir_index > 0x3f) { + PrintError("ioapic %u: Invalid redirection table entry %x\n", ioapic->ioapic_id.id, (uint32_t)redir_index); + return -1; } + + if (hi_val) { + *op_val = ioapic->redir_tbl[redir_index].hi; + } else { + *op_val = ioapic->redir_tbl[redir_index].lo; + } + } } } + PrintDebug("ioapic %u: IOAPIC Read at %p gave value 0x%x\n", ioapic->ioapic_id.id, (void *)guest_addr, *op_val); + return length; } -static int ioapic_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) { - struct vm_device * dev = (struct vm_device *)priv_data; - struct io_apic_state * ioapic = (struct io_apic_state *)(dev->private_data); +static int ioapic_write(struct guest_info * core, addr_t guest_addr, void * src, uint_t length, void * priv_data) { + struct io_apic_state * ioapic = (struct io_apic_state *)(priv_data); uint32_t reg_tgt = guest_addr - ioapic->base_addr; uint32_t op_val = *(uint32_t *)src; - PrintDebug("IOAPIC Write at %p (val = %d)\n", (void *)guest_addr, *(uint32_t *)src); + PrintDebug("ioapic %u: IOAPIC Write at %p (val = %d)\n", ioapic->ioapic_id.id, (void *)guest_addr, *(uint32_t *)src); if (reg_tgt == 0x00) { + PrintDebug("ioapic %u: Setting ioapic index register to 0x%x.\n", ioapic->ioapic_id.id, op_val); ioapic->index_reg = op_val; } else if (reg_tgt == 0x10) { // IOWIN register switch (ioapic->index_reg) { case IOAPIC_ID_REG: + // What does this do to our relationship with the ICC bus? ioapic->ioapic_id.val = op_val; break; case IOAPIC_VER_REG: // GPF/PageFault/Ignore? - PrintError("Writing to read only IOAPIC register\n"); + PrintError("ioapic %u: Writing to read only IOAPIC register\n", ioapic->ioapic_id.id); return -1; case IOAPIC_ARB_REG: ioapic->ioapic_arb_id.val = op_val; @@ -228,20 +237,20 @@ static int ioapic_write(addr_t guest_addr, void * src, uint_t length, void * pri default: { uint_t redir_index = (ioapic->index_reg - IOAPIC_REDIR_BASE_REG) >> 1; - uint_t hi_val = (ioapic->index_reg - IOAPIC_REDIR_BASE_REG) % 1; - - + uint_t hi_val = (ioapic->index_reg - IOAPIC_REDIR_BASE_REG) & 1; + PrintDebug("ioapic %u: Writing value 0x%x to redirection entry %u (%s)\n", + ioapic->ioapic_id.id, op_val, redir_index, hi_val ? "hi" : "low"); if (redir_index > 0x3f) { - PrintError("Invalid redirection table entry %x\n", (uint32_t)redir_index); + PrintError("ioapic %u: Invalid redirection table entry %x\n", ioapic->ioapic_id.id, (uint32_t)redir_index); return -1; } if (hi_val) { - PrintDebug("Writing to hi of pin %d\n", redir_index); + PrintDebug("ioapic %u: Writing to hi of pin %d\n", ioapic->ioapic_id.id, redir_index); ioapic->redir_tbl[redir_index].hi = op_val; } else { - PrintDebug("Writing to lo of pin %d\n", redir_index); + PrintDebug("ioapic %u: Writing to lo of pin %d\n", ioapic->ioapic_id.id, redir_index); op_val &= REDIR_LO_MASK; ioapic->redir_tbl[redir_index].lo &= ~REDIR_LO_MASK; ioapic->redir_tbl[redir_index].lo |= op_val; @@ -253,92 +262,138 @@ static int ioapic_write(addr_t guest_addr, void * src, uint_t length, void * pri return length; } -/* Interrupt controller functions */ -static int ioapic_intr_pending(void * private_data) { - return 0; -} - -static int ioapic_get_intr_number(void * private_data) { - return 0; -} - -static int ioapic_begin_irq(void * private_data, int irq) { - return 0; -} - -static int ioapic_raise_irq(void * private_data, int irq) { - struct vm_device * dev = (struct vm_device *)private_data; - struct io_apic_state * ioapic = (struct io_apic_state *)(dev->private_data); +static int ioapic_raise_irq(struct v3_vm_info * vm, void * private_data, int irq) { + struct io_apic_state * ioapic = (struct io_apic_state *)(private_data); struct redir_tbl_entry * irq_entry = NULL; if (irq > 24) { - PrintDebug("IRQ out of range of IO APIC\n"); + PrintDebug("ioapic %u: IRQ out of range of IO APIC\n", ioapic->ioapic_id.id); return -1; } irq_entry = &(ioapic->redir_tbl[irq]); if (irq_entry->mask == 0) { - PrintDebug("IOAPIC Signalling APIC to raise INTR %d\n", irq_entry->vec); - v3_apic_raise_intr(ioapic->apic, irq_entry->vec); + struct v3_gen_ipi ipi; + + PrintDebug("ioapic %u: IOAPIC Signaling APIC to raise INTR %d\n", + ioapic->ioapic_id.id, irq_entry->vec); + + + ipi.vector = irq_entry->vec; + ipi.mode = irq_entry->del_mode; + ipi.logical = irq_entry->dst_mode; + ipi.trigger_mode = irq_entry->trig_mode; + ipi.dst = irq_entry->dst_field; + ipi.dst_shorthand = 0; + + + PrintDebug("ioapic %u: IPI: vector 0x%x, mode 0x%x, logical 0x%x, trigger 0x%x, dst 0x%x, shorthand 0x%x\n", + ioapic->ioapic_id.id, ipi.vector, ipi.mode, ipi.logical, ipi.trigger_mode, ipi.dst, ipi.dst_shorthand); + // Need to add destination argument here... + if (v3_apic_send_ipi(vm, &ipi, ioapic->apic_dev_data) == -1) { + PrintError("Error sending IPI to apic %d\n", ipi.dst); + return -1; + } } return 0; } /* I don't know if we can do anything here.... */ -static int ioapic_lower_irq(void * private_data, int irq) { +static int ioapic_lower_irq(struct v3_vm_info * vm, void * private_data, int irq) { return 0; } -static struct intr_ctrl_ops intr_ops = { - .intr_pending = ioapic_intr_pending, - .get_intr_number = ioapic_get_intr_number, +static struct intr_router_ops router_ops = { .raise_intr = ioapic_raise_irq, - .begin_irq = ioapic_begin_irq, .lower_intr = ioapic_lower_irq, }; -static int io_apic_init(struct vm_device * dev) { - struct guest_info * info = dev->vm; - struct io_apic_state * ioapic = (struct io_apic_state *)(dev->private_data); - v3_register_intr_controller(dev->vm, &intr_ops, dev); - init_ioapic_state(ioapic); - v3_hook_full_mem(info, ioapic->base_addr, ioapic->base_addr + PAGE_SIZE_4KB, - ioapic_read, ioapic_write, dev); - +static int io_apic_free(struct io_apic_state * ioapic) { + + v3_remove_intr_router(ioapic->vm, ioapic->router_handle); + + // unhook memory + + V3_Free(ioapic); + return 0; } +#ifdef V3_CONFIG_CHECKPOINT +static int io_apic_save(struct v3_chkpt_ctx * ctx, void * private_data) { + struct io_apic_state * io_apic = (struct io_apic_state *)private_data; -static int io_apic_deinit(struct vm_device * dev) { - // struct guest_info * info = dev->vm; + V3_CHKPT_STD_SAVE(ctx, io_apic->base_addr); + V3_CHKPT_STD_SAVE(ctx, io_apic->index_reg); + V3_CHKPT_STD_SAVE(ctx, io_apic->ioapic_id); + V3_CHKPT_STD_SAVE(ctx, io_apic->ioapic_ver); + V3_CHKPT_STD_SAVE(ctx, io_apic->ioapic_arb_id); + V3_CHKPT_STD_SAVE(ctx, io_apic->redir_tbl); return 0; } +static int io_apic_load(struct v3_chkpt_ctx * ctx, void * private_data) { + struct io_apic_state * io_apic = (struct io_apic_state *)private_data; + + V3_CHKPT_STD_LOAD(ctx, io_apic->base_addr); + V3_CHKPT_STD_LOAD(ctx, io_apic->index_reg); + V3_CHKPT_STD_LOAD(ctx, io_apic->ioapic_id); + V3_CHKPT_STD_LOAD(ctx, io_apic->ioapic_ver); + V3_CHKPT_STD_LOAD(ctx, io_apic->ioapic_arb_id); + V3_CHKPT_STD_LOAD(ctx, io_apic->redir_tbl); + + return 0; +} +#endif + -static struct vm_device_ops dev_ops = { - .init = io_apic_init, - .deinit = io_apic_deinit, - .reset = NULL, - .start = NULL, - .stop = NULL, + +static struct v3_device_ops dev_ops = { + .free = (int (*)(void *))io_apic_free, +#ifdef V3_CONFIG_CHECKPOINT + .save = io_apic_save, + .load = io_apic_load +#endif }; -struct vm_device * v3_create_io_apic(struct vm_device * apic) { - PrintDebug("Creating IO APIC\n"); +static int ioapic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { + struct vm_device * apic_dev = v3_find_dev(vm, v3_cfg_val(cfg, "apic")); + char * dev_id = v3_cfg_val(cfg, "ID"); + + + PrintDebug("ioapic: Creating IO APIC\n"); struct io_apic_state * ioapic = (struct io_apic_state *)V3_Malloc(sizeof(struct io_apic_state)); - ioapic->apic = apic; - struct vm_device * device = v3_create_device("IOAPIC", &dev_ops, ioapic); + ioapic->apic_dev_data = apic_dev; + + struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, ioapic); + + if (dev == NULL) { + PrintError("ioapic: Could not attach device %s\n", dev_id); + V3_Free(ioapic); + return -1; + } + + ioapic->router_handle = v3_register_intr_router(vm, &router_ops, ioapic); + ioapic->vm = vm; - return device; + init_ioapic_state(ioapic, vm->num_cores); + + v3_hook_full_mem(vm, V3_MEM_CORE_ANY, ioapic->base_addr, ioapic->base_addr + PAGE_SIZE_4KB, + ioapic_read, ioapic_write, ioapic); + + return 0; } + + +device_register("IOAPIC", ioapic_init)