From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NfLEw-000335-JY
	for qemu-devel@nongnu.org; Wed, 10 Feb 2010 17:40:58 -0500
Received: from [199.232.76.173] (port=44808 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NfLEv-00032c-TK
	for qemu-devel@nongnu.org; Wed, 10 Feb 2010 17:40:57 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <atar4qemu@googlemail.com>) id 1NfLEu-0007dx-PI
	for qemu-devel@nongnu.org; Wed, 10 Feb 2010 17:40:57 -0500
Received: from mail-fx0-f223.google.com ([209.85.220.223]:47446)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <atar4qemu@googlemail.com>) id 1NfLEu-0007dn-Ae
	for qemu-devel@nongnu.org; Wed, 10 Feb 2010 17:40:56 -0500
Received: by fxm23 with SMTP id 23so569914fxm.2
	for <qemu-devel@nongnu.org>; Wed, 10 Feb 2010 14:40:52 -0800 (PST)
From: Artyom Tarasenko <atar4qemu@googlemail.com>
Date: Wed, 10 Feb 2010 23:40:48 +0100
Message-Id: <1265841648-27249-1-git-send-email-atar4qemu@google.com>
Subject: [Qemu-devel] sparc32 fix spurious dma interrupts
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Blue Swirl <blauwirbel@gmail.com>, Artyom Tarasenko <atar4qemu@gmail.com>

Don't raise interrupt when not enabled.
Don't set DMA_INTR bit spuriously.
Don't print misleading debug messages "Raise IRQ" when not raising any.

Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com>
---
diff --git a/hw/sparc32_dma.c b/hw/sparc32_dma.c
index 6e991e0..b2992ca 100644
--- a/hw/sparc32_dma.c
+++ b/hw/sparc32_dma.c
@@ -125,9 +125,11 @@ static void dma_set_irq(void *opaque, int irq, int level)
 {
     DMAState *s = opaque;
     if (level) {
-        DPRINTF("Raise IRQ\n");
         s->dmaregs[0] |= DMA_INTR;
-        qemu_irq_raise(s->irq);
+        if (s->dmaregs[0] & DMA_INTREN) {
+            DPRINTF("Raise IRQ\n");
+            qemu_irq_raise(s->irq);
+        }
     } else {
         s->dmaregs[0] &= ~DMA_INTR;
         DPRINTF("Lower IRQ\n");
@@ -142,8 +145,6 @@ void espdma_memory_read(void *opaque, uint8_t *buf, int len)
     DPRINTF("DMA read, direction: %c, addr 0x%8.8x\n",
             s->dmaregs[0] & DMA_WRITE_MEM ? 'w': 'r', s->dmaregs[1]);
     sparc_iommu_memory_read(s->iommu, s->dmaregs[1], buf, len);
-    DPRINTF("Raise IRQ\n");
-    s->dmaregs[0] |= DMA_INTR;
     s->dmaregs[1] += len;
 }
 
@@ -154,8 +155,6 @@ void espdma_memory_write(void *opaque, uint8_t *buf, int len)
     DPRINTF("DMA write, direction: %c, addr 0x%8.8x\n",
             s->dmaregs[0] & DMA_WRITE_MEM ? 'w': 'r', s->dmaregs[1]);
     sparc_iommu_memory_write(s->iommu, s->dmaregs[1], buf, len);
-    DPRINTF("Raise IRQ\n");
-    s->dmaregs[0] |= DMA_INTR;
     s->dmaregs[1] += len;
 }