X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8259a.c;h=69707b901522115e36efdf0c84d8ac80a8c3719a;hb=6d6988cc9c8bac21d96afd800076afe0915cf2cd;hp=d1944f648b156278ddda636ba84edfdc872855b7;hpb=52e81251f82ccaf516e3ed626c8abbcc9fbe3f41;p=palacios.releases.git diff --git a/palacios/src/devices/8259a.c b/palacios/src/devices/8259a.c index d1944f6..69707b9 100644 --- a/palacios/src/devices/8259a.c +++ b/palacios/src/devices/8259a.c @@ -190,7 +190,7 @@ static void DumpPICState(struct pic_internal *p) } -static int pic_raise_intr(struct guest_info * info, void * private_data, int irq) { +static int pic_raise_intr(struct v3_vm_info * vm, void * private_data, int irq) { struct pic_internal * state = (struct pic_internal*)private_data; if (irq == 2) { @@ -209,13 +209,13 @@ static int pic_raise_intr(struct guest_info * info, void * private_data, int irq return -1; } - v3_interrupt_cpu(info, 0); + v3_interrupt_cpu(vm, 0, 0); return 0; } -static int pic_lower_intr(struct guest_info * info, void * private_data, int irq) { +static int pic_lower_intr(struct v3_vm_info * vm, void * private_data, int irq) { struct pic_internal * state = (struct pic_internal*)private_data; PrintDebug("[pic_lower_intr] IRQ line %d now low\n", irq); @@ -258,7 +258,7 @@ static int pic_get_intr_number(struct guest_info * info, void * private_data) { for (i = 0; i < 16; i++) { if (i <= 7) { - if (((state->master_irr & ~(state->master_imr)) >> i) == 0x01) { + if (((state->master_irr & ~(state->master_imr)) >> i) & 0x01) { //state->master_isr |= (0x1 << i); // reset the irr //state->master_irr &= ~(0x1 << i); @@ -267,23 +267,26 @@ static int pic_get_intr_number(struct guest_info * info, void * private_data) { break; } } else { - if (((state->slave_irr & ~(state->slave_imr)) >> (i - 8)) == 0x01) { + if (((state->slave_irr & ~(state->slave_imr)) >> (i - 8)) & 0x01) { //state->slave_isr |= (0x1 << (i - 8)); //state->slave_irr &= ~(0x1 << (i - 8)); PrintDebug("8259 PIC: IRQ: %d, slave_icw2: %x\n", i, state->slave_icw2); - irq= (i - 8) + state->slave_icw2; + irq = (i - 8) + state->slave_icw2; break; } } } +#if 1 if ((i == 15) || (i == 6)) { DumpPICState(state); } +#endif if (i == 16) { return -1; } else { + PrintDebug("8259 PIC: get num is returning %d\n",irq); return irq; } } @@ -305,19 +308,29 @@ static int pic_begin_irq(struct guest_info * info, void * private_data, int irq) } if (irq <= 7) { - if (((state->master_irr & ~(state->master_imr)) >> irq) == 0x01) { + // This should always be true: See pic_get_intr_number + if (((state->master_irr & ~(state->master_imr)) >> irq) & 0x01) { state->master_isr |= (0x1 << irq); if (!(state->master_elcr & (0x1 << irq))) { state->master_irr &= ~(0x1 << irq); } + } else { + PrintDebug("8259 PIC: (master) Ignoring begin_irq for %d since I don't own it\n",irq); } + } else { - state->slave_isr |= (0x1 << (irq - 8)); + // This should always be true: See pic_get_intr_number + if (((state->slave_irr & ~(state->slave_imr)) >> (irq - 8)) & 0x01) { + state->slave_isr |= (0x1 << (irq - 8)); + + if (!(state->slave_elcr & (0x1 << (irq - 8)))) { + state->slave_irr &= ~(0x1 << (irq - 8)); + } + } else { + PrintDebug("8259 PIC: (slave) Ignoring begin_irq for %d since I don't own it\n",irq); + } - if (!(state->slave_elcr & (0x1 << irq))) { - state->slave_irr &= ~(0x1 << (irq - 8)); - } } return 0; @@ -335,17 +348,17 @@ static int pic_begin_irq(struct guest_info * info, void * private_data, int irq) static struct intr_ctrl_ops intr_ops = { .intr_pending = pic_intr_pending, .get_intr_number = pic_get_intr_number, - .raise_intr = pic_raise_intr, - .begin_irq = pic_begin_irq, - .lower_intr = pic_lower_intr, - + .begin_irq = pic_begin_irq }; +static struct intr_router_ops router_ops = { + .raise_intr = pic_raise_intr, + .lower_intr = pic_lower_intr +}; - -static int read_master_port1(ushort_t port, void * dst, uint_t length, struct vm_device * dev) { - struct pic_internal * state = (struct pic_internal*)dev->private_data; +static int read_master_port1(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) { + struct pic_internal * state = (struct pic_internal *)priv_data; if (length != 1) { PrintError("8259 PIC: Invalid Read length (rd_Master1)\n"); @@ -363,8 +376,8 @@ static int read_master_port1(ushort_t port, void * dst, uint_t length, struct vm return 1; } -static int read_master_port2(ushort_t port, void * dst, uint_t length, struct vm_device * dev) { - struct pic_internal * state = (struct pic_internal*)dev->private_data; +static int read_master_port2(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) { + struct pic_internal * state = (struct pic_internal *)priv_data; if (length != 1) { PrintError("8259 PIC: Invalid Read length (rd_Master2)\n"); @@ -377,8 +390,8 @@ static int read_master_port2(ushort_t port, void * dst, uint_t length, struct vm } -static int read_slave_port1(ushort_t port, void * dst, uint_t length, struct vm_device * dev) { - struct pic_internal * state = (struct pic_internal*)dev->private_data; +static int read_slave_port1(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) { + struct pic_internal * state = (struct pic_internal *)priv_data; if (length != 1) { PrintError("8259 PIC: Invalid Read length (rd_Slave1)\n"); @@ -396,8 +409,8 @@ static int read_slave_port1(ushort_t port, void * dst, uint_t length, struct vm_ return 1; } -static int read_slave_port2(ushort_t port, void * dst, uint_t length, struct vm_device * dev) { - struct pic_internal * state = (struct pic_internal*)dev->private_data; +static int read_slave_port2(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) { + struct pic_internal * state = (struct pic_internal *)priv_data; if (length != 1) { PrintError("8259 PIC: Invalid Read length (rd_Slave2)\n"); @@ -410,8 +423,8 @@ static int read_slave_port2(ushort_t port, void * dst, uint_t length, struct vm_ } -static int write_master_port1(ushort_t port, void * src, uint_t length, struct vm_device * dev) { - struct pic_internal * state = (struct pic_internal*)dev->private_data; +static int write_master_port1(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) { + struct pic_internal * state = (struct pic_internal *)priv_data; uchar_t cw = *(uchar_t *)src; PrintDebug("8259 PIC: Write master port 1 with 0x%x\n",cw); @@ -421,6 +434,8 @@ static int write_master_port1(ushort_t port, void * src, uint_t length, struct v return -1; } + v3_clear_pending_intr(core); + if (IS_ICW1(cw)) { PrintDebug("8259 PIC: Setting ICW1 = %x (wr_Master1)\n", cw); @@ -449,7 +464,11 @@ static int write_master_port1(ushort_t port, void * src, uint_t length, struct v } } PrintDebug("8259 PIC: Post ISR = %x (wr_Master1)\n", state->master_isr); - } else { + } else if (!(cw2->EOI) && (cw2->R) && (cw2->SL)) { + PrintDebug("8259 PIC: Ignoring set-priority, priorities not implemented (level=%d, wr_Master1)\n", cw2->level); + } else if (!(cw2->EOI) && !(cw2->R) && (cw2->SL)) { + PrintDebug("8259 PIC: Ignoring no-op (level=%d, wr_Master1)\n", cw2->level); + } else { PrintError("8259 PIC: Command not handled, or in error (wr_Master1)\n"); return -1; } @@ -472,8 +491,8 @@ static int write_master_port1(ushort_t port, void * src, uint_t length, struct v return 1; } -static int write_master_port2(ushort_t port, void * src, uint_t length, struct vm_device * dev) { - struct pic_internal * state = (struct pic_internal*)dev->private_data; +static int write_master_port2(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) { + struct pic_internal * state = (struct pic_internal *)priv_data; uchar_t cw = *(uchar_t *)src; PrintDebug("8259 PIC: Write master port 2 with 0x%x\n",cw); @@ -483,12 +502,16 @@ static int write_master_port2(ushort_t port, void * src, uint_t length, struct v return -1; } + v3_clear_pending_intr(core); + if (state->master_state == ICW2) { struct icw1 * cw1 = (struct icw1 *)&(state->master_icw1); PrintDebug("8259 PIC: Setting ICW2 = %x (wr_Master2)\n", cw); state->master_icw2 = cw; + + if (cw1->sngl == 0) { state->master_state = ICW3; } else if (cw1->ic4 == 1) { @@ -497,6 +520,8 @@ static int write_master_port2(ushort_t port, void * src, uint_t length, struct v state->master_state = READY; } + + } else if (state->master_state == ICW3) { struct icw1 * cw1 = (struct icw1 *)&(state->master_icw1); @@ -527,8 +552,8 @@ static int write_master_port2(ushort_t port, void * src, uint_t length, struct v return 1; } -static int write_slave_port1(ushort_t port, void * src, uint_t length, struct vm_device * dev) { - struct pic_internal * state = (struct pic_internal*)dev->private_data; +static int write_slave_port1(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) { + struct pic_internal * state = (struct pic_internal *)priv_data; uchar_t cw = *(uchar_t *)src; PrintDebug("8259 PIC: Write slave port 1 with 0x%x\n",cw); @@ -539,6 +564,8 @@ static int write_slave_port1(ushort_t port, void * src, uint_t length, struct vm return -1; } + v3_clear_pending_intr(core); + if (IS_ICW1(cw)) { PrintDebug("8259 PIC: Setting ICW1 = %x (wr_Slave1)\n", cw); state->slave_icw1 = cw; @@ -586,8 +613,8 @@ static int write_slave_port1(ushort_t port, void * src, uint_t length, struct vm return 1; } -static int write_slave_port2(ushort_t port, void * src, uint_t length, struct vm_device * dev) { - struct pic_internal * state = (struct pic_internal*)dev->private_data; +static int write_slave_port2(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) { + struct pic_internal * state = (struct pic_internal *)priv_data; uchar_t cw = *(uchar_t *)src; PrintDebug("8259 PIC: Write slave port 2 with 0x%x\n",cw); @@ -597,6 +624,9 @@ static int write_slave_port2(ushort_t port, void * src, uint_t length, struct vm return -1; } + v3_clear_pending_intr(core); + + if (state->slave_state == ICW2) { struct icw1 * cw1 = (struct icw1 *)&(state->master_icw1); @@ -643,8 +673,8 @@ static int write_slave_port2(ushort_t port, void * src, uint_t length, struct vm -static int read_elcr_port(ushort_t port, void * dst, uint_t length, struct vm_device * dev) { - struct pic_internal * state = (struct pic_internal*)dev->private_data; +static int read_elcr_port(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) { + struct pic_internal * state = (struct pic_internal *)priv_data; if (length != 1) { PrintError("ELCR read of invalid length %d\n", length); @@ -665,8 +695,8 @@ static int read_elcr_port(ushort_t port, void * dst, uint_t length, struct vm_de } -static int write_elcr_port(ushort_t port, void * src, uint_t length, struct vm_device * dev) { - struct pic_internal * state = (struct pic_internal*)dev->private_data; +static int write_elcr_port(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) { + struct pic_internal * state = (struct pic_internal *)priv_data; if (length != 1) { PrintError("ELCR read of invalid length %d\n", length); @@ -691,12 +721,13 @@ static int write_elcr_port(ushort_t port, void * src, uint_t length, struct vm_d -static int pic_free(struct vm_device * dev) { - v3_dev_unhook_io(dev, MASTER_PORT1); - v3_dev_unhook_io(dev, MASTER_PORT2); - v3_dev_unhook_io(dev, SLAVE_PORT1); - v3_dev_unhook_io(dev, SLAVE_PORT2); +static int pic_free(struct pic_internal * state) { + + + // unregister intr_controller + // unregister intr router + V3_Free(state); return 0; } @@ -707,28 +738,38 @@ static int pic_free(struct vm_device * dev) { static struct v3_device_ops dev_ops = { - .free = pic_free, - .reset = NULL, - .start = NULL, - .stop = NULL, + .free = (int (*)(void *))pic_free, + }; -static int pic_init(struct guest_info * vm, void * cfg_data) { +#include + +static int pic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { struct pic_internal * state = NULL; + char * dev_id = v3_cfg_val(cfg, "ID"); + int ret = 0; + + // PIC is only usable in non-multicore environments + // just hardcode the core context + struct guest_info * core = &(vm->cores[0]); + state = (struct pic_internal *)V3_Malloc(sizeof(struct pic_internal)); + V3_ASSERT(state != NULL); - struct vm_device * dev = v3_allocate_device("8259A", &dev_ops, state); + struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, state); - if (v3_attach_device(vm, dev) == -1) { - PrintError("Could not attach device %s\n", "8259A"); + if (dev == NULL) { + PrintError("Could not add device %s\n", dev_id); + V3_Free(state); return -1; } - v3_register_intr_controller(vm, &intr_ops, state); + v3_register_intr_controller(core, &intr_ops, state); + v3_register_intr_router(vm, &router_ops, state); state->master_irr = 0; state->master_isr = 0; @@ -758,14 +799,20 @@ static int pic_init(struct guest_info * vm, void * cfg_data) { state->slave_state = ICW1; - v3_dev_hook_io(dev, MASTER_PORT1, &read_master_port1, &write_master_port1); - v3_dev_hook_io(dev, MASTER_PORT2, &read_master_port2, &write_master_port2); - v3_dev_hook_io(dev, SLAVE_PORT1, &read_slave_port1, &write_slave_port1); - v3_dev_hook_io(dev, SLAVE_PORT2, &read_slave_port2, &write_slave_port2); + ret |= v3_dev_hook_io(dev, MASTER_PORT1, &read_master_port1, &write_master_port1); + ret |= v3_dev_hook_io(dev, MASTER_PORT2, &read_master_port2, &write_master_port2); + ret |= v3_dev_hook_io(dev, SLAVE_PORT1, &read_slave_port1, &write_slave_port1); + ret |= v3_dev_hook_io(dev, SLAVE_PORT2, &read_slave_port2, &write_slave_port2); - v3_dev_hook_io(dev, ELCR1_PORT, &read_elcr_port, &write_elcr_port); - v3_dev_hook_io(dev, ELCR2_PORT, &read_elcr_port, &write_elcr_port); + ret |= v3_dev_hook_io(dev, ELCR1_PORT, &read_elcr_port, &write_elcr_port); + ret |= v3_dev_hook_io(dev, ELCR2_PORT, &read_elcr_port, &write_elcr_port); + + if (ret != 0) { + PrintError("Error hooking io ports\n"); + v3_remove_device(dev); + return -1; + } return 0; }