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: 516611 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0THfUGI005923 for ; Sat, 29 Jan 2011 17:41:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754702Ab1A2RlG (ORCPT ); Sat, 29 Jan 2011 12:41:06 -0500 Received: from mail-fx0-f46.google.com ([209.85.161.46]:50369 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754676Ab1A2RlD (ORCPT ); Sat, 29 Jan 2011 12:41:03 -0500 Received: by mail-fx0-f46.google.com with SMTP id 20so4372013fxm.19 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 Cc: blauwirbel@gmail.com, paul@codesourcery.com, avi@redhat.com, anthony@codemonkey.ws, av1474@comtv.ru, yamahata@valinux.co.jp, kvm@vger.kernel.org, qemu-devel@nongnu.org, Eduard - Gabriel Munteanu Subject: [PATCH 07/13] ac97: use the DMA memory access interface 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: Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 29 Jan 2011 17:41:31 +0000 (UTC) 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;