#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
struct redir_tbl_entry redir_tbl[24];
- struct vm_device * icc_bus;
+ struct vm_device * apic_dev;
};
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);
irq_entry = &(ioapic->redir_tbl[irq]);
if (irq_entry->mask == 0) {
+ struct v3_gen_ipi ipi;
- 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;
-
- // Note: 0 yhere is "cluster model", but it should be irrelevant
- // since we are sending this as a physical destination
- 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, 0, irq);
+ PrintDebug("ioapic %u: IOAPIC Signalling 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;
+
+ // Need to add destination argument here...
+ if (v3_apic_send_ipi(vm, ioapic->apic_dev, &ipi) == -1) {
+ PrintError("Error sending IPI to apic %d\n", ipi.dst);
+ return -1;
+ }
}
return 0;
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 = apic_dev;
struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, ioapic);
init_ioapic_state(ioapic,vm->num_cores);
- v3_icc_register_ioapic(vm,icc_bus,ioapic->ioapic_id.id);
-
v3_hook_full_mem(vm, V3_MEM_CORE_ANY, ioapic->base_addr, ioapic->base_addr + PAGE_SIZE_4KB,
ioapic_read, ioapic_write, dev);