From patchwork Mon Oct 29 01:34:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 194782 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 11B5C2C00A4 for ; Mon, 29 Oct 2012 13:12:42 +1100 (EST) Received: from localhost ([::1]:59010 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSeGQ-0002vg-7m for incoming@patchwork.ozlabs.org; Sun, 28 Oct 2012 21:35:38 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53021) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSeFv-0001ka-Kv for qemu-devel@nongnu.org; Sun, 28 Oct 2012 21:35:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TSeFu-0003fd-FI for qemu-devel@nongnu.org; Sun, 28 Oct 2012 21:35:07 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:49064) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSeFu-0003LF-9H for qemu-devel@nongnu.org; Sun, 28 Oct 2012 21:35:06 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so3694633pbb.4 for ; Sun, 28 Oct 2012 18:35:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references:x-gm-message-state; bh=J0VZ8vEgLCap8d2l3WThxfXATO2KK/dMyOCjVz5cO2I=; b=dIap++L6Lvp8gO5YVWxE9eXIzY5YG6pgQqzYwB9sr/yg2DwTrhH3Bhkqb1wDchXWKh vog/wapFdTPcQL0cdOeSKPGsgbeAnTVLdJplw6Kfkge8XPhJKP5vpiod1aFQEVzd0YN8 kYU77+n7NaU4KfiJcKsqa4UmMaEriYhXQNh62tTsEdtYmF3aWzy53KnSmU//JqiexQQd Rh60yA+hseLJvMgLLmJKbZJ5CdMa+0v/kvvbMPHvzDWmyLRxzKXCI4AxD1A0aOrWAWwN VeSuqVKu4Nx0wwVFtqYAXt1+tqyLdsya2sGUtN9VUMyBm/xKR2E8hKh0vYEgzvWT/2vV CAPg== Received: by 10.66.77.74 with SMTP id q10mr79206468paw.81.1351474505650; Sun, 28 Oct 2012 18:35:05 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id ju7sm5073387pbb.60.2012.10.28.18.35.02 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 28 Oct 2012 18:35:05 -0700 (PDT) From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Mon, 29 Oct 2012 11:34:35 +1000 Message-Id: X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQk9IVxcT6fYtzZeEqa9fo/Uab+bLx3cTvVdX++Ud22BcUV8aHEEJ25BHxIgGhoE03ofc9Dk X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: vineshp@xilinx.com, peter.maydell@linaro.org, Peter Crosthwaite , john.williams@xilinx.com, kraxel@redhat.com, edgar.iglesias@gmail.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH v3 4/8] usb/ehci: Abstract away PCI DMA API 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 Pull the DMAContext for the PCI DMA out at device init time and put it into the device state. Use dma_memory_read/write() instead of pci specific versions. Signed-off-by: Peter Crosthwaite --- hw/usb/hcd-ehci.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 2519484..f4c2884 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -390,6 +390,7 @@ struct EHCIState { USBBus bus; qemu_irq irq; MemoryRegion mem; + DMAContext *dma; MemoryRegion mem_caps; MemoryRegion mem_opreg; MemoryRegion mem_ports; @@ -1302,7 +1303,7 @@ static inline int get_dwords(EHCIState *ehci, uint32_t addr, int i; for(i = 0; i < num; i++, buf++, addr += sizeof(*buf)) { - pci_dma_read(&ehci->dev, addr, buf, sizeof(*buf)); + dma_memory_read(ehci->dma, addr, buf, sizeof(*buf)); *buf = le32_to_cpu(*buf); } @@ -1317,7 +1318,7 @@ static inline int put_dwords(EHCIState *ehci, uint32_t addr, for(i = 0; i < num; i++, buf++, addr += sizeof(*buf)) { uint32_t tmp = cpu_to_le32(*buf); - pci_dma_write(&ehci->dev, addr, &tmp, sizeof(tmp)); + dma_memory_write(ehci->dma, addr, &tmp, sizeof(tmp)); } return 1; @@ -1400,7 +1401,7 @@ static int ehci_init_transfer(EHCIPacket *p) cpage = get_field(p->qtd.token, QTD_TOKEN_CPAGE); bytes = get_field(p->qtd.token, QTD_TOKEN_TBYTES); offset = p->qtd.bufptr[0] & ~QTD_BUFPTR_MASK; - pci_dma_sglist_init(&p->sgl, &p->queue->ehci->dev, 5); + qemu_sglist_init(&p->sgl, 5, p->queue->ehci->dma); while (bytes > 0) { if (cpage > 4) { @@ -1629,7 +1630,7 @@ static int ehci_process_itd(EHCIState *ehci, return USB_RET_PROCERR; } - pci_dma_sglist_init(&ehci->isgl, &ehci->dev, 2); + qemu_sglist_init(&ehci->isgl, 2, ehci->dma); if (off + len > 4096) { /* transfer crosses page border */ uint32_t len2 = off + len - 4096; @@ -2389,7 +2390,7 @@ static void ehci_advance_periodic_state(EHCIState *ehci) } list |= ((ehci->frindex & 0x1ff8) >> 1); - pci_dma_read(&ehci->dev, list, &entry, sizeof entry); + dma_memory_read(ehci->dma, list, &entry, sizeof entry); entry = le32_to_cpu(entry); DPRINTF("PERIODIC state adv fr=%d. [%08X] -> %08X\n", @@ -2750,6 +2751,8 @@ static int usb_ehci_initfn(PCIDevice *dev) s->irq = s->dev.irq[3]; + s->dma = pci_dma_context(dev); + usb_bus_new(&s->bus, &ehci_bus_ops, &s->dev.qdev); for(i = 0; i < NB_PORTS; i++) { usb_register_port(&s->bus, &s->ports[i], s, i, &ehci_port_ops,