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

mainstone: correct and simplify irq handling 

Simplify IRQ handling to stop setting an input irq pin. As a win, also get
correct IRQ status after save/load cycle.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>
This commit is contained in:
Dmitry Eremin-Solenikov 2011-02-12 03:15:23 +03:00 committed by Andrzej Zaborowski
parent 8fe3046f17
commit 43d91709c1
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/mst_fpga.c
View File

@ -45,34 +45,22 @@ typedef struct mst_irq_state{
uint32_t pcmcia1; uint32_t pcmcia1;
}mst_irq_state; }mst_irq_state;
static void
mst_fpga_update_gpio(mst_irq_state *s)
{
uint32_t level, diff;
int bit;
level = s->prev_level ^ s->intsetclr;
for (diff = s->prev_level ^ level; diff; diff ^= 1 << bit) {
bit = ffs(diff) - 1;
qemu_set_irq(s->pins[bit], (level >> bit) & 1 );
}
s->prev_level = level;
}
static void static void
mst_fpga_set_irq(void *opaque, int irq, int level) mst_fpga_set_irq(void *opaque, int irq, int level)
{ {
mst_irq_state *s = (mst_irq_state *)opaque; mst_irq_state *s = (mst_irq_state *)opaque;
uint32_t oldint = s->intsetclr;
if (level) if (level)
s->prev_level |= 1u << irq; s->prev_level |= 1u << irq;
else else
s->prev_level &= ~(1u << irq); s->prev_level &= ~(1u << irq);
if(s->intmskena & (1u << irq)) { if ((s->intmskena & (1u << irq)) && level)
s->intsetclr = 1u << irq; s->intsetclr |= 1u << irq;
qemu_set_irq(s->parent, level);
} if (oldint != (s->intsetclr & s->intmskena))
qemu_set_irq(s->parent, s->intsetclr & s->intmskena);
} }
@ -146,10 +134,11 @@ mst_fpga_writeb(void *opaque, target_phys_addr_t addr, uint32_t value)
break; break;
case MST_INTMSKENA: /* Mask interupt */ case MST_INTMSKENA: /* Mask interupt */
s->intmskena = (value & 0xFEEFF); s->intmskena = (value & 0xFEEFF);
mst_fpga_update_gpio(s); qemu_set_irq(s->parent, s->intsetclr & s->intmskena);
break; break;
case MST_INTSETCLR: /* clear or set interrupt */ case MST_INTSETCLR: /* clear or set interrupt */
s->intsetclr = (value & 0xFEEFF); s->intsetclr = (value & 0xFEEFF);
qemu_set_irq(s->parent, s->intsetclr);
break; break;
case MST_PCMCIA0: case MST_PCMCIA0:
s->pcmcia0 = value; s->pcmcia0 = value;
@ -212,6 +201,8 @@ mst_fpga_load(QEMUFile *f, void *opaque, int version_id)
qemu_get_be32s(f, &s->intsetclr); qemu_get_be32s(f, &s->intsetclr);
qemu_get_be32s(f, &s->pcmcia0); qemu_get_be32s(f, &s->pcmcia0);
qemu_get_be32s(f, &s->pcmcia1); qemu_get_be32s(f, &s->pcmcia1);
qemu_set_irq(s->parent, s->intsetclr & s->intmskena);
return 0; return 0;
} }