#include <palacios/vmm_msr.h>
-#ifndef DEBUG_APIC
+#ifndef CONFIG_DEBUG_APIC
#undef PrintDebug
#define PrintDebug(fmt, args...)
#endif
static int read_apic_msr(uint_t msr, v3_msr_t * dst, void * priv_data) {
struct vm_device * dev = (struct vm_device *)priv_data;
struct apic_state * apic = (struct apic_state *)dev->private_data;
- PrintError("READING APIC BASE ADDR: HI=%x LO=%x\n", apic->base_addr_msr.hi, apic->base_addr_msr.lo);
-
- return -1;
+ dst->value = apic->base_addr;
+ return 0;
}
*svc_location &= ~flag;
-#ifdef CRAY_XT
+#ifdef CONFIG_CRAY_XT
if ((isr_irq == 238) ||
(isr_irq == 239)) {
/* Interrupt Controller Functions */
// returns 1 if an interrupt is pending, 0 otherwise
-static int apic_intr_pending(void * private_data) {
+static int apic_intr_pending(struct guest_info * info, void * private_data) {
struct vm_device * dev = (struct vm_device *)private_data;
struct apic_state * apic = (struct apic_state *)dev->private_data;
int req_irq = get_highest_irr(apic);
return 0;
}
-static int apic_get_intr_number(void * private_data) {
+static int apic_get_intr_number(struct guest_info * info, void * private_data) {
struct vm_device * dev = (struct vm_device *)private_data;
struct apic_state * apic = (struct apic_state *)dev->private_data;
int req_irq = get_highest_irr(apic);
return -1;
}
-static int apic_raise_intr(void * private_data, int irq) {
-#ifdef CRAY_XT
+static int apic_raise_intr(struct guest_info * info, void * private_data, int irq) {
+#ifdef CONFIG_CRAY_XT
// The Seastar is connected directly to the LAPIC via LINT0 on the ICC bus
if (irq == 238) {
return activate_apic_irq(apic, irq);
}
#endif
+
return 0;
}
-static int apic_lower_intr(void * private_data, int irq) {
+static int apic_lower_intr(struct guest_info * info, void * private_data, int irq) {
return 0;
}
-static int apic_begin_irq(void * private_data, int irq) {
+static int apic_begin_irq(struct guest_info * info, void * private_data, int irq) {
struct vm_device * dev = (struct vm_device *)private_data;
struct apic_state * apic = (struct apic_state *)dev->private_data;
int major_offset = (irq & ~0x00000007) >> 3;
*svc_location |= flag;
*req_location &= ~flag;
-#ifdef CRAY_XT
+#ifdef CONFIG_CRAY_XT
if ((irq == 238) || (irq == 239)) {
PrintError("APIC: Begin IRQ %d (ISR=%x), (IRR=%x)\n", irq, *svc_location, *req_location);
}
-int v3_apic_raise_intr(struct vm_device * apic_dev, int intr_num) {
+int v3_apic_raise_intr(struct guest_info * info, struct vm_device * apic_dev, int intr_num) {
struct apic_state * apic = (struct apic_state *)apic_dev->private_data;
- return activate_apic_irq(apic, intr_num);
+
+ if (activate_apic_irq(apic, intr_num) == -1) {
+ PrintError("Error: Could not activate apic_irq\n");
+ return -1;
+ }
+
+ return 0;
}
PrintDebug("Raising APIC Timer interrupt (periodic=%d) (icnt=%d) (div=%d)\n",
apic->tmr_vec_tbl.tmr_mode, apic->tmr_init_cnt, shift_num);
- if (apic_intr_pending(priv_data)) {
+ if (apic_intr_pending(dev->vm, priv_data)) {
PrintDebug("Overriding pending IRQ %d\n", apic_get_intr_number(priv_data));
}