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=c725e86a7433d28084a1c49aac4e763e0903de9b;hpb=f40945e5a406b48b7b5ee678a3d8d8f0b56f7d74;p=palacios.git diff --git a/palacios/src/devices/io_apic.c b/palacios/src/devices/io_apic.c index c725e86..0817e9b 100644 --- a/palacios/src/devices/io_apic.c +++ b/palacios/src/devices/io_apic.c @@ -23,7 +23,7 @@ #include #include -#ifndef CONFIG_DEBUG_IO_APIC +#ifndef V3_CONFIG_DEBUG_IO_APIC #undef PrintDebug #define PrintDebug(fmt, args...) #endif @@ -135,7 +135,11 @@ struct io_apic_state { struct redir_tbl_entry redir_tbl[24]; - struct vm_device * apic_dev; + void * apic_dev_data; + + void * router_handle; + + struct v3_vm_info * vm; }; @@ -162,8 +166,7 @@ static void init_ioapic_state(struct io_apic_state * ioapic, uint32_t id) { 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); + 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; @@ -208,8 +211,7 @@ static int ioapic_read(struct guest_info * core, addr_t guest_addr, void * dst, 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); + 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; @@ -245,7 +247,7 @@ static int ioapic_write(struct guest_info * core, addr_t guest_addr, void * src, return -1; } if (hi_val) { - PrintDebug("ioapic %u: Writing to hi of pin %d\n", ioapic->ioapic_id.val, 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("ioapic %u: Writing to lo of pin %d\n", ioapic->ioapic_id.id, redir_index); @@ -262,8 +264,7 @@ static int ioapic_write(struct guest_info * core, addr_t guest_addr, void * src, 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 io_apic_state * ioapic = (struct io_apic_state *)(private_data); struct redir_tbl_entry * irq_entry = NULL; if (irq > 24) { @@ -276,7 +277,7 @@ static int ioapic_raise_irq(struct v3_vm_info * vm, void * private_data, int irq if (irq_entry->mask == 0) { struct v3_gen_ipi ipi; - PrintDebug("ioapic %u: IOAPIC Signalling APIC to raise INTR %d\n", + PrintDebug("ioapic %u: IOAPIC Signaling APIC to raise INTR %d\n", ioapic->ioapic_id.id, irq_entry->vec); @@ -284,11 +285,17 @@ static int ioapic_raise_irq(struct v3_vm_info * vm, void * private_data, int irq 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; + 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... - v3_apic_send_ipi(vm, ioapic->apic_dev, &ipi); + 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; @@ -307,18 +314,53 @@ static struct intr_router_ops router_ops = { -static int io_apic_free(struct vm_device * dev) { - // struct guest_info * info = dev->vm; +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; + + 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 v3_device_ops dev_ops = { - .free = io_apic_free, - .reset = NULL, - .start = NULL, - .stop = NULL, + .free = (int (*)(void *))io_apic_free, +#ifdef V3_CONFIG_CHECKPOINT + .save = io_apic_save, + .load = io_apic_load +#endif }; @@ -332,23 +374,23 @@ static int ioapic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { struct io_apic_state * ioapic = (struct io_apic_state *)V3_Malloc(sizeof(struct io_apic_state)); - ioapic->apic_dev = apic_dev; + ioapic->apic_dev_data = apic_dev; - struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, ioapic); + struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, ioapic); - - if (v3_attach_device(vm, dev) == -1) { + 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; - v3_register_intr_router(vm, &router_ops, dev); - - init_ioapic_state(ioapic,vm->num_cores); + 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, dev); + ioapic_read, ioapic_write, ioapic); return 0; }