From patchwork Tue Sep 9 07:31:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 37039 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f197.google.com (mail-ie0-f197.google.com [209.85.223.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A18FF20491 for ; Tue, 9 Sep 2014 07:32:06 +0000 (UTC) Received: by mail-ie0-f197.google.com with SMTP id rp18sf81193514iec.4 for ; Tue, 09 Sep 2014 00:32:06 -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: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=PDFYkiP8QcHtWPDMf+wLX2wrbPz5oZJXb2d6UqxVH00=; b=N4tO+E02ixMMLa+hqRWQcqyN6QW4COgKpGDdTAa5bdcLc3pIoXee4m02jnR9y9P4kP 5wmYW2pz2ljlNqiArA7UhQVfdMlkcCZ07kaPrdEQMLl2e4buU0PwpYfGYQIUXDS/w2xu j7GzKStu/yGqgMFB9fff4dmmLXUIEQXQEPGHlr0qcyw0z7fhTQe7KxBd5dU8khnQPNS/ q6fAJ4bfFd9HlvUdw7n6u4Hc+SRKKMVmAAMB39edNzgt6+jVHGvPLquX6ArziWxE/W2Y S1yJzXwbvPuwJtE5/D4PSBB8zIQEz6ENXIxE/FYyJOm5bqDxdaKep2B+ZRbTu2xJkmgC eOIA== X-Gm-Message-State: ALoCoQncnbUNfU2MpwYD1YJ33SuqYBH1VwHaKOucOpT064uj/GilFEg0Hh4EakNZ0CzVJeb+W+V6 X-Received: by 10.42.122.209 with SMTP id o17mr21581074icr.28.1410247926279; Tue, 09 Sep 2014 00:32:06 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.42.247 with SMTP id c110ls1335972qga.32.gmail; Tue, 09 Sep 2014 00:32:06 -0700 (PDT) X-Received: by 10.52.146.17 with SMTP id sy17mr24726957vdb.29.1410247926153; Tue, 09 Sep 2014 00:32:06 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id qw8si4900280vcb.89.2014.09.09.00.32.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 00:32:06 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id ik5so62820vcb.14 for ; Tue, 09 Sep 2014 00:32:06 -0700 (PDT) X-Received: by 10.52.35.105 with SMTP id g9mr592894vdj.61.1410247926098; Tue, 09 Sep 2014 00:32:06 -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.221.45.67 with SMTP id uj3csp244065vcb; Tue, 9 Sep 2014 00:32:05 -0700 (PDT) X-Received: by 10.180.100.202 with SMTP id fa10mr28409853wib.32.1410247925200; Tue, 09 Sep 2014 00:32:05 -0700 (PDT) Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by mx.google.com with ESMTPS id e10si17141788wiw.62.2014.09.09.00.32.04 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 00:32:05 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 209.85.212.170 as permitted sender) client-ip=209.85.212.170; Received: by mail-wi0-f170.google.com with SMTP id em10so1538wid.1 for ; Tue, 09 Sep 2014 00:32:04 -0700 (PDT) X-Received: by 10.180.96.202 with SMTP id du10mr28063285wib.48.1410247924821; Tue, 09 Sep 2014 00:32:04 -0700 (PDT) Received: from midway01-04-00.lavalab ([88.98.47.97]) by mx.google.com with ESMTPSA id s1sm14513743wiw.6.2014.09.09.00.32.03 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 00:32:04 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, a.rigo@virtualopensystems.com, kim.phillips@freescale.com, marc.zyngier@arm.com, manish.jaggi@caviumnetworks.com, joel.schopp@amd.com, agraf@suse.de, peter.maydell@linaro.org, pbonzini@redhat.com, afaerber@suse.de Cc: eric.auger@linaro.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org, will.deacon@arm.com, Bharat.Bhushan@freescale.com, stuart.yoder@freescale.com, a.motakis@virtualopensystems.com, alex.williamson@redhat.com Subject: [PATCH v6 14/16] linux-headers: Update KVM headers from linux-next tag ToBeFilled Date: Tue, 9 Sep 2014 08:31:14 +0100 Message-Id: <1410247876-4967-15-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1410247876-4967-1-git-send-email-eric.auger@linaro.org> References: <1410247876-4967-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.220.169 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: , Syncup KVM related linux headers from linux-next tree using scripts/update-linux-headers.sh. Integrate updated KVM-VFIO API related to forwarded IRQ Signed-off-by: Eric Auger --- linux-headers/linux/kvm.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h index f5d2c38..42128d5 100644 --- a/linux-headers/linux/kvm.h +++ b/linux-headers/linux/kvm.h @@ -940,6 +940,12 @@ struct kvm_device_attr { __u64 addr; /* userspace address of attr data */ }; +struct kvm_arch_forwarded_irq { + __u32 fd; /* file desciptor of the VFIO device */ + __u32 index; /* VFIO device IRQ index */ + __u32 gsi; /* gsi, ie. virtual IRQ number */ +}; + #define KVM_DEV_TYPE_FSL_MPIC_20 1 #define KVM_DEV_TYPE_FSL_MPIC_42 2 #define KVM_DEV_TYPE_XICS 3 @@ -947,6 +953,9 @@ struct kvm_device_attr { #define KVM_DEV_VFIO_GROUP 1 #define KVM_DEV_VFIO_GROUP_ADD 1 #define KVM_DEV_VFIO_GROUP_DEL 2 +#define KVM_DEV_VFIO_DEVICE 2 +#define KVM_DEV_VFIO_DEVICE_FORWARD_IRQ 1 +#define KVM_DEV_VFIO_DEVICE_UNFORWARD_IRQ 2 #define KVM_DEV_TYPE_ARM_VGIC_V2 5 #define KVM_DEV_TYPE_FLIC 6