From patchwork Fri Jun 5 15:21:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 49581 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 841542154F for ; Fri, 5 Jun 2015 15:22:38 +0000 (UTC) Received: by lbbti3 with SMTP id ti3sf18804761lbb.1 for ; Fri, 05 Jun 2015 08:22:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=3Wd6yV1f5nNdvVTo8KC/JpzLqIqfEKW6OyTwuaKSOqM=; b=fHum6D9+7cuRdRn8kFOIitN8GN4EBj0YcOdq0q263G4ZF8sXlgzEaAHo4iI8yn34yW yWghYnYIuEhPmPCY6h/A8l9QhevEYEYl4GTahoV4RF6yjyvkWxMvwTwJ/DahxZbRqJQY pX28Qcy0ok4FlK1Dqnu1BG0HcmjQHYtdYPJy69dLz4FaVIIK+nmMPdNJG557MJC2vMlo mo6BoXySQgQ4CKlBhNBkQ1h0zdIvs1Kas8F4kdFGw/VyKowUPs8WjVX2WxQ3ycC9Ennh L1HDYLqT7JAGdAkuYY78uNooLdO1Edhihkb5wQVmUcP8b1HpdASw6kHwinjmfNl+zi+p dgbA== X-Gm-Message-State: ALoCoQk5pkJ+KXwYGQyvvQz1wpOXLJJ6p2uAw8NxjpsRpZxJ8JWLlceG/BI52rVvHlE5d5qSCO6l X-Received: by 10.194.47.179 with SMTP id e19mr3664500wjn.4.1433517757462; Fri, 05 Jun 2015 08:22:37 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.20.103 with SMTP id m7ls178074lae.79.gmail; Fri, 05 Jun 2015 08:22:37 -0700 (PDT) X-Received: by 10.112.12.68 with SMTP id w4mr3764574lbb.87.1433517757302; Fri, 05 Jun 2015 08:22:37 -0700 (PDT) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id dz10si5065569lac.88.2015.06.05.08.22.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jun 2015 08:22:37 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by lbcmx3 with SMTP id mx3so48130369lbc.1 for ; Fri, 05 Jun 2015 08:22:37 -0700 (PDT) X-Received: by 10.152.6.69 with SMTP id y5mr3817264lay.72.1433517757021; Fri, 05 Jun 2015 08:22:37 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1519692lbb; Fri, 5 Jun 2015 08:22:36 -0700 (PDT) X-Received: by 10.180.75.48 with SMTP id z16mr61784867wiv.49.1433517756470; Fri, 05 Jun 2015 08:22:36 -0700 (PDT) Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com. [209.85.212.173]) by mx.google.com with ESMTPS id he1si4634703wib.34.2015.06.05.08.22.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jun 2015 08:22:36 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 209.85.212.173 as permitted sender) client-ip=209.85.212.173; Received: by wibut5 with SMTP id ut5so24645016wib.1 for ; Fri, 05 Jun 2015 08:22:36 -0700 (PDT) X-Received: by 10.194.192.72 with SMTP id he8mr7510450wjc.11.1433517756206; Fri, 05 Jun 2015 08:22:36 -0700 (PDT) Received: from gnx2579.home (LCaen-156-56-7-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by mx.google.com with ESMTPSA id z12sm11045351wjq.12.2015.06.05.08.22.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jun 2015 08:22:34 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, christoffer.dall@linaro.org, marc.zyngier@arm.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, patches@linaro.org, alex.williamson@redhat.com, b.reynal@virtualopensystems.com, Kim Phillips Subject: [PATCH] KVM: arm/arm64: Enable the KVM-VFIO device Date: Fri, 5 Jun 2015 17:21:49 +0200 Message-Id: <1433517709-6872-1-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: eric.auger@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Kim Phillips The KVM-VFIO device is used by the QEMU VFIO device. It is used to record the list of in-use VFIO groups so that KVM can manipulate them. Signed-off-by: Kim Phillips Signed-off-by: Eric Auger --- - previously included in KVM-VFIO IRQ forward control v6 series. Rationale to put it aside is the unavailability of the kvm-vfio device causes produces a warning when launching the QEMU VFIO platform device that can puzzle some users (although not blocking): "Failed to create KVM VFIO device: No such device" --- arch/arm/kvm/Kconfig | 1 + arch/arm/kvm/Makefile | 2 +- arch/arm64/kvm/Kconfig | 1 + arch/arm64/kvm/Makefile | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig index f1f79d1..bfb915d 100644 --- a/arch/arm/kvm/Kconfig +++ b/arch/arm/kvm/Kconfig @@ -28,6 +28,7 @@ config KVM select KVM_GENERIC_DIRTYLOG_READ_PROTECT select SRCU select MMU_NOTIFIER + select KVM_VFIO select HAVE_KVM_EVENTFD select HAVE_KVM_IRQFD depends on ARM_VIRT_EXT && ARM_LPAE && ARM_ARCH_TIMER diff --git a/arch/arm/kvm/Makefile b/arch/arm/kvm/Makefile index 139e46c..c5eef02c 100644 --- a/arch/arm/kvm/Makefile +++ b/arch/arm/kvm/Makefile @@ -15,7 +15,7 @@ AFLAGS_init.o := -Wa,-march=armv7-a$(plus_virt) AFLAGS_interrupts.o := -Wa,-march=armv7-a$(plus_virt) KVM := ../../../virt/kvm -kvm-arm-y = $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o +kvm-arm-y = $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o $(KVM)/vfio.o obj-y += kvm-arm.o init.o interrupts.o obj-y += arm.o handle_exit.o guest.o mmu.o emulate.o reset.o diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig index 5105e29..bfffe8f 100644 --- a/arch/arm64/kvm/Kconfig +++ b/arch/arm64/kvm/Kconfig @@ -28,6 +28,7 @@ config KVM select KVM_ARM_HOST select KVM_GENERIC_DIRTYLOG_READ_PROTECT select SRCU + select KVM_VFIO select HAVE_KVM_EVENTFD select HAVE_KVM_IRQFD ---help--- diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile index d5904f8..f90f4aa 100644 --- a/arch/arm64/kvm/Makefile +++ b/arch/arm64/kvm/Makefile @@ -11,7 +11,7 @@ ARM=../../../arch/arm/kvm obj-$(CONFIG_KVM_ARM_HOST) += kvm.o -kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o +kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o $(KVM)/vfio.o kvm-$(CONFIG_KVM_ARM_HOST) += $(ARM)/arm.o $(ARM)/mmu.o $(ARM)/mmio.o kvm-$(CONFIG_KVM_ARM_HOST) += $(ARM)/psci.o $(ARM)/perf.o