From patchwork Thu Jun 20 14:44:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 252974 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C1E4D2C0097 for ; Fri, 21 Jun 2013 00:51:12 +1000 (EST) Received: from localhost ([::1]:40427 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpgCc-0006XU-Sb for incoming@patchwork.ozlabs.org; Thu, 20 Jun 2013 10:51:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37381) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Upg7Q-0007LD-JZ for qemu-devel@nongnu.org; Thu, 20 Jun 2013 10:45:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Upg7L-0007HR-IF for qemu-devel@nongnu.org; Thu, 20 Jun 2013 10:45:48 -0400 Received: from mail-ea0-x229.google.com ([2a00:1450:4013:c01::229]:53819) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Upg7L-0007HF-5m for qemu-devel@nongnu.org; Thu, 20 Jun 2013 10:45:43 -0400 Received: by mail-ea0-f169.google.com with SMTP id h15so4008181eak.14 for ; Thu, 20 Jun 2013 07:45:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=dd1kdSJoV6dUZca8bZuM1MYkO2Ip3jrjvyp5+cxOodM=; b=LnEWs+acQdRXM3zVNWP8KVhTpgkXpkiFFEmurOtzNGSuVE1DgtdP9u5toaZGYeZD6A Aa3a7MwD/IX8A6JRIBiq3PcoWroyNuSOeQF4nueI34zffkGMofifYUCbvJNeOnBZMd/N iAdZSELQPAYgE/3G61ub/UKaepmDxxxvHCm1YVLtXsObnhDryez2kwHvku8QG/+MfGsL K+7/RrCScYk1207jfxilBDnzGDWIfEPldDHwW6NUa1vBi4UjvsASfbBYEMh7ytZjMagY PbKqfAnZ5jHvcfQmSvRlGNb64MYgjuM/W/x+BG5fDiCa9O3XeYowj3bqAu1WJgOWvHlf 6trQ== X-Received: by 10.14.103.196 with SMTP id f44mr6229558eeg.37.1371739542407; Thu, 20 Jun 2013 07:45:42 -0700 (PDT) Received: from playground.lan (net-37-116-217-184.cust.dsl.vodafone.it. [37.116.217.184]) by mx.google.com with ESMTPSA id y10sm973958eev.3.2013.06.20.07.45.40 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 20 Jun 2013 07:45:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 20 Jun 2013 16:44:48 +0200 Message-Id: <1371739493-10187-21-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1371739493-10187-1-git-send-email-pbonzini@redhat.com> References: <1371739493-10187-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::229 Subject: [Qemu-devel] [PATCH 20/25] spapr_vio: take care of creating our own AddressSpace/DMAContext 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 Fetch the root region from the sPAPRTCETable, and use it to build an AddressSpace and DMAContext. Now, everywhere we have a DMAContext we also have access to the corresponding AddressSpace (either because we create it just before the DMAContext, or because dma_context_memory's AddressSpace is trivially address_space_memory). Acked-by: David Gibson Signed-off-by: Paolo Bonzini --- hw/ppc/spapr_iommu.c | 11 ----------- hw/ppc/spapr_vio.c | 3 ++- include/hw/ppc/spapr.h | 1 - include/hw/ppc/spapr_vio.h | 21 +++++++++++---------- 4 files changed, 13 insertions(+), 23 deletions(-) diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c index 4667e11..91bc8e4 100644 --- a/hw/ppc/spapr_iommu.c +++ b/hw/ppc/spapr_iommu.c @@ -37,10 +37,6 @@ enum sPAPRTCEAccess { }; struct sPAPRTCETable { - /* temporary until everyone has its own AddressSpace */ - DMAContext dma; - AddressSpace as; - uint32_t liobn; uint32_t window_size; sPAPRTCE *table; @@ -157,8 +153,6 @@ sPAPRTCETable *spapr_tce_new_table(uint32_t liobn, size_t window_size) memory_region_init_iommu(&tcet->iommu, &spapr_iommu_ops, "iommu-spapr", UINT64_MAX); - address_space_init(&tcet->as, &tcet->iommu); - dma_context_init(&tcet->dma, &tcet->as); QLIST_INSERT_HEAD(&spapr_tce_tables, tcet, list); @@ -178,11 +172,6 @@ void spapr_tce_free(sPAPRTCETable *tcet) g_free(tcet); } -DMAContext *spapr_tce_get_dma(sPAPRTCETable *tcet) -{ - return &tcet->dma; -} - MemoryRegion *spapr_tce_get_iommu(sPAPRTCETable *tcet) { return &tcet->iommu; diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index ae906a7..09cda64 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -454,7 +454,8 @@ static int spapr_vio_busdev_init(DeviceState *qdev) if (pc->rtce_window_size) { uint32_t liobn = SPAPR_VIO_BASE_LIOBN | dev->reg; dev->tcet = spapr_tce_new_table(liobn, pc->rtce_window_size); - dev->dma = spapr_tce_get_dma(dev->tcet); + address_space_init(&dev->as, spapr_tce_get_iommu(dev->tcet)); + dma_context_init(&dev->dma, &dev->as); } return pc->init(dev); diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 142abb7..a83720e 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -348,7 +348,6 @@ void spapr_iommu_init(void); void spapr_events_init(sPAPREnvironment *spapr); void spapr_events_fdt_skel(void *fdt, uint32_t epow_irq); sPAPRTCETable *spapr_tce_new_table(uint32_t liobn, size_t window_size); -DMAContext *spapr_tce_get_dma(sPAPRTCETable *tcet); MemoryRegion *spapr_tce_get_iommu(sPAPRTCETable *tcet); void spapr_tce_free(sPAPRTCETable *tcet); void spapr_tce_reset(sPAPRTCETable *tcet); diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h index 56f2821..2de58f1 100644 --- a/include/hw/ppc/spapr_vio.h +++ b/include/hw/ppc/spapr_vio.h @@ -63,8 +63,9 @@ struct VIOsPAPRDevice { uint32_t irq; target_ulong signal_state; VIOsPAPR_CRQ crq; + AddressSpace as; + DMAContext dma; sPAPRTCETable *tcet; - DMAContext *dma; }; #define DEFINE_SPAPR_PROPERTIES(type, field) \ @@ -92,35 +93,35 @@ static inline qemu_irq spapr_vio_qirq(VIOsPAPRDevice *dev) static inline bool spapr_vio_dma_valid(VIOsPAPRDevice *dev, uint64_t taddr, uint32_t size, DMADirection dir) { - return dma_memory_valid(dev->dma, taddr, size, dir); + return dma_memory_valid(&dev->dma, taddr, size, dir); } static inline int spapr_vio_dma_read(VIOsPAPRDevice *dev, uint64_t taddr, void *buf, uint32_t size) { - return (dma_memory_read(dev->dma, taddr, buf, size) != 0) ? + return (dma_memory_read(&dev->dma, taddr, buf, size) != 0) ? H_DEST_PARM : H_SUCCESS; } static inline int spapr_vio_dma_write(VIOsPAPRDevice *dev, uint64_t taddr, const void *buf, uint32_t size) { - return (dma_memory_write(dev->dma, taddr, buf, size) != 0) ? + return (dma_memory_write(&dev->dma, taddr, buf, size) != 0) ? H_DEST_PARM : H_SUCCESS; } static inline int spapr_vio_dma_set(VIOsPAPRDevice *dev, uint64_t taddr, uint8_t c, uint32_t size) { - return (dma_memory_set(dev->dma, taddr, c, size) != 0) ? + return (dma_memory_set(&dev->dma, taddr, c, size) != 0) ? H_DEST_PARM : H_SUCCESS; } -#define vio_stb(_dev, _addr, _val) (stb_dma((_dev)->dma, (_addr), (_val))) -#define vio_sth(_dev, _addr, _val) (stw_be_dma((_dev)->dma, (_addr), (_val))) -#define vio_stl(_dev, _addr, _val) (stl_be_dma((_dev)->dma, (_addr), (_val))) -#define vio_stq(_dev, _addr, _val) (stq_be_dma((_dev)->dma, (_addr), (_val))) -#define vio_ldq(_dev, _addr) (ldq_be_dma((_dev)->dma, (_addr))) +#define vio_stb(_dev, _addr, _val) (stb_dma(&(_dev)->dma, (_addr), (_val))) +#define vio_sth(_dev, _addr, _val) (stw_be_dma(&(_dev)->dma, (_addr), (_val))) +#define vio_stl(_dev, _addr, _val) (stl_be_dma(&(_dev)->dma, (_addr), (_val))) +#define vio_stq(_dev, _addr, _val) (stq_be_dma(&(_dev)->dma, (_addr), (_val))) +#define vio_ldq(_dev, _addr) (ldq_be_dma(&(_dev)->dma, (_addr))) int spapr_vio_send_crq(VIOsPAPRDevice *dev, uint8_t *crq);