X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8259a.c;h=1d47e73d56b1ee896f12612f5aee845ab0312ec8;hb=82b8b87c344fcd1eab22e3f3be5ad54cbb3f8f68;hp=03b8a555365911d5325c27ebe764bbe9c9fd71e4;hpb=4bc3ee757b44d3e466fd89e348106c47fa5511ee;p=palacios.git diff --git a/palacios/src/devices/8259a.c b/palacios/src/devices/8259a.c index 03b8a55..1d47e73 100644 --- a/palacios/src/devices/8259a.c +++ b/palacios/src/devices/8259a.c @@ -18,12 +18,13 @@ */ -#include + #include #include #include +#include -#ifndef DEBUG_PIC +#ifndef CONFIG_DEBUG_PIC #undef PrintDebug #define PrintDebug(fmt, args...) #endif @@ -36,6 +37,10 @@ static const uint_t MASTER_PORT2 = 0x21; static const uint_t SLAVE_PORT1 = 0xA0; static const uint_t SLAVE_PORT2 = 0xA1; +static const uint_t ELCR1_PORT = 0x4d0; +static const uint_t ELCR2_PORT = 0x4d1; + + #define IS_ICW1(x) (((x & 0x10) >> 4) == 0x1) #define IS_OCW2(x) (((x & 0x18) >> 3) == 0x0) #define IS_OCW3(x) (((x & 0x18) >> 3) == 0x1) @@ -124,6 +129,11 @@ struct pic_internal { uchar_t master_isr; uchar_t slave_isr; + uchar_t master_elcr; + uchar_t slave_elcr; + uchar_t master_elcr_mask; + uchar_t slave_elcr_mask; + uchar_t master_icw1; uchar_t master_icw2; uchar_t master_icw3; @@ -195,7 +205,7 @@ static int pic_raise_intr(void * private_data, int irq) { } else if ((irq > 7) && (irq < 16)) { state->slave_irr |= 0x01 << (irq - 8); // PAD if -7 then irq 15=no irq } else { - PrintError("8259 PIC: Invalid IRQ raised (%d)\n", irq); + PrintDebug("8259 PIC: Invalid IRQ raised (%d)\n", irq); return -1; } @@ -252,7 +262,7 @@ static int pic_get_intr_number(void * private_data) { // reset the irr //state->master_irr &= ~(0x1 << i); PrintDebug("8259 PIC: IRQ: %d, master_icw2: %x\n", i, state->master_icw2); - irq= i + state->master_icw2; + irq = i + state->master_icw2; break; } } else { @@ -260,7 +270,7 @@ static int pic_get_intr_number(void * private_data) { //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; } } @@ -296,11 +306,17 @@ static int pic_begin_irq(void * private_data, int irq) { if (irq <= 7) { if (((state->master_irr & ~(state->master_imr)) >> irq) == 0x01) { state->master_isr |= (0x1 << irq); - state->master_irr &= ~(0x1 << irq); + + if (!(state->master_elcr & (0x1 << irq))) { + state->master_irr &= ~(0x1 << irq); + } } } else { state->slave_isr |= (0x1 << (irq - 8)); - state->slave_irr &= ~(0x1 << (irq - 8)); + + if (!(state->slave_elcr & (0x1 << irq))) { + state->slave_irr &= ~(0x1 << (irq - 8)); + } } return 0; @@ -531,7 +547,7 @@ static int write_slave_port1(ushort_t port, void * src, uint_t length, struct vm struct ocw2 * cw2 = (struct ocw2 *)&cw; PrintDebug("8259 PIC: Setting OCW2 = %x (wr_Slave1)\n", cw); - + if ((cw2->EOI) && (!cw2->R) && (cw2->SL)) { // specific EOI; state->slave_isr &= ~(0x01 << cw2->level); @@ -544,7 +560,7 @@ static int write_slave_port1(ushort_t port, void * src, uint_t length, struct vm state->slave_isr &= ~(0x01 << i); break; } - } + } PrintDebug("8259 PIC: Post ISR = %x (wr_Slave1)\n", state->slave_isr); } else { PrintError("8259 PIC: Command not handled or invalid (wr_Slave1)\n"); @@ -625,17 +641,97 @@ 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; + + if (length != 1) { + PrintError("ELCR read of invalid length %d\n", length); + return -1; + } + if (port == ELCR1_PORT) { + // master + *(uint8_t *)dst = state->master_elcr; + } else if (port == ELCR2_PORT) { + *(uint8_t *)dst = state->slave_elcr; + } else { + PrintError("Invalid port %x\n", port); + return -1; + } + return length; +} -static int pic_init(struct vm_device * dev) { +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; + + if (length != 1) { + PrintError("ELCR read of invalid length %d\n", length); + return -1; + } + + if (port == ELCR1_PORT) { + // master + state->master_elcr = (*(uint8_t *)src) & state->master_elcr_mask; + } else if (port == ELCR2_PORT) { + state->slave_elcr = (*(uint8_t *)src) & state->slave_elcr_mask; + } else { + PrintError("Invalid port %x\n", port); + return -1; + } + + return length; +} + + + + + + +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); + + return 0; +} + - v3_register_intr_controller(dev->vm, &intr_ops, state); + + + + + +static struct v3_device_ops dev_ops = { + .free = pic_free, + .reset = NULL, + .start = NULL, + .stop = NULL, +}; + + + +static int pic_init(struct guest_info * vm, void * cfg_data) { + struct pic_internal * state = NULL; + 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); + + if (v3_attach_device(vm, dev) == -1) { + PrintError("Could not attach device %s\n", "8259A"); + return -1; + } + + + v3_register_intr_controller(vm, &intr_ops, state); state->master_irr = 0; state->master_isr = 0; + state->master_elcr = 0; + state->master_elcr_mask = 0xf8; state->master_icw1 = 0; state->master_icw2 = 0; state->master_icw3 = 0; @@ -648,6 +744,8 @@ static int pic_init(struct vm_device * dev) { state->slave_irr = 0; state->slave_isr = 0; + state->slave_elcr = 0; + state->slave_elcr_mask = 0xde; state->slave_icw1 = 0; state->slave_icw2 = 0; state->slave_icw3 = 0; @@ -663,40 +761,13 @@ static int pic_init(struct vm_device * dev) { 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); - return 0; -} - -static int pic_deinit(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); + 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); return 0; } - - - - -static struct vm_device_ops dev_ops = { - .init = pic_init, - .deinit = pic_deinit, - .reset = NULL, - .start = NULL, - .stop = NULL, -}; - - -struct vm_device * v3_create_pic() { - struct pic_internal * state = NULL; - state = (struct pic_internal *)V3_Malloc(sizeof(struct pic_internal)); - V3_ASSERT(state != NULL); - - struct vm_device *device = v3_create_device("8259A", &dev_ops, state); - - return device; -} +device_register("8259A", pic_init);