From patchwork Mon Oct 29 01:34:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 194777 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 656DB2C008C for ; Mon, 29 Oct 2012 12:35:03 +1100 (EST) Received: from localhost ([::1]:55324 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSeFp-0000uF-ES for incoming@patchwork.ozlabs.org; Sun, 28 Oct 2012 21:35:01 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45260) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSeFc-0000nl-G7 for qemu-devel@nongnu.org; Sun, 28 Oct 2012 21:34:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TSeFb-0003LK-8V for qemu-devel@nongnu.org; Sun, 28 Oct 2012 21:34:48 -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 1TSeFb-0003LF-2I for qemu-devel@nongnu.org; Sun, 28 Oct 2012 21:34:47 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so3694633pbb.4 for ; Sun, 28 Oct 2012 18:34:46 -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=mED5EgTcWL4xQEzhfNljuUQ3E3vsu/XUuXEAydgdUPM=; b=e4WSOuP5GZp2ioup9AhIRv4KaqP1RPGOjaar1IZbhejhHtbpDguFTqXTc416PDobGe ZJxAkhCudZmHy6YX09laRPA8m9ob8zQnPtTGxDWKATgAWjkvKyEGNhy5wejbDM9qzcIs CY4Ik8ALhOZG5XWXPMpzG1aYUeeEnLfH0uUebWk/YQRpxCFfIOS7jArM9J0a1+lWetZ8 hJGR9+y1xPf5fBcCNfi5xbMBh3xgKoOVol92iiW8GFdxvUMbp5+Q9xYrbqOxd9k9lGPd +4e+mYYg6uJpM5Bqzhwv2iTjH+t390mwi5qXH6TVW3KJsrW687lyWhPSzg/pvBIfSX3q qLfA== Received: by 10.68.217.104 with SMTP id ox8mr88176367pbc.35.1351474486265; Sun, 28 Oct 2012 18:34:46 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id mn5sm5082173pbc.12.2012.10.28.18.34.43 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 28 Oct 2012 18:34:45 -0700 (PDT) From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Mon, 29 Oct 2012 11:34:32 +1000 Message-Id: X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQmzVKXkNJeh2vkiHNoe8sNkMu6AlLkXScmnf/W1tqdj7sGnivl5+pTnHT4U9yNsUFjypHEX 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, john.williams@xilinx.com, kraxel@redhat.com, edgar.iglesias@gmail.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH v3 1/8] dma: Define dma_context_memory and use in sysbus-ohci 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 From: Peter Maydell Define a new global dma_context_memory which is a DMAContext corresponding to the global address_space_memory AddressSpace. This can be used by sysbus peripherals like sysbus-ohci which need to do DMA. In particular, use it in the sysbus-ohci device, which fixes a segfault when attempting to use that device. Signed-off-by: Peter Maydell Reviewed-by: Peter Crosthwaite --- dma.h | 5 +++++ exec.c | 5 +++++ hw/usb/hcd-ohci.c | 2 +- 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dma.h b/dma.h index 91ccdb5..eedf878 100644 --- a/dma.h +++ b/dma.h @@ -68,6 +68,11 @@ struct DMAContext { DMAUnmapFunc *unmap; }; +/* A global DMA context corresponding to the address_space_memory + * AddressSpace, for sysbus devices which do DMA. + */ +extern DMAContext dma_context_memory; + static inline void dma_barrier(DMAContext *dma, DMADirection dir) { /* diff --git a/exec.c b/exec.c index b0ed593..d2f6e79 100644 --- a/exec.c +++ b/exec.c @@ -34,6 +34,7 @@ #include "hw/xen.h" #include "qemu-timer.h" #include "memory.h" +#include "dma.h" #include "exec-memory.h" #if defined(CONFIG_USER_ONLY) #include @@ -103,6 +104,7 @@ static MemoryRegion *system_io; AddressSpace address_space_io; AddressSpace address_space_memory; +DMAContext dma_context_memory; MemoryRegion io_mem_ram, io_mem_rom, io_mem_unassigned, io_mem_notdirty; static MemoryRegion io_mem_subpage_ram; @@ -3276,6 +3278,9 @@ static void memory_map_init(void) memory_listener_register(&core_memory_listener, &address_space_memory); memory_listener_register(&io_memory_listener, &address_space_io); memory_listener_register(&tcg_memory_listener, &address_space_memory); + + dma_context_init(&dma_context_memory, &address_space_memory, + NULL, NULL, NULL); } MemoryRegion *get_system_memory(void) diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 0cc1e5d..a58dfa0 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -1846,7 +1846,7 @@ static int ohci_init_pxa(SysBusDevice *dev) /* Cannot fail as we pass NULL for masterbus */ usb_ohci_init(&s->ohci, &dev->qdev, s->num_ports, s->dma_offset, NULL, 0, - NULL); + &dma_context_memory); sysbus_init_irq(dev, &s->ohci.irq); sysbus_init_mmio(dev, &s->ohci.mem);