From patchwork Wed Feb 10 22:40:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artyom Tarasenko X-Patchwork-Id: 45066 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 69C09B7CE6 for ; Thu, 11 Feb 2010 09:49:20 +1100 (EST) Received: from localhost ([127.0.0.1]:56403 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NfLMz-0007AO-GH for incoming@patchwork.ozlabs.org; Wed, 10 Feb 2010 17:49:17 -0500 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 ) 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 ) 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 ; Wed, 10 Feb 2010 14:40:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=Kb/2qkVQ9LayK2NQhMABoa4jzXtqH3Di0JO/sZF+Gas=; b=ld+/yUsZ+ojwI9Fyzo2MX3MY/oKNDe4aTE5sIdBc6yHdLMM1723qf/RfOWd43zSH78 +82wkvaXRSBqE2pUQmKBXwoVfwjzrbrUVCju70xfbWQEX9NxlPVIRCZ/CR9i2b7kMI84 J2Xgv4Bf+Tb/HK/w8KrDh1DKWw2j90KEkUPpQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=oUuFLKHk6I7WjYkGw4TcncnI1VJet70Q57wG/nHLmwuWbhZAHVZ2WM9aQ4/fXWzIQw zF9d/bjZi1OdPikQuP8GQrqmyc0iYChmhm+mrsHJL6kOrjnHdo1IM+qMkAByZPbIzJkH IjtSJG1DiSEU8nGsuIylzuRyAFG8oflTU60z4= Received: by 10.223.3.67 with SMTP id 3mr1133995fam.25.1265841652141; Wed, 10 Feb 2010 14:40:52 -0800 (PST) Received: from localhost (e180216070.adsl.alicedsl.de [85.180.216.70]) by mx.google.com with ESMTPS id f31sm2793714fkf.42.2010.02.10.14.40.50 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 10 Feb 2010 14:40:51 -0800 (PST) From: Artyom Tarasenko To: qemu-devel@nongnu.org Date: Wed, 10 Feb 2010 23:40:48 +0100 Message-Id: <1265841648-27249-1-git-send-email-atar4qemu@google.com> X-Mailer: git-send-email 1.6.2.5 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Blue Swirl , Artyom Tarasenko Subject: [Qemu-devel] sparc32 fix spurious dma interrupts X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 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; }