From patchwork Sat Jan 29 17:40:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduard - Gabriel Munteanu X-Patchwork-Id: 80946 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 2C317B70E3 for ; Sun, 30 Jan 2011 04:52:41 +1100 (EST) Received: from localhost ([127.0.0.1]:45254 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PjEx5-0001aB-3y for incoming@patchwork.ozlabs.org; Sat, 29 Jan 2011 12:51:11 -0500 Received: from [140.186.70.92] (port=59977 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PjEnI-00058y-Rj for qemu-devel@nongnu.org; Sat, 29 Jan 2011 12:41:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PjEnH-0004gN-DA for qemu-devel@nongnu.org; Sat, 29 Jan 2011 12:41:04 -0500 Received: from mail-fx0-f45.google.com ([209.85.161.45]:63211) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PjEnH-0004g9-8k for qemu-devel@nongnu.org; Sat, 29 Jan 2011 12:41:03 -0500 Received: by fxm12 with SMTP id 12so4523795fxm.4 for ; Sat, 29 Jan 2011 09:41:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:cc:subject:date:message-id :x-mailer:in-reply-to:references:in-reply-to:references; bh=GHD344334j/iLwg+6VSVdFT6dM1leGRYw1QeR9rOkPo=; b=Z5+Xo/XZf8jhqbm+p41DObkyQaw/5BkMjhdQaDTSeRIZNRlj+Zw2IrPIOutp8c7kKn m4M5Vh3x1NKMUbD/r5nltN35rlrcuPqTLlHVQw6B9KMV/6XdQVGai/rlDomu4UlTOjPh OQmTXB1R9HLEZ7HyI1ylKsIkbrcKx+jwHFXaI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=MWMsoYeIg0SaAz4CBEl5odks2UlbPDTpZjIPZ9PRlnWAGfnxeDGD4jklUpQ++x5Mbn MDVV/2+5aE8sgh3hf5mU2x4zES+wSbZnLk42v0lbNmma1D14cuUQhAvzqYyEACvp0iRS 6QDbdgG8E2IOGdzzeQSi3PVis8ND09SMb/BiE= Received: by 10.223.101.199 with SMTP id d7mr3856579fao.65.1296322862343; Sat, 29 Jan 2011 09:41:02 -0800 (PST) Received: from localhost.localdomain ([188.25.244.101]) by mx.google.com with ESMTPS id 21sm6822801fav.17.2011.01.29.09.41.00 (version=SSLv3 cipher=RC4-MD5); Sat, 29 Jan 2011 09:41:01 -0800 (PST) From: Eduard - Gabriel Munteanu To: joro@8bytes.org Date: Sat, 29 Jan 2011 19:40:28 +0200 Message-Id: <234682d40a0e4d57e03b9a6b0e336e90082e076d.1296321798.git.eduard.munteanu@linux360.ro> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.161.45 Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org, blauwirbel@gmail.com, yamahata@valinux.co.jp, paul@codesourcery.com, Eduard - Gabriel Munteanu , avi@redhat.com Subject: [Qemu-devel] [PATCH 07/13] ac97: use the DMA memory access interface 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 This allows the device to work properly with an emulated IOMMU. Signed-off-by: Eduard - Gabriel Munteanu --- hw/ac97.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/ac97.c b/hw/ac97.c index d71072d..383c1b3 100644 --- a/hw/ac97.c +++ b/hw/ac97.c @@ -223,7 +223,7 @@ static void fetch_bd (AC97LinkState *s, AC97BusMasterRegs *r) { uint8_t b[8]; - cpu_physical_memory_read (r->bdbar + r->civ * 8, b, 8); + dma_memory_read (&s->dev.dma, r->bdbar + r->civ * 8, b, 8); r->bd_valid = 1; r->bd.addr = le32_to_cpu (*(uint32_t *) &b[0]) & ~3; r->bd.ctl_len = le32_to_cpu (*(uint32_t *) &b[4]); @@ -972,7 +972,7 @@ static int write_audio (AC97LinkState *s, AC97BusMasterRegs *r, while (temp) { int copied; to_copy = audio_MIN (temp, sizeof (tmpbuf)); - cpu_physical_memory_read (addr, tmpbuf, to_copy); + dma_memory_read (&s->dev.dma, addr, tmpbuf, to_copy); copied = AUD_write (s->voice_po, tmpbuf, to_copy); dolog ("write_audio max=%x to_copy=%x copied=%x\n", max, to_copy, copied); @@ -1056,7 +1056,7 @@ static int read_audio (AC97LinkState *s, AC97BusMasterRegs *r, *stop = 1; break; } - cpu_physical_memory_write (addr, tmpbuf, acquired); + dma_memory_write (&s->dev.dma, addr, tmpbuf, acquired); temp -= acquired; addr += acquired; nread += acquired;