From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39668) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCml6-0000K2-Bz for qemu-devel@nongnu.org; Thu, 31 Jul 2014 05:34:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XCmkr-0003bL-7N for qemu-devel@nongnu.org; Thu, 31 Jul 2014 05:34:48 -0400 Received: from e23smtp01.au.ibm.com ([202.81.31.143]:41183) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCmkq-0003Zk-C9 for qemu-devel@nongnu.org; Thu, 31 Jul 2014 05:34:33 -0400 Received: from /spool/local by e23smtp01.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 31 Jul 2014 19:34:27 +1000 From: Alexey Kardashevskiy Date: Thu, 31 Jul 2014 19:34:13 +1000 Message-Id: <1406799254-25223-10-git-send-email-aik@ozlabs.ru> In-Reply-To: <1406799254-25223-1-git-send-email-aik@ozlabs.ru> References: <1406799254-25223-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [RFC PATCH 09/10] spapr_pci_vfio: Enable DDW List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Kardashevskiy , Alex Williamson , qemu-ppc@nongnu.org, Alexander Graf This implements DDW for VFIO. Host kernel support is required for this. Signed-off-by: Alexey Kardashevskiy --- hw/ppc/spapr_pci_vfio.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c index d3bddf2..dc443e2 100644 --- a/hw/ppc/spapr_pci_vfio.c +++ b/hw/ppc/spapr_pci_vfio.c @@ -69,6 +69,77 @@ static void spapr_phb_vfio_finish_realize(sPAPRPHBState *sphb, Error **errp) /* Register default 32bit DMA window */ memory_region_add_subregion(&sphb->iommu_root, tcet->bus_offset, spapr_tce_get_iommu(tcet)); + + sphb->ddw_supported = !!(info.flags & VFIO_IOMMU_SPAPR_TCE_FLAG_DDW); +} + +static int spapr_pci_vfio_ddw_query(sPAPRPHBState *sphb, + uint32_t *windows_available, + uint32_t *page_size_mask) +{ + sPAPRPHBVFIOState *svphb = SPAPR_PCI_VFIO_HOST_BRIDGE(sphb); + struct vfio_iommu_spapr_tce_query query = { .argsz = sizeof(query) }; + int ret; + + ret = vfio_container_ioctl(&sphb->iommu_as, svphb->iommugroupid, + VFIO_IOMMU_SPAPR_TCE_QUERY, &query); + if (ret) { + return ret; + } + + *windows_available = query.windows_available; + *page_size_mask = query.page_size_mask; + + return ret; +} + +static int spapr_pci_vfio_ddw_create(sPAPRPHBState *sphb, uint32_t page_shift, + uint32_t window_shift, uint32_t liobn, + sPAPRTCETable **ptcet) +{ + sPAPRPHBVFIOState *svphb = SPAPR_PCI_VFIO_HOST_BRIDGE(sphb); + struct vfio_iommu_spapr_tce_create create = { + .argsz = sizeof(create), + .page_shift = page_shift, + .window_shift = window_shift, + .start_addr = 0 + }; + int ret; + + ret = vfio_container_ioctl(&sphb->iommu_as, svphb->iommugroupid, + VFIO_IOMMU_SPAPR_TCE_CREATE, &create); + if (ret) { + return ret; + } + + *ptcet = spapr_tce_new_table(DEVICE(sphb), liobn, create.start_addr, + page_shift, 1 << (window_shift - page_shift), + true); + memory_region_add_subregion(&sphb->iommu_root, (*ptcet)->bus_offset, + spapr_tce_get_iommu(*ptcet)); + + return ret; +} + +static int spapr_pci_vfio_ddw_remove(sPAPRPHBState *sphb, sPAPRTCETable *tcet) +{ + sPAPRPHBVFIOState *svphb = SPAPR_PCI_VFIO_HOST_BRIDGE(sphb); + struct vfio_iommu_spapr_tce_remove remove = { + .argsz = sizeof(remove), + .start_addr = tcet->bus_offset + }; + + return vfio_container_ioctl(&sphb->iommu_as, svphb->iommugroupid, + VFIO_IOMMU_SPAPR_TCE_REMOVE, &remove); +} + +static int spapr_pci_vfio_ddw_reset(sPAPRPHBState *sphb) +{ + sPAPRPHBVFIOState *svphb = SPAPR_PCI_VFIO_HOST_BRIDGE(sphb); + struct vfio_iommu_spapr_tce_reset reset = { .argsz = sizeof(reset) }; + + return vfio_container_ioctl(&sphb->iommu_as, svphb->iommugroupid, + VFIO_IOMMU_SPAPR_TCE_RESET, &reset); } static void spapr_phb_vfio_reset(DeviceState *qdev) @@ -84,6 +155,10 @@ static void spapr_phb_vfio_class_init(ObjectClass *klass, void *data) dc->props = spapr_phb_vfio_properties; dc->reset = spapr_phb_vfio_reset; spc->finish_realize = spapr_phb_vfio_finish_realize; + spc->ddw_query = spapr_pci_vfio_ddw_query; + spc->ddw_create = spapr_pci_vfio_ddw_create; + spc->ddw_remove = spapr_pci_vfio_ddw_remove; + spc->ddw_reset = spapr_pci_vfio_ddw_reset; } static const TypeInfo spapr_phb_vfio_info = { -- 2.0.0