From patchwork Sun Aug 15 19:27:22 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: 119636 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7FJUxvK022857 for ; Sun, 15 Aug 2010 19:30:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751363Ab0HOTa4 (ORCPT ); Sun, 15 Aug 2010 15:30:56 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:52742 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751307Ab0HOTas (ORCPT ); Sun, 15 Aug 2010 15:30:48 -0400 Received: by mail-fx0-f46.google.com with SMTP id 13so2628988fxm.19 for ; Sun, 15 Aug 2010 12:30:47 -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=e22Ox6n6QVdUAMeb2h/O+47Y2suxPkjsZGVNnFLTuTc=; b=UEoPkK+cGgumCkKexrIDrkXqubpZhi/MwEcFUEFny7f2WAZ6HUkQ7A8TJTkptSgKQm /R5cnfqii1fnjlE/xktW47cITnUZOAGBAtrcX62BUMIJKq5yvwVrYK3RG0lhyEB3zD9F 0+YxHKVtEAJB6JiOgHHACI94SbM64ApcQ/JEo= 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=Vior6e4rYwDYONXyyb/eNAci5Wonilh7s2lJoRMLwwRi3NCW1z5LZv+sHe541gtF60 XnIihoeO0vKMuLF0Fv3Fpdafrc3UeAnrN8fh+6FiOP3l3m2UltL/jdslNLtpt0rpVYqW fSU6Tx78hdsIy0OJ8c8/8Ba1ghVF6GwNw23mo= Received: by 10.223.106.132 with SMTP id x4mr4408103fao.15.1281900647611; Sun, 15 Aug 2010 12:30:47 -0700 (PDT) Received: from localhost.localdomain ([178.138.32.54]) by mx.google.com with ESMTPS id r4sm1362656faa.43.2010.08.15.12.30.46 (version=SSLv3 cipher=RC4-MD5); Sun, 15 Aug 2010 12:30:47 -0700 (PDT) From: Eduard - Gabriel Munteanu To: joro@8bytes.org Cc: paul@codesourcery.com, blauwirbel@gmail.com, anthony@codemonkey.ws, avi@redhat.com, kvm@vger.kernel.org, qemu-devel@nongnu.org, Eduard - Gabriel Munteanu Subject: [PATCH 7/7] ac97: use the PCI memory access interface Date: Sun, 15 Aug 2010 22:27:22 +0300 Message-Id: <1281900442-29971-8-git-send-email-eduard.munteanu@linux360.ro> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1281900442-29971-1-git-send-email-eduard.munteanu@linux360.ro> References: <1281900442-29971-1-git-send-email-eduard.munteanu@linux360.ro> 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.3 (demeter.kernel.org [140.211.167.41]); Sun, 15 Aug 2010 19:31:00 +0000 (UTC) diff --git a/hw/ac97.c b/hw/ac97.c index 4319bc8..9ee4894 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;