X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8259a.c;h=6fe165e131f8fa98f963c212daae0b4eccfcc8ce;hb=56f8088296ee4116a4811a2f4f843edd80a7748d;hp=2851946afce32d29d21dca72d4556e824d369175;hpb=91259ca3e99284e623966a15cbef321e5cb1ffe0;p=palacios.git diff --git a/palacios/src/devices/8259a.c b/palacios/src/devices/8259a.c index 2851946..6fe165e 100644 --- a/palacios/src/devices/8259a.c +++ b/palacios/src/devices/8259a.c @@ -1,8 +1,16 @@ +/* (c) 2008, Jack Lange */ +/* (c) 2008, The V3VEE Project */ + #include #include #include #include +#ifndef DEBUG_PIC +#undef PrintDebug +#define PrintDebug(fmt, args...) +#endif + typedef enum {RESET, ICW1, ICW2, ICW3, ICW4, READY} pic_state_t; @@ -170,13 +178,39 @@ 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 { - PrintDebug("8259 PIC: Invalid IRQ raised (%d)\n", irq); + PrintError("8259 PIC: Invalid IRQ raised (%d)\n", irq); return -1; } return 0; } + +/*Zheng 07/30/2008*/ + +static int pic_lower_intr(void *private_data, int irq_no) { + + struct pic_internal *state = (struct pic_internal*)private_data; + + PrintDebug("[pic_lower_intr] IRQ line %d now low\n", (unsigned) irq_no); + if (irq_no <= 7) { + + state->master_irr &= ~(1 << irq_no); + if ((state->master_irr & ~(state->master_imr)) == 0) { + PrintDebug("\t\tFIXME: Master maybe should do sth\n"); + } + } else if ((irq_no > 7) && (irq_no <= 15)) { + + state->slave_irr &= ~(1 << (irq_no - 8)); + if ((state->slave_irr & (~(state->slave_imr))) == 0) { + PrintDebug("\t\tFIXME: Slave maybe should do sth\n"); + } + } + return 0; +} + + + static int pic_intr_pending(void * private_data) { struct pic_internal * state = (struct pic_internal*)private_data; @@ -189,9 +223,9 @@ static int pic_intr_pending(void * private_data) { } static int pic_get_intr_number(void * private_data) { - struct pic_internal * state = (struct pic_internal*)private_data; - int i=0; - int irq=-1; + struct pic_internal * state = (struct pic_internal *)private_data; + int i = 0; + int irq = -1; PrintDebug("8259 PIC: getnum: master_irr: 0x%x master_imr: 0x%x\n", i, state->master_irr, state->master_imr); PrintDebug("8259 PIC: getnum: slave_irr: 0x%x slave_imr: 0x%x\n", i, state->slave_irr, state->slave_imr); @@ -217,11 +251,11 @@ static int pic_get_intr_number(void * private_data) { } } - if (i==15 || i==6) { + if ((i == 15) || (i == 6)) { DumpPICState(state); } - if (i==16) { + if (i == 16) { return -1; } else { return irq; @@ -240,7 +274,7 @@ static int pic_begin_irq(void * private_data, int irq) { irq &= 0x7; irq += 8; } else { - PrintDebug("8259 PIC: Could not find IRQ (0x%x) to Begin\n",irq); + PrintError("8259 PIC: Could not find IRQ (0x%x) to Begin\n",irq); return -1; } @@ -264,11 +298,15 @@ static int pic_end_irq(void * private_data, int irq) { } */ + +/*Zheng 07/30/2008*/ 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, //Zheng added + }; @@ -278,7 +316,7 @@ int read_master_port1(ushort_t port, void * dst, uint_t length, struct vm_device struct pic_internal * state = (struct pic_internal*)dev->private_data; if (length != 1) { - PrintDebug("8259 PIC: Invalid Read length (rd_Master1)\n"); + PrintError("8259 PIC: Invalid Read length (rd_Master1)\n"); return -1; } @@ -297,7 +335,7 @@ int read_master_port2(ushort_t port, void * dst, uint_t length, struct vm_device struct pic_internal * state = (struct pic_internal*)dev->private_data; if (length != 1) { - PrintDebug("8259 PIC: Invalid Read length (rd_Master2)\n"); + PrintError("8259 PIC: Invalid Read length (rd_Master2)\n"); return -1; } @@ -311,7 +349,7 @@ int read_slave_port1(ushort_t port, void * dst, uint_t length, struct vm_device struct pic_internal * state = (struct pic_internal*)dev->private_data; if (length != 1) { - PrintDebug("8259 PIC: Invalid Read length (rd_Slave1)\n"); + PrintError("8259 PIC: Invalid Read length (rd_Slave1)\n"); return -1; } @@ -330,7 +368,7 @@ int read_slave_port2(ushort_t port, void * dst, uint_t length, struct vm_device struct pic_internal * state = (struct pic_internal*)dev->private_data; if (length != 1) { - PrintDebug("8259 PIC: Invalid Read length (rd_Slave2)\n"); + PrintError("8259 PIC: Invalid Read length (rd_Slave2)\n"); return -1; } @@ -344,12 +382,17 @@ int write_master_port1(ushort_t port, void * src, uint_t length, struct vm_devic struct pic_internal * state = (struct pic_internal*)dev->private_data; uchar_t cw = *(uchar_t *)src; + PrintDebug("8259 PIC: Write master port 1 with 0x%x\n",cw); + if (length != 1) { - PrintDebug("8259 PIC: Invalid Write length (wr_Master1)\n"); + PrintError("8259 PIC: Invalid Write length (wr_Master1)\n"); return -1; } if (IS_ICW1(cw)) { + + PrintDebug("8259 PIC: Setting ICW1 = %x (wr_Master1)\n", cw); + state->master_icw1 = cw; state->master_state = ICW2; @@ -358,6 +401,7 @@ int write_master_port1(ushort_t port, void * src, uint_t length, struct vm_devic // handle the EOI here struct ocw2 * cw2 = (struct ocw2*)&cw; + PrintDebug("8259 PIC: Handling OCW2 = %x (wr_Master1)\n", cw); if ((cw2->EOI) && (!cw2->R) && (cw2->SL)) { // specific EOI; @@ -374,21 +418,22 @@ int write_master_port1(ushort_t port, void * src, uint_t length, struct vm_devic } PrintDebug("8259 PIC: Post ISR = %x (wr_Master1)\n", state->master_isr); } else { - PrintDebug("8259 PIC: Command not handled, or in error (wr_Master1)\n"); + PrintError("8259 PIC: Command not handled, or in error (wr_Master1)\n"); return -1; } state->master_ocw2 = cw; } else if (IS_OCW3(cw)) { + PrintDebug("8259 PIC: Handling OCW3 = %x (wr_Master1)\n", cw); state->master_ocw3 = cw; } else { - PrintDebug("8259 PIC: Invalid OCW to PIC (wr_Master1)\n"); - PrintDebug("8259 PIC: CW=%x\n", cw); + PrintError("8259 PIC: Invalid OCW to PIC (wr_Master1)\n"); + PrintError("8259 PIC: CW=%x\n", cw); return -1; } } else { - PrintDebug("8259 PIC: Invalid PIC State (wr_Master1)\n"); - PrintDebug("8259 PIC: CW=%x\n", cw); + PrintError("8259 PIC: Invalid PIC State (wr_Master1)\n"); + PrintError("8259 PIC: CW=%x\n", cw); return -1; } @@ -399,8 +444,10 @@ int write_master_port2(ushort_t port, void * src, uint_t length, struct vm_devic struct pic_internal * state = (struct pic_internal*)dev->private_data; uchar_t cw = *(uchar_t *)src; + PrintDebug("8259 PIC: Write master port 2 with 0x%x\n",cw); + if (length != 1) { - PrintDebug("8259 PIC: Invalid Write length (wr_Master2)\n"); + PrintError("8259 PIC: Invalid Write length (wr_Master2)\n"); return -1; } @@ -421,6 +468,8 @@ int write_master_port2(ushort_t port, void * src, uint_t length, struct vm_devic } else if (state->master_state == ICW3) { struct icw1 * cw1 = (struct icw1 *)&(state->master_icw1); + PrintDebug("8259 PIC: Setting ICW3 = %x (wr_Master2)\n", cw); + state->master_icw3 = cw; if (cw1->ic4 == 1) { @@ -430,13 +479,15 @@ int write_master_port2(ushort_t port, void * src, uint_t length, struct vm_devic } } else if (state->master_state == ICW4) { + PrintDebug("8259 PIC: Setting ICW4 = %x (wr_Master2)\n", cw); state->master_icw4 = cw; state->master_state = READY; } else if (state->master_state == READY) { + PrintDebug("8259 PIC: Setting IMR = %x (wr_Master2)\n", cw); state->master_imr = cw; } else { // error - PrintDebug("8259 PIC: Invalid master PIC State (wr_Master2)\n"); + PrintError("8259 PIC: Invalid master PIC State (wr_Master2)\n"); return -1; } @@ -447,19 +498,24 @@ int write_slave_port1(ushort_t port, void * src, uint_t length, struct vm_device struct pic_internal * state = (struct pic_internal*)dev->private_data; uchar_t cw = *(uchar_t *)src; + PrintDebug("8259 PIC: Write slave port 1 with 0x%x\n",cw); + if (length != 1) { // error - PrintDebug("8259 PIC: Invalid Write length (wr_Slave1)\n"); + PrintError("8259 PIC: Invalid Write length (wr_Slave1)\n"); return -1; } if (IS_ICW1(cw)) { + PrintDebug("8259 PIC: Setting ICW1 = %x (wr_Slave1)\n", cw); state->slave_icw1 = cw; state->slave_state = ICW2; } else if (state->slave_state == READY) { if (IS_OCW2(cw)) { // handle the EOI here 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; @@ -476,20 +532,21 @@ int write_slave_port1(ushort_t port, void * src, uint_t length, struct vm_device } PrintDebug("8259 PIC: Post ISR = %x (wr_Slave1)\n", state->slave_isr); } else { - PrintDebug("8259 PIC: Command not handled or invalid (wr_Slave1)\n"); + PrintError("8259 PIC: Command not handled or invalid (wr_Slave1)\n"); return -1; } state->slave_ocw2 = cw; } else if (IS_OCW3(cw)) { // Basically sets the IRR/ISR read flag + PrintDebug("8259 PIC: Setting OCW3 = %x (wr_Slave1)\n", cw); state->slave_ocw3 = cw; } else { - PrintDebug("8259 PIC: Invalid command work (wr_Slave1)\n"); + PrintError("8259 PIC: Invalid command work (wr_Slave1)\n"); return -1; } } else { - PrintDebug("8259 PIC: Invalid State writing (wr_Slave1)\n"); + PrintError("8259 PIC: Invalid State writing (wr_Slave1)\n"); return -1; } @@ -500,14 +557,18 @@ int write_slave_port2(ushort_t port, void * src, uint_t length, struct vm_device struct pic_internal * state = (struct pic_internal*)dev->private_data; uchar_t cw = *(uchar_t *)src; + PrintDebug("8259 PIC: Write slave port 2 with 0x%x\n",cw); + if (length != 1) { - PrintDebug("8259 PIC: Invalid write length (wr_Slave2)\n"); + PrintError("8259 PIC: Invalid write length (wr_Slave2)\n"); return -1; } if (state->slave_state == ICW2) { struct icw1 * cw1 = (struct icw1 *)&(state->master_icw1); + PrintDebug("8259 PIC: Setting ICW2 = %x (wr_Slave2)\n", cw); + state->slave_icw2 = cw; if (cw1->sngl == 0) { @@ -521,6 +582,8 @@ int write_slave_port2(ushort_t port, void * src, uint_t length, struct vm_device } else if (state->slave_state == ICW3) { struct icw1 * cw1 = (struct icw1 *)&(state->master_icw1); + PrintDebug("8259 PIC: Setting ICW3 = %x (wr_Slave2)\n", cw); + state->slave_icw3 = cw; if (cw1->ic4 == 1) { @@ -530,12 +593,14 @@ int write_slave_port2(ushort_t port, void * src, uint_t length, struct vm_device } } else if (state->slave_state == ICW4) { + PrintDebug("8259 PIC: Setting ICW4 = %x (wr_Slave2)\n", cw); state->slave_icw4 = cw; state->slave_state = READY; } else if (state->slave_state == READY) { + PrintDebug("8259 PIC: Setting IMR = %x (wr_Slave2)\n", cw); state->slave_imr = cw; } else { - PrintDebug("8259 PIC: Invalid State at write (wr_Slave2)\n"); + PrintError("8259 PIC: Invalid State at write (wr_Slave2)\n"); return -1; }