From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59333) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6z16-0003Ia-QF for qemu-devel@nongnu.org; Wed, 07 Aug 2013 04:22:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V6z10-0007Z3-L9 for qemu-devel@nongnu.org; Wed, 07 Aug 2013 04:22:48 -0400 Received: from mail-pd0-f173.google.com ([209.85.192.173]:51930) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6z10-0007Yt-EU for qemu-devel@nongnu.org; Wed, 07 Aug 2013 04:22:42 -0400 Received: by mail-pd0-f173.google.com with SMTP id p11so1136132pdj.32 for ; Wed, 07 Aug 2013 01:22:41 -0700 (PDT) From: Alexey Kardashevskiy Date: Wed, 7 Aug 2013 18:21:32 +1000 Message-Id: <1375863692-12207-9-git-send-email-aik@ozlabs.ru> In-Reply-To: <1375863692-12207-1-git-send-email-aik@ozlabs.ru> References: <1375863692-12207-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH 8/8] spapr vfio: enable for spapr List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , "Michael S . Tsirkin" , Alexey Kardashevskiy , Alexander Graf , Alex Williamson , qemu-ppc@nongnu.org, Paolo Bonzini , Paul Mackerras , David Gibson This turns the sPAPR support on and enables VFIO container use in the kernel. Signed-off-by: Alexey Kardashevskiy --- hw/misc/vfio.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c index 4571f64..4484826 100644 --- a/hw/misc/vfio.c +++ b/hw/misc/vfio.c @@ -2812,6 +2812,37 @@ static int vfio_connect_container(VFIOGroup *group, VFIOAddressSpace *space) memory_listener_register(&container->iommu_data.listener, container->space->as); + } else if (ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_SPAPR_TCE_IOMMU)) { + ret = ioctl(group->fd, VFIO_GROUP_SET_CONTAINER, &fd); + if (ret) { + error_report("vfio: failed to set group container: %m"); + g_free(container); + close(fd); + return -errno; + } + + ret = ioctl(fd, VFIO_SET_IOMMU, VFIO_SPAPR_TCE_IOMMU); + if (ret) { + error_report("vfio: failed to set iommu for container: %m"); + g_free(container); + close(fd); + return -errno; + } + + ret = ioctl(fd, VFIO_IOMMU_ENABLE); + if (ret) { + error_report("vfio: failed to enable container: %s", + strerror(errno)); + g_free(container); + close(fd); + return -errno; + } + + container->iommu_data.listener = vfio_memory_listener; + container->iommu_data.release = vfio_listener_release; + + memory_listener_register(&container->iommu_data.listener, + container->space->as); } else { error_report("vfio: No available IOMMU models"); g_free(container); -- 1.8.3.2