X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fio_apic.c;h=506b7af745074fe40eb13d973f68c1e872e7bf06;hb=a02f23087d0ea3df6dbd494de90754b3302ee9a5;hp=3bd5902e3a03e779861a345f9c0dff7b27f31088;hpb=19b2e4b4ce85ae4e683a3ede33360bdf7547b069;p=palacios.git diff --git a/palacios/src/devices/io_apic.c b/palacios/src/devices/io_apic.c index 3bd5902..506b7af 100644 --- a/palacios/src/devices/io_apic.c +++ b/palacios/src/devices/io_apic.c @@ -21,7 +21,7 @@ #include #include #include - +#include #ifndef CONFIG_DEBUG_IO_APIC #undef PrintDebug @@ -135,18 +135,17 @@ 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; + struct vm_device * apic_dev; }; -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 +154,20 @@ 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) { +static int ioapic_read(struct guest_info * core, 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); 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 +183,51 @@ 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) { +static int ioapic_write(struct guest_info * core, 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); 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 +235,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.val, 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,50 +260,46 @@ 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(struct guest_info * info, void * private_data) { - return 0; -} - - -static int ioapic_get_intr_number(struct guest_info * info, void * private_data) { - return 0; -} - -static int ioapic_begin_irq(struct guest_info * info, void * private_data, int irq) { - return 0; -} -static int ioapic_raise_irq(struct guest_info * info, void * private_data, int irq) { +static int ioapic_raise_irq(struct v3_vm_info * vm, 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); 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(info, ioapic->apic, irq_entry->vec); + + PrintDebug("ioapic %u: IOAPIC Signalling APIC to raise INTR %d\n", + ioapic->ioapic_id.id, irq_entry->vec); + + + // May need these for future reference + // icr.val = irq_entry->val; + // icr.trig_mode = irq_entry->trig_mode; + + PrintDebug("io apic: raising irq %u\n", irq); + + // Need to add destination argument here... + v3_apic_raise_intr(vm, ioapic->apic_dev, irq, irq_entry->vec); + } return 0; } /* I don't know if we can do anything here.... */ -static int ioapic_lower_irq(struct guest_info * info, 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, }; @@ -319,33 +322,31 @@ static struct v3_device_ops dev_ops = { -static int ioapic_init(struct guest_info * vm, void * cfg_data) { - struct vm_device * apic = v3_find_dev(vm, (char *)cfg_data); +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"); - if (!apic) { - PrintError("Could not locate APIC device (%s)\n", (char *)cfg_data); - return -1; - } - PrintDebug("Creating IO APIC\n"); + 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; + ioapic->apic_dev = apic_dev; - struct vm_device * dev = v3_allocate_device("IOAPIC", &dev_ops, ioapic); + struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, ioapic); if (v3_attach_device(vm, dev) == -1) { - PrintError("Could not attach device %s\n", "IOAPIC"); + PrintError("ioapic: Could not attach device %s\n", dev_id); return -1; } - v3_register_intr_controller(vm, &intr_ops, dev); - init_ioapic_state(ioapic); + v3_register_intr_router(vm, &router_ops, dev); + + init_ioapic_state(ioapic,vm->num_cores); - v3_hook_full_mem(vm, ioapic->base_addr, ioapic->base_addr + PAGE_SIZE_4KB, + v3_hook_full_mem(vm, V3_MEM_CORE_ANY, ioapic->base_addr, ioapic->base_addr + PAGE_SIZE_4KB, ioapic_read, ioapic_write, dev); return 0;