From patchwork Fri Nov 26 16:21:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 73202 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 67AFDB708B for ; Sat, 27 Nov 2010 03:25:51 +1100 (EST) Received: from localhost ([127.0.0.1]:52487 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PM17M-0002V3-Cx for incoming@patchwork.ozlabs.org; Fri, 26 Nov 2010 11:25:48 -0500 Received: from [140.186.70.92] (port=56072 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PM12U-0008NJ-LX for qemu-devel@nongnu.org; Fri, 26 Nov 2010 11:20:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PM12T-0002zh-Kg for qemu-devel@nongnu.org; Fri, 26 Nov 2010 11:20:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53662) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PM12T-0002zV-AQ for qemu-devel@nongnu.org; Fri, 26 Nov 2010 11:20:45 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oAQGKh09001178 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 26 Nov 2010 11:20:43 -0500 Received: from dhcp-5-188.str.redhat.com (vpn2-11-214.ams2.redhat.com [10.36.11.214]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oAQGKWNS014346; Fri, 26 Nov 2010 11:20:42 -0500 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Fri, 26 Nov 2010 17:21:32 +0100 Message-Id: <1290788492-17703-5-git-send-email-kwolf@redhat.com> In-Reply-To: <1290788492-17703-1-git-send-email-kwolf@redhat.com> References: <1290788492-17703-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, stefanha@gmail.com, mjt@tls.msk.ru Subject: [Qemu-devel] [PATCH 4/4] ide: Reset current_addr after stopping DMA 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 Whenever SSBM is reset in the command register all state information is lost. Restarting DMA means that current_addr must be reset to the base address of the PRD table. The OS is not required to change the base address register before starting a DMA operation, it can reuse the value it wrote for an earlier request. Signed-off-by: Kevin Wolf Reviewed-by: Stefan Hajnoczi --- hw/ide/pci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 404f045..ad406ee 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -65,6 +65,7 @@ void bmdma_cmd_writeb(void *opaque, uint32_t addr, uint32_t val) #endif } } else { + bm->cur_addr = bm->addr; if (!(bm->status & BM_STATUS_DMAING)) { bm->status |= BM_STATUS_DMAING; /* start dma transfer if possible */ @@ -101,7 +102,6 @@ static void bmdma_addr_write(IORange *ioport, uint64_t addr, #endif bm->addr &= ~(mask << shift); bm->addr |= ((data & mask) << shift) & ~3; - bm->cur_addr = bm->addr; } const IORangeOps bmdma_addr_ioport_ops = {