#include <palacios/vmm.h>
#include <palacios/vmm_dev_mgr.h>
-#include <devices/icc_bus.h>
-#include <devices/apic_regs.h>
+#include <devices/apic.h>
#include <palacios/vm_guest.h>
-#ifndef CONFIG_DEBUG_IO_APIC
+#ifndef V3_CONFIG_DEBUG_IO_APIC
#undef PrintDebug
#define PrintDebug(fmt, args...)
#endif
struct redir_tbl_entry redir_tbl[24];
- struct vm_device * icc_bus;
+ void * apic_dev_data;
+
+ void * router_handle;
+
+ struct v3_vm_info * vm;
};
}
// 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;
}
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;
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;
+ 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);
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;
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
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.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);
+ 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);
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) {
irq_entry = &(ioapic->redir_tbl[irq]);
if (irq_entry->mask == 0) {
+ 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: 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;
- PrintDebug("io apic %u: raising irq %u on ICC bus.\n",
- ioapic->ioapic_id.id, irq);
- v3_icc_send_ipi(ioapic->icc_bus, ioapic->ioapic_id.id,icr.val, irq);
+ 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;
-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
};
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"));
+ 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_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);
-
- v3_icc_register_ioapic(vm,icc_bus,ioapic->ioapic_id.id);
+ 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;
}
