From patchwork Wed Jun 1 01:38:29 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: 98113 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 74EE8B6F7D for ; Wed, 1 Jun 2011 15:12:23 +1000 (EST) Received: from localhost ([::1]:48752 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QRdj9-0006wM-Lu for incoming@patchwork.ozlabs.org; Wed, 01 Jun 2011 01:12:19 -0400 Received: from eggs.gnu.org ([140.186.70.92]:50169) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QRaOp-00054c-SH for qemu-devel@nongnu.org; Tue, 31 May 2011 21:39:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QRaOn-0007LF-Ec for qemu-devel@nongnu.org; Tue, 31 May 2011 21:39:07 -0400 Received: from mail-bw0-f45.google.com ([209.85.214.45]:36086) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QRaOm-0007GK-VF for qemu-devel@nongnu.org; Tue, 31 May 2011 21:39:05 -0400 Received: by mail-bw0-f45.google.com with SMTP id 16so4438176bwz.4 for ; Tue, 31 May 2011 18:39:04 -0700 (PDT) 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; bh=pWMxarEtcwXRPJv538EilWlyskYhI0+RrfCasC8hrV4=; b=Mc+QOJvk18S7VzSM8WjUn4fR/CBp0Bdp1ezEOfpBY+XNpfE2hDefYz/7tzjc5soUaW pRHCPQdBbQawyTC7GdXbPg7vLu4ZTgv8gUh31vpG+9uiMEkgbWy2L+HNbW9fSQhqJBeX XTrUy2GiNVl1zTufTz++5q42bWXmx3ZeloQBg= 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=v60WaEWr4jA3EiYzhj/NDGzXGHB4+Dr3dFUSnFcJ0yUpRjekk9aZdklGTxOpOAtUaw mLAWmzOaiulunx8x/w6vBQzmBd3DEooMpHKI1CD/jwN2ADcbcnlfKjj0i2fiZdB8fcvo kaXwrnOlGDYVuOUU+qy+zYUnCbWpoRm9dUJcg= Received: by 10.204.73.157 with SMTP id q29mr1386356bkj.101.1306892344500; Tue, 31 May 2011 18:39:04 -0700 (PDT) Received: from localhost.localdomain ([188.25.93.127]) by mx.google.com with ESMTPS id ag6sm453451bkc.18.2011.05.31.18.39.02 (version=SSLv3 cipher=OTHER); Tue, 31 May 2011 18:39:03 -0700 (PDT) From: Eduard - Gabriel Munteanu To: mst@redhat.com Date: Wed, 1 Jun 2011 04:38:29 +0300 Message-Id: <1306892315-7306-8-git-send-email-eduard.munteanu@linux360.ro> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1306892315-7306-1-git-send-email-eduard.munteanu@linux360.ro> References: <1306892315-7306-1-git-send-email-eduard.munteanu@linux360.ro> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.214.45 X-Mailman-Approved-At: Wed, 01 Jun 2011 00:57:35 -0400 Cc: aliguori@us.ibm.com, david@gibson.dropbear.id.au, kvm@vger.kernel.org, rth@twiddle.net, aik@ozlabs.ru, joro@8bytes.org, seabios@seabios.org, qemu-devel@nongnu.org, agraf@suse.de, blauwirbel@gmail.com, yamahata@valinux.co.jp, kevin@koconnor.net, avi@redhat.com, Eduard - Gabriel Munteanu , dwg@au1.ibm.com, paul@codesourcery.com Subject: [Qemu-devel] [RFC PATCH 07/13] ac97: use the DMA memory access interface X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: 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..bad38fb 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); + pci_memory_read (&s->dev, 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); + pci_memory_read (&s->dev, 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); + pci_memory_write (&s->dev, addr, tmpbuf, acquired); temp -= acquired; addr += acquired; nread += acquired;