openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

i8259: Reorder intack in pic_read_irq 

As we want to move the IRQ update to pic_intack, ordering matters: the
slave ack must be executed before the master ack to avoid missing
further pending slave IRQs.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Jan Kiszka 2011-10-07 09:19:43 +02:00 committed by Blue Swirl
parent afdb06f849
commit 78ef2b6989
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/i8259.c
View File

@ -228,7 +228,6 @@ int pic_read_irq(PicState2 *s)
irq = pic_get_irq(&s->pics[0]); irq = pic_get_irq(&s->pics[0]);
if (irq >= 0) { if (irq >= 0) {
pic_intack(&s->pics[0], irq);
if (irq == 2) { if (irq == 2) {
irq2 = pic_get_irq(&s->pics[1]); irq2 = pic_get_irq(&s->pics[1]);
if (irq2 >= 0) { if (irq2 >= 0) {
@ -238,12 +237,10 @@ int pic_read_irq(PicState2 *s)
irq2 = 7; irq2 = 7;
} }
intno = s->pics[1].irq_base + irq2; intno = s->pics[1].irq_base + irq2;
#if defined(DEBUG_PIC) || defined(DEBUG_IRQ_LATENCY)
irq = irq2 + 8;
#endif
} else { } else {
intno = s->pics[0].irq_base + irq; intno = s->pics[0].irq_base + irq;
} }
pic_intack(&s->pics[0], irq);
} else { } else {
/* spurious IRQ on host controller */ /* spurious IRQ on host controller */
irq = 7; irq = 7;
@ -251,6 +248,11 @@ int pic_read_irq(PicState2 *s)
} }
pic_update_irq(s); pic_update_irq(s);
#if defined(DEBUG_PIC) || defined(DEBUG_IRQ_LATENCY)
if (irq == 2) {
irq = irq2 + 8;
}
#endif
#ifdef DEBUG_IRQ_LATENCY #ifdef DEBUG_IRQ_LATENCY
printf("IRQ%d latency=%0.3fus\n", printf("IRQ%d latency=%0.3fus\n",
irq, irq,