From patchwork Wed Feb 11 08:32:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 44557 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f72.google.com (mail-ee0-f72.google.com [74.125.83.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8DFCA21527 for ; Wed, 11 Feb 2015 08:34:54 +0000 (UTC) Received: by mail-ee0-f72.google.com with SMTP id e53sf1721021eek.3 for ; Wed, 11 Feb 2015 00:34:53 -0800 (PST) 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:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=/vyXW+TzAhXyDsl0YFJovxm6/aNw8qBv7A2i51bBqxY=; b=QHU0bzbU3qdm+TaVzchTi9IM+OXPOedwg1uXsY0pD1g3T0gIlz2DZJ0i4mU+3A616Z SbEZ/rB4mwNd3YE6bmxlorRMv8Me/7SBP+t3cdGca/uUiOvD+zCSRrfvah3/uN4wEQyE QvyQ6Ia0LL3isXbed5UZDr5Vih0evbk7eI/lypJzxgaKI7cmPksh/bg4Z/ha82W2bvzN fTw3WoHauLNiPP6jNGHjGhCPV3DJUEjJkMP7By17ZKxiGFsx/rLX4cm3n2r6Zq0CjOsy RRnMLTPl/v40pjfY+Yx4SPkJFJsKLQp07qoqgJ9HHQlZGQ8cfqhN8c0y9VZOx5Ebbn9T Uccg== X-Gm-Message-State: ALoCoQkf6aC8kANbS6T+fSJQzGS/hwHyKejVO9VPWnlWyLhr7DqhWjQf162H6GbAR50Rv+X4Ut8C X-Received: by 10.180.84.7 with SMTP id u7mr225842wiy.0.1423643693806; Wed, 11 Feb 2015 00:34:53 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.97 with SMTP id p1ls33960laj.4.gmail; Wed, 11 Feb 2015 00:34:53 -0800 (PST) X-Received: by 10.112.98.202 with SMTP id ek10mr26173154lbb.30.1423643693582; Wed, 11 Feb 2015 00:34:53 -0800 (PST) Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com. [209.85.217.174]) by mx.google.com with ESMTPS id x4si96739lbm.37.2015.02.11.00.34.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Feb 2015 00:34:53 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) client-ip=209.85.217.174; Received: by mail-lb0-f174.google.com with SMTP id z11so1825703lbi.5 for ; Wed, 11 Feb 2015 00:34:53 -0800 (PST) X-Received: by 10.152.6.101 with SMTP id z5mr27033912laz.19.1423643693509; Wed, 11 Feb 2015 00:34:53 -0800 (PST) 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.35.133 with SMTP id h5csp1110023lbj; Wed, 11 Feb 2015 00:34:52 -0800 (PST) X-Received: by 10.107.19.89 with SMTP id b86mr5381752ioj.35.1423643691164; Wed, 11 Feb 2015 00:34:51 -0800 (PST) Received: from mail-ig0-f179.google.com (mail-ig0-f179.google.com. [209.85.213.179]) by mx.google.com with ESMTPS id y73si109747ioi.26.2015.02.11.00.34.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Feb 2015 00:34:51 -0800 (PST) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 209.85.213.179 as permitted sender) client-ip=209.85.213.179; Received: by mail-ig0-f179.google.com with SMTP id l13so2984201iga.0 for ; Wed, 11 Feb 2015 00:34:50 -0800 (PST) X-Received: by 10.43.78.196 with SMTP id zn4mr1786176icb.81.1423643690398; Wed, 11 Feb 2015 00:34:50 -0800 (PST) Received: from gnx2579.solutionip.com ([113.28.134.59]) by mx.google.com with ESMTPSA id m38sm62189ioi.39.2015.02.11.00.34.45 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 11 Feb 2015 00:34:49 -0800 (PST) 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, alex.williamson@redhat.com, feng.wu@intel.com Cc: andre.przywara@arm.com, patches@linaro.org, a.motakis@virtualopensystems.com, a.rigo@virtualopensystems.com, b.reynal@virtualopensystems.com, gleb@kernel.org, pbonzini@redhat.com, Kim Phillips Subject: [RFC v4 01/13] KVM: arm/arm64: Enable the KVM-VFIO device Date: Wed, 11 Feb 2015 09:32:11 +0100 Message-Id: <1423643543-24409-2-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1423643543-24409-1-git-send-email-eric.auger@linaro.org> References: <1423643543-24409-1-git-send-email-eric.auger@linaro.org> 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.174 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. With this series, it will also be used to record the forwarded IRQs. Signed-off-by: Kim Phillips Signed-off-by: Eric Auger --- v4 -> v5: - reword the commit message to explain both usages of the KVM-VFIO device in QEMU - squash both arm and arm64 enables --- 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 7db7df4..0ddb745 100644 --- a/arch/arm/kvm/Kconfig +++ b/arch/arm/kvm/Kconfig @@ -25,6 +25,7 @@ config KVM select KVM_ARM_HOST select SRCU depends on ARM_VIRT_EXT && ARM_LPAE + select KVM_VFIO select HAVE_KVM_EVENTFD ---help--- Support hosting virtualized guest machines. You will also diff --git a/arch/arm/kvm/Makefile b/arch/arm/kvm/Makefile index 859db09..ea1fa76 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 0965056..b73fba8 100644 --- a/arch/arm64/kvm/Kconfig +++ b/arch/arm64/kvm/Kconfig @@ -27,6 +27,7 @@ config KVM select KVM_ARM_VGIC select KVM_ARM_TIMER select SRCU + select KVM_VFIO select HAVE_KVM_EVENTFD ---help--- Support hosting virtualized guest machines. diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile index 2e6b827..81ed091 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