From patchwork Sat Aug 28 14:54:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduard - Gabriel Munteanu X-Patchwork-Id: 62905 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 A9F09B711B for ; Sun, 29 Aug 2010 01:01:52 +1000 (EST) Received: from localhost ([127.0.0.1]:43255 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OpMuL-0001l3-6F for incoming@patchwork.ozlabs.org; Sat, 28 Aug 2010 11:01:25 -0400 Received: from [140.186.70.92] (port=60021 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OpMq4-0008WO-60 for qemu-devel@nongnu.org; Sat, 28 Aug 2010 10:57:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OpMq1-0000Hd-0j for qemu-devel@nongnu.org; Sat, 28 Aug 2010 10:56:59 -0400 Received: from mail-bw0-f45.google.com ([209.85.214.45]:37961) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OpMq0-0000FK-R1 for qemu-devel@nongnu.org; Sat, 28 Aug 2010 10:56:56 -0400 Received: by mail-bw0-f45.google.com with SMTP id 3so2801855bwz.4 for ; Sat, 28 Aug 2010 07:56:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:cc:subject :date:message-id:x-mailer:in-reply-to:references; bh=Ajy6W9k8eF40aKzhGfw5zDzmD9BbqxCQ7wA95EXXODc=; b=UnQzdicY4PgRRY8MnUyNQzVY6ECub6qaGtf14O3D7s8an5mpNaCxkotFE4xWoq1CeZ k7ecFG/Zi2O8Ol0UcY9s8qlc2WRP+AfeshdDfrGyi8qf36lWPzRmlxJW1A5AMxXUtqtW Bbwq6n+eR4v1yAf1zdIWlpB+w6pn+hYfkYc0U= 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=p5my53oUA1i7qaqtQcYRyOoI7sSMMezgBcAxYweL6q85KoipOZy2tz/438wxt66U+V +FfkmSGi9LfzUTXank6O3pWBQFnguvGEptwBz/KtkQgYxKfWLa8LDeKLcSOhpP5ojC75 eaXR5k55tYw9kjSPPmF7C204JrDfZeajqD52I= Received: by 10.204.4.156 with SMTP id 28mr1474904bkr.207.1283007416258; Sat, 28 Aug 2010 07:56:56 -0700 (PDT) Received: from localhost ([188.25.93.165]) by mx.google.com with ESMTPS id y2sm3511678bkx.20.2010.08.28.07.56.55 (version=SSLv3 cipher=RC4-MD5); Sat, 28 Aug 2010 07:56:55 -0700 (PDT) From: Eduard - Gabriel Munteanu To: mst@redhat.com Date: Sat, 28 Aug 2010 17:54:58 +0300 Message-Id: <1283007298-10942-8-git-send-email-eduard.munteanu@linux360.ro> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1283007298-10942-1-git-send-email-eduard.munteanu@linux360.ro> References: <1283007298-10942-1-git-send-email-eduard.munteanu@linux360.ro> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: kvm@vger.kernel.org, joro@8bytes.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 7/7] ac97: use the PCI 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 Acked-by: malc --- 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;