From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45253) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UekH4-0005Fn-TW for qemu-devel@nongnu.org; Tue, 21 May 2013 06:58:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UekH3-0005bT-Pp for qemu-devel@nongnu.org; Tue, 21 May 2013 06:58:34 -0400 Received: from mail-ee0-f42.google.com ([74.125.83.42]:34619) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UekH3-0005bI-FA for qemu-devel@nongnu.org; Tue, 21 May 2013 06:58:33 -0400 Received: by mail-ee0-f42.google.com with SMTP id c50so299371eek.15 for ; Tue, 21 May 2013 03:58:32 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 21 May 2013 12:57:26 +0200 Message-Id: <1369133851-1894-26-git-send-email-pbonzini@redhat.com> In-Reply-To: <1369133851-1894-1-git-send-email-pbonzini@redhat.com> References: <1369133851-1894-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 25/30] spapr: use memory core for iommu support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jan.kiszka@gmail.com, David Gibson Now we can stop using a "translating" DMAContext, but we do not yet modify the sPAPRTCETable users to get an AddressSpace; they keep using the table via a DMAContext. Acked-by: David Gibson Signed-off-by: Paolo Bonzini --- hw/ppc/spapr_iommu.c | 49 +++++++++++++++++++++++++++---------------------- include/hw/ppc/spapr.h | 1 + 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c index f6d74fe..f7b1b18 100644 --- a/hw/ppc/spapr_iommu.c +++ b/hw/ppc/spapr_iommu.c @@ -37,12 +37,16 @@ enum sPAPRTCEAccess { }; struct sPAPRTCETable { + /* temporary until everyone has its own AddressSpace */ DMAContext dma; + AddressSpace as; + uint32_t liobn; uint32_t window_size; sPAPRTCE *table; bool bypass; int fd; + MemoryRegion iommu; QLIST_ENTRY(sPAPRTCETable) list; }; @@ -68,8 +72,9 @@ static sPAPRTCETable *spapr_tce_find_by_liobn(uint32_t liobn) return NULL; } -static IOMMUTLBEntry spapr_tce_translate_iommu(sPAPRTCETable *tcet, hwaddr addr) +static IOMMUTLBEntry spapr_tce_translate_iommu(MemoryRegion *iommu, hwaddr addr) { + sPAPRTCETable *tcet = container_of(iommu, sPAPRTCETable, iommu); uint64_t tce; #ifdef DEBUG_TCE @@ -109,25 +114,9 @@ static IOMMUTLBEntry spapr_tce_translate_iommu(sPAPRTCETable *tcet, hwaddr addr) }; } -static int spapr_tce_translate(DMAContext *dma, - dma_addr_t addr, - hwaddr *paddr, - hwaddr *len, - DMADirection dir) - { - sPAPRTCETable *tcet = DO_UPCAST(sPAPRTCETable, dma, dma); - bool is_write = (dir == DMA_DIRECTION_FROM_DEVICE); - IOMMUTLBEntry entry = spapr_tce_translate_iommu(tcet, addr); - - if (!(entry.perm & (1 << is_write))) { - return -EPERM; - } - - /* Translate */ - *paddr = entry.translated_addr | (addr & entry.addr_mask); - *len = (addr | entry.addr_mask) - addr + 1; - return 0; -} +static MemoryRegionIOMMUOps spapr_iommu_ops = { + .translate = spapr_tce_translate_iommu, +}; sPAPRTCETable *spapr_tce_new_table(uint32_t liobn, size_t window_size) { @@ -144,8 +133,6 @@ sPAPRTCETable *spapr_tce_new_table(uint32_t liobn, size_t window_size) } tcet = g_malloc0(sizeof(*tcet)); - dma_context_init(&tcet->dma, &address_space_memory, spapr_tce_translate, NULL, NULL); - tcet->liobn = liobn; tcet->window_size = window_size; @@ -166,6 +153,12 @@ sPAPRTCETable *spapr_tce_new_table(uint32_t liobn, size_t window_size) "table @ %p, fd=%d\n", tcet, liobn, tcet->table, tcet->fd); #endif + memory_region_init_iommu(&tcet->iommu, &spapr_iommu_ops, + &address_space_memory, + "iommu-spapr", INT64_MAX); + address_space_init(&tcet->as, &tcet->iommu); + dma_context_init(&tcet->dma, &tcet->as, NULL, NULL, NULL); + QLIST_INSERT_HEAD(&spapr_tce_tables, tcet, list); return tcet; @@ -189,6 +182,11 @@ DMAContext *spapr_tce_get_dma(sPAPRTCETable *tcet) return &tcet->dma; } +MemoryRegion *spapr_tce_get_iommu(sPAPRTCETable *tcet) +{ + return &tcet->iommu; +} + void spapr_tce_set_bypass(sPAPRTCETable *tcet, bool bypass) { tcet->bypass = bypass; @@ -207,6 +205,7 @@ static target_ulong put_tce_emu(sPAPRTCETable *tcet, target_ulong ioba, target_ulong tce) { sPAPRTCE *tcep; + IOMMUTLBEntry entry; if (ioba >= tcet->window_size) { hcall_dprintf("spapr_vio_put_tce on out-of-bounds IOBA 0x" @@ -217,6 +216,12 @@ static target_ulong put_tce_emu(sPAPRTCETable *tcet, target_ulong ioba, tcep = tcet->table + (ioba >> SPAPR_TCE_PAGE_SHIFT); tcep->tce = tce; + entry.iova = ioba & ~SPAPR_TCE_PAGE_MASK; + entry.translated_addr = tce & ~SPAPR_TCE_PAGE_MASK; + entry.addr_mask = SPAPR_TCE_PAGE_MASK; + entry.perm = tce; + memory_region_notify_iommu(&tcet->iommu, entry); + return H_SUCCESS; } diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index e8d617b..142abb7 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -349,6 +349,7 @@ 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); void spapr_tce_set_bypass(sPAPRTCETable *tcet, bool bypass); -- 1.8.1.4