From patchwork Tue Oct 31 17:50:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Cave-Ayland X-Patchwork-Id: 832669 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yRJs51LSyz9sNd for ; Wed, 1 Nov 2017 04:54:49 +1100 (AEDT) Received: from localhost ([::1]:46776 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e9akR-0006Wr-Ba for incoming@patchwork.ozlabs.org; Tue, 31 Oct 2017 13:54:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49540) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e9ak5-0006Vm-6p for qemu-devel@nongnu.org; Tue, 31 Oct 2017 13:54:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e9ak0-0005K1-By for qemu-devel@nongnu.org; Tue, 31 Oct 2017 13:54:25 -0400 Received: from chuckie.co.uk ([82.165.15.123]:52508 helo=s16892447.onlinehome-server.info) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e9ak0-0005IF-5J for qemu-devel@nongnu.org; Tue, 31 Oct 2017 13:54:20 -0400 Received: from [81.141.176.90] (helo=kentang.lan) by s16892447.onlinehome-server.info with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1e9ajv-000465-HE; Tue, 31 Oct 2017 17:54:16 +0000 Date: Tue, 31 Oct 2017 17:50:38 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, peter.maydell@linaro.org Message-ID: <20171031175037.GB29920@kentang.lan> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-SA-Exim-Connect-IP: 81.141.176.90 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk X-SA-Exim-Version: 4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000) X-SA-Exim-Scanned: Yes (on s16892447.onlinehome-server.info) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 82.165.15.123 Subject: [Qemu-devel] [PULL] qemu-sparc update X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" Hi Peter, Here are the last set of changes for 2.11 which is the tidy up of the sun4m DMA devices along with the switch from the legacy sun4m IOMMU API to an IOMMU memory region instead. Please pull. ATB, Mark. The following changes since commit 7fa00e204902cee0b33a0c60de87e87319d1809f: Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20171031' into staging (2017-10-31 14:28:25 +0000) are available in the git repository at: https://github.com/mcayland/qemu.git tags/qemu-sparc-signed for you to fetch changes up to badd3d62c619d24a5af62198374f42b7c510ee41: sun4m: change TYPE_SUN4M_IOMMU macro from "iommu" to "sun4m-iommu" (2017-10-31 17:25:37 +0000) ---------------------------------------------------------------- qemu-sparc update ---------------------------------------------------------------- Mark Cave-Ayland (17): sparc32_dma: rename SPARC32_DMA type to SPARC32_DMA_DEVICE sparc32_dma: split esp and le into separate DMA devices sparc32_dma: move type declarations from sparc32_dma.c to sparc32_dma.h sun4m: move DMA device wiring from sparc32_dma_init() to sun4m_hw_init() sun4m_iommu: move TYPE_SUN4M_IOMMU declaration to sun4m.h sparc32_dma: use object link instead of qdev property to pass IOMMU reference esp: move TYPE_ESP and SysBusESPState from esp.c to esp.h sparc32_dma: make esp device child of espdma device lance: move TYPE_LANCE and SysBusPCNetState from lance.c to lance.h sparc32_dma: make lance device child of ledma device sparc32_dma: introduce new SPARC32_DMA type container object sparc32_dma: remove is_ledma hack and replace with memory region alias sparc32_dma: add len to esp/le DMA memory tracing sun4m: implement IOMMU translation using IOMMU memory region sparc32_dma: switch over to using IOMMU memory region and DMA API sun4m_iommu: remove legacy sparc_iommu_memory_rw() function sun4m: change TYPE_SUN4M_IOMMU macro from "iommu" to "sun4m-iommu" hw/dma/sparc32_dma.c | 252 +++++++++++++++++++++++++++++----------- hw/dma/sun4m_iommu.c | 101 +++++++++------- hw/dma/trace-events | 8 +- hw/net/lance.c | 11 +- hw/scsi/esp.c | 13 --- hw/sparc/sun4m.c | 82 +++++-------- include/hw/net/lance.h | 45 +++++++ include/hw/scsi/esp.h | 14 +++ include/hw/sparc/sparc32_dma.h | 55 +++++++++ include/hw/sparc/sun4m.h | 35 +++--- 10 files changed, 413 insertions(+), 203 deletions(-) create mode 100644 include/hw/net/lance.h