Patchwork mst_fpga: correct irq level settings

login
register
mail settings
Submitter Dmitry Eremin-Solenikov
Date Feb. 16, 2011, 1:22 p.m.
Message ID <1297862553-9491-1-git-send-email-dbaryshkov@gmail.com>
Download mbox | patch
Permalink /patch/83363/
State New
Headers show

Comments

Dmitry Eremin-Solenikov - Feb. 16, 2011, 1:22 p.m.
Final corrections for IRQ levels that are set by mst_fpga:

* Don't retranslate IRQ if previously IRQ was masked.
* After setting or clearing IRQs through register, apply mask
  before setting parent IRQ level.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 hw/mst_fpga.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/hw/mst_fpga.c b/hw/mst_fpga.c
index afed2ac..407bac9 100644
--- a/hw/mst_fpga.c
+++ b/hw/mst_fpga.c
@@ -50,7 +50,7 @@  static void
 mst_fpga_set_irq(void *opaque, int irq, int level)
 {
 	mst_irq_state *s = (mst_irq_state *)opaque;
-	uint32_t oldint = s->intsetclr;
+	uint32_t oldint = s->intsetclr & s->intmskena;
 
 	if (level)
 		s->prev_level |= 1u << irq;
@@ -139,7 +139,7 @@  mst_fpga_writeb(void *opaque, target_phys_addr_t addr, uint32_t value)
 		break;
 	case MST_INTSETCLR:	/* clear or set interrupt */
 		s->intsetclr = (value & 0xFEEFF);
-		qemu_set_irq(s->parent, s->intsetclr);
+		qemu_set_irq(s->parent, s->intsetclr & s->intmskena);
 		break;
 	case MST_PCMCIA0:
 		s->pcmcia0 = value;