From patchwork Wed Jul 14 05:45:07 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: 58840 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 9D5011007D2 for ; Wed, 14 Jul 2010 15:50:32 +1000 (EST) Received: from localhost ([127.0.0.1]:40857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYurV-00010n-Pu for incoming@patchwork.ozlabs.org; Wed, 14 Jul 2010 01:50:29 -0400 Received: from [140.186.70.92] (port=39881 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYunv-00089M-A2 for qemu-devel@nongnu.org; Wed, 14 Jul 2010 01:46:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OYunt-0008OS-4g for qemu-devel@nongnu.org; Wed, 14 Jul 2010 01:46:47 -0400 Received: from mail-bw0-f45.google.com ([209.85.214.45]:62151) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OYuns-0008Nz-Q0 for qemu-devel@nongnu.org; Wed, 14 Jul 2010 01:46:45 -0400 Received: by bwz19 with SMTP id 19so541045bwz.4 for ; Tue, 13 Jul 2010 22:46:43 -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=m5XajCS/iTz93UkKyjIm+fZJsaWTNCePnvkXoU4x9GY=; b=yHMiFi7nnS116WiqIhU3GegWwaOgb4fmnTgf1M/UvFnFYkuhBNLYqxCKmSWxje7tFt yStW7aDmjv3N4a79BCOJ0ulDnSnAOQdqnx6by0TEvcYblz8cFDLxychkvDMRLPzllh7T R7MqRn//KT5d8cGUXCSh68BaZwPDuPxEfvbvw= 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=NHFwIwvamR+2lp+QPBk1+jMiz+W4+S71QUptM5GQf0Pe4f+Dt2T5ww9BvIZ/GweJUv ALTYxVDDs0c9pjPGZXSUR54QstOak9vFvEU31K5XaR1g6tj8J21iVc52Wj1hbrrmiFt1 vWXwjsHf5s7SW6N8hlvdv5MYEVN8JkdpZ32sE= Received: by 10.204.127.75 with SMTP id f11mr12898682bks.85.1279086398639; Tue, 13 Jul 2010 22:46:38 -0700 (PDT) Received: from localhost ([188.25.93.67]) by mx.google.com with ESMTPS id g11sm29670898bkw.22.2010.07.13.22.46.37 (version=SSLv3 cipher=RC4-MD5); Tue, 13 Jul 2010 22:46:38 -0700 (PDT) From: Eduard - Gabriel Munteanu To: joro@8bytes.org Date: Wed, 14 Jul 2010 08:45:07 +0300 Message-Id: <1279086307-9596-8-git-send-email-eduard.munteanu@linux360.ro> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1279086307-9596-1-git-send-email-eduard.munteanu@linux360.ro> References: <1279086307-9596-1-git-send-email-eduard.munteanu@linux360.ro> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: qemu-devel@nongnu.org, Eduard - Gabriel Munteanu , avi@redhat.com, kvm@vger.kernel.org, paul@codesourcery.com Subject: [Qemu-devel] [RFC PATCH 7/7] ac97: IOMMU support 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 Memory accesses must go through the IOMMU layer. Signed-off-by: Eduard - Gabriel Munteanu --- hw/ac97.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/hw/ac97.c b/hw/ac97.c index 4319bc8..0e30d80 100644 --- a/hw/ac97.c +++ b/hw/ac97.c @@ -15,6 +15,7 @@ */ #include "hw.h" +#include "iommu.h" #include "audiodev.h" #include "audio/audio.h" #include "pci.h" @@ -221,9 +222,13 @@ static void cold_reset (AC97LinkState * s) static void fetch_bd (AC97LinkState *s, AC97BusMasterRegs *r) { + struct iommu *iommu; + DeviceState *dev; uint8_t b[8]; - cpu_physical_memory_read (r->bdbar + r->civ * 8, b, 8); + iommu = iommu_get(&s->dev.qdev, &dev); + + iommu_read (iommu, 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]); @@ -962,6 +967,9 @@ static int write_audio (AC97LinkState *s, AC97BusMasterRegs *r, uint32_t temp = r->picb << 1; uint32_t written = 0; int to_copy = 0; + struct iommu *iommu; + DeviceState *dev; + temp = audio_MIN (temp, max); if (!temp) { @@ -969,10 +977,12 @@ static int write_audio (AC97LinkState *s, AC97BusMasterRegs *r, return 0; } + iommu = iommu_get(&s->dev.qdev, &dev); + while (temp) { int copied; to_copy = audio_MIN (temp, sizeof (tmpbuf)); - cpu_physical_memory_read (addr, tmpbuf, to_copy); + iommu_read (iommu, 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); @@ -1040,6 +1050,10 @@ static int read_audio (AC97LinkState *s, AC97BusMasterRegs *r, uint32_t nread = 0; int to_copy = 0; SWVoiceIn *voice = (r - s->bm_regs) == MC_INDEX ? s->voice_mc : s->voice_pi; + struct iommu *iommu; + DeviceState *dev; + + iommu = iommu_get(&s->dev.qdev, &dev); temp = audio_MIN (temp, max); @@ -1056,7 +1070,7 @@ static int read_audio (AC97LinkState *s, AC97BusMasterRegs *r, *stop = 1; break; } - cpu_physical_memory_write (addr, tmpbuf, acquired); + iommu_write (iommu, dev, addr, tmpbuf, acquired); temp -= acquired; addr += acquired; nread += acquired;