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=ad238f32ff0441a16bb089f2fddf45832f62e8a9;hpb=0c31bb41ac41d04a891a6eeff5bae398fa89b419;p=palacios.git diff --git a/palacios/src/devices/io_apic.c b/palacios/src/devices/io_apic.c index ad238f3..506b7af 100644 --- a/palacios/src/devices/io_apic.c +++ b/palacios/src/devices/io_apic.c @@ -20,8 +20,7 @@ #include #include -#include -#include +#include #include #ifndef CONFIG_DEBUG_IO_APIC @@ -136,7 +135,7 @@ struct io_apic_state { struct redir_tbl_entry redir_tbl[24]; - struct vm_device * icc_bus; + struct vm_device * apic_dev; }; @@ -146,7 +145,7 @@ static void init_ioapic_state(struct io_apic_state * ioapic, uint32_t id) { ioapic->base_addr = IO_APIC_BASE_ADDR; ioapic->index_reg = 0; - ioapic->ioapic_id.val = id; + ioapic->ioapic_id.id = id; ioapic->ioapic_ver.val = 0x00170011; ioapic->ioapic_arb_id.val = 0x00000000; @@ -157,8 +156,8 @@ static void init_ioapic_state(struct io_apic_state * ioapic, uint32_t id) { } // 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; + // ioapic->redir_tbl[0].del_mode=EXTINT; + // ioapic->redir_tbl[0].mask=0; } @@ -168,7 +167,7 @@ static int ioapic_read(struct guest_info * core, addr_t guest_addr, void * dst, uint32_t reg_tgt = guest_addr - ioapic->base_addr; uint32_t * op_val = (uint32_t *)dst; - PrintDebug("ioapic %u: IOAPIC Read at %p\n", ioapic->ioapic_id.val, (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; @@ -184,25 +183,25 @@ static int ioapic_read(struct guest_info * core, addr_t guest_addr, void * dst, 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("ioapic %u: Invalid redirection table entry %x\n", ioapic->ioapic_id.val, (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.val, (void *)guest_addr, *op_val); + PrintDebug("ioapic %u: IOAPIC Read at %p gave value 0x%x\n", ioapic->ioapic_id.id, (void *)guest_addr, *op_val); return length; } @@ -214,19 +213,21 @@ static int ioapic_write(struct guest_info * core, addr_t guest_addr, void * src, uint32_t reg_tgt = guest_addr - ioapic->base_addr; uint32_t op_val = *(uint32_t *)src; - PrintDebug("ioapic %u: IOAPIC Write at %p (val = %d)\n", ioapic->ioapic_id.val, (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("ioapic %u: Writing to read only IOAPIC register\n", ioapic->ioapic_id.val); + 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; @@ -234,20 +235,20 @@ static int ioapic_write(struct guest_info * core, addr_t guest_addr, void * src, 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("ioapic %u: Invalid redirection table entry %x\n", ioapic->ioapic_id.val, (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("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("ioapic %u: Writing to lo of pin %d\n", ioapic->ioapic_id.val, 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; @@ -266,7 +267,7 @@ static int ioapic_raise_irq(struct v3_vm_info * vm, void * private_data, int irq struct redir_tbl_entry * irq_entry = NULL; if (irq > 24) { - PrintDebug("ioapic %u: IRQ out of range of IO APIC\n", ioapic->ioapic_id.val); + PrintDebug("ioapic %u: IRQ out of range of IO APIC\n", ioapic->ioapic_id.id); return -1; } @@ -274,24 +275,19 @@ static int ioapic_raise_irq(struct v3_vm_info * vm, void * private_data, int irq if (irq_entry->mask == 0) { - PrintDebug("ioapic %u: IOAPIC Signalling APIC to raise INTR %d\n", ioapic->ioapic_id.val, irq_entry->vec); + PrintDebug("ioapic %u: IOAPIC Signalling APIC to raise INTR %d\n", + ioapic->ioapic_id.id, irq_entry->vec); - - // the format of the redirection table entry is just slightly - // different than that of the lapic's cmd register, which is the other - // way an IPI is initiated. So we will translate - // - struct int_cmd_reg icr; - icr.val = irq_entry->val; - icr.rsvd1=0; - icr.lvl=1; - icr.trig_mode=irq_entry->trig_mode; - icr.rem_rd_status=0; - icr.dst_shorthand=0; // no shorthand - icr.rsvd2=0; - - v3_icc_send_ipi(ioapic->icc_bus, ioapic->ioapic_id.val,icr.val, irq); + // 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; @@ -327,25 +323,21 @@ static struct v3_device_ops dev_ops = { static int ioapic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { - struct vm_device * icc_bus = v3_find_dev(vm, v3_cfg_val(cfg, "bus")); - char * name = v3_cfg_val(cfg, "name"); + struct vm_device * apic_dev = v3_find_dev(vm, v3_cfg_val(cfg, "apic")); + char * dev_id = v3_cfg_val(cfg, "ID"); - if (!icc_bus) { - PrintError("ioapic: Could not locate ICC BUS device (%s)\n", v3_cfg_val(cfg, "bus")); - return -1; - } PrintDebug("ioapic: Creating IO APIC\n"); struct io_apic_state * ioapic = (struct io_apic_state *)V3_Malloc(sizeof(struct io_apic_state)); - ioapic->icc_bus = icc_bus; + ioapic->apic_dev = apic_dev; - struct vm_device * dev = v3_allocate_device(name, &dev_ops, ioapic); + struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, ioapic); if (v3_attach_device(vm, dev) == -1) { - PrintError("ioapic: Could not attach device %s\n", name); + PrintError("ioapic: Could not attach device %s\n", dev_id); return -1; } @@ -354,8 +346,6 @@ static int ioapic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { init_ioapic_state(ioapic,vm->num_cores); - v3_icc_register_ioapic(vm,icc_bus,ioapic->ioapic_id.val); - v3_hook_full_mem(vm, V3_MEM_CORE_ANY, ioapic->base_addr, ioapic->base_addr + PAGE_SIZE_4KB, ioapic_read, ioapic_write, dev);