From patchwork Thu Nov 25 07:07:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 73009 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 4E00EB70AA for ; Thu, 25 Nov 2010 18:42:55 +1100 (EST) Received: from localhost ([127.0.0.1]:44857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PLWTj-0000fa-J3 for incoming@patchwork.ozlabs.org; Thu, 25 Nov 2010 02:42:52 -0500 Received: from [140.186.70.92] (port=43202 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PLVvo-0005bi-Ni for qemu-devel@nongnu.org; Thu, 25 Nov 2010 02:07:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PLVvm-0003Xu-S8 for qemu-devel@nongnu.org; Thu, 25 Nov 2010 02:07:48 -0500 Received: from cantor.suse.de ([195.135.220.2]:38686 helo=mx1.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PLVvm-0003WR-Cz for qemu-devel@nongnu.org; Thu, 25 Nov 2010 02:07:46 -0500 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 8A3FD9428F; Thu, 25 Nov 2010 08:07:43 +0100 (CET) From: Alexander Graf To: QEMU-devel Developers Date: Thu, 25 Nov 2010 08:07:35 +0100 Message-Id: <1290668862-11695-5-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1290668862-11695-1-git-send-email-agraf@suse.de> References: <1290668862-11695-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: Kevin Wolf , Joerg Roedel , Blue Swirl , Gerd Hoffmann , Stefan Hajnoczi , tj@kernel.org, Roland Elek , Sebastian Herbszt Subject: [Qemu-devel] [PATCH 04/11] ide: add DMA hooks to bus ops 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 For DMA operations, we need to hook into even more IDE functionality. This patch adds the respective hooking points, allowing us to handle SG lists ourselves in the AHCI code. Signed-off-by: Roland Elek Signed-off-by: Alexander Graf --- v1 -> v2: - make dma hooks explicit by putting them into ops struct (stefanha) --- hw/ide/core.c | 9 ++++++--- hw/ide/internal.h | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index c8d7810..04190d2 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -607,7 +607,7 @@ static void ide_read_dma_cb(void *opaque, int ret) n = s->nsector; s->io_buffer_index = 0; s->io_buffer_size = n * 512; - if (dma_buf_prepare(bm, 1) == 0) + if (s->bus->ops->dma_prepare_fn(bm, 1) == 0) goto eot; #ifdef DEBUG_AIO printf("aio_read: sector_num=%" PRId64 " n=%d\n", sector_num, n); @@ -752,7 +752,7 @@ static void ide_write_dma_cb(void *opaque, int ret) n = s->nsector; s->io_buffer_size = n * 512; /* launch next transfer */ - if (dma_buf_prepare(bm, 0) == 0) + if (s->bus->ops->dma_prepare_fn(bm, 0) == 0) goto eot; #ifdef DEBUG_AIO printf("aio_write: sector_num=%" PRId64 " n=%d\n", sector_num, n); @@ -1060,7 +1060,7 @@ static void ide_atapi_cmd_read_dma_cb(void *opaque, int ret) s->lba += n; } s->packet_transfer_size -= s->io_buffer_size; - if (dma_buf_rw(bm, 1) == 0) + if (s->bus->ops->dma_rw_fn(bm, 1) == 0) goto eot; } @@ -2715,6 +2715,7 @@ int ide_init_drive(IDEState *s, BlockDriverState *bs, } else { pstrcpy(s->version, sizeof(s->version), QEMU_VERSION); } + ide_reset(s); bdrv_set_removable(bs, s->drive_kind == IDE_CD); return 0; @@ -2740,6 +2741,8 @@ static IDEBusOps ide_bus_ops = { .transfer_start_fn = pata_transfer_start, .irq_set_fn = pata_set_irq, .dma_start_fn = pata_dma_start, + .dma_prepare_fn = dma_buf_prepare, + .dma_rw_fn = dma_buf_rw, }; void ide_init2(IDEBus *bus, qemu_irq irq) diff --git a/hw/ide/internal.h b/hw/ide/internal.h index ee7e13e..4bee636 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -374,6 +374,8 @@ typedef void TransferStartFunc(IDEState *, EndTransferFunc *); typedef void IRQSetFunc(IDEBus *); typedef void DMAStartFunc(IDEState *, BlockDriverCompletionFunc *); +typedef int DMAPrepareFunc(BMDMAState *, int); +typedef int DMARWFunc(BMDMAState *, int); /* NOTE: IDEState represents in fact one drive */ struct IDEState { @@ -457,6 +459,8 @@ struct IDEBusOps { TransferStartFunc *transfer_start_fn; IRQSetFunc *irq_set_fn; DMAStartFunc *dma_start_fn; + DMAPrepareFunc *dma_prepare_fn; + DMARWFunc *dma_rw_fn; }; struct IDEBus {