From patchwork Thu Mar 19 17:16:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 46054 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8B41521580 for ; Thu, 19 Mar 2015 17:16:51 +0000 (UTC) Received: by widex7 with SMTP id ex7sf14083936wid.2 for ; Thu, 19 Mar 2015 10:16:50 -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=8M0O1lTfoTW70oP8dGizHEqbBxylibtxemXY6lea7pA=; b=RXs76uOHeD6pSPZSvpKaWCKd06kOhQnqpsJ3r0Mp96kbUcpm8l9yCOYOAd+TTcYLWC jDKuDB6OjVNcjWHeLapB3I6JmowXWtvkW4vb7YaFBFt3yJLBKQ3LkDt2BK9q9L3B9g8U +anWGUOPh8tVpoWEA0cvy5iUSBkBBGNpeqK9fPP2wzSG6bb4XAnn9pEBD22XAfElaLzY rgVfjcinGk883Izz+JPDdlFF/f13A2VESdjRCww25D0sB4QtVZFmH+fBYkI4ma0CvUJ7 cAOobKKqZJkIZ1zncyB1wVgHqGK9YjlsGTg4miBpr+6t1WYrsK8djnc9VTxaRf4N4rko Y3SQ== X-Gm-Message-State: ALoCoQnn7ttvSC240mQB2SIxCqmqLR2n73JI0OCBZy07kiLR9KJUajZEf2SqQnx5NB7tKJmQ9h5q X-Received: by 10.194.11.70 with SMTP id o6mr12308877wjb.6.1426785410889; Thu, 19 Mar 2015 10:16:50 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.228.169 with SMTP id sj9ls341096lac.35.gmail; Thu, 19 Mar 2015 10:16:50 -0700 (PDT) X-Received: by 10.152.87.46 with SMTP id u14mr49153936laz.82.1426785410732; Thu, 19 Mar 2015 10:16:50 -0700 (PDT) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id q1si1422587laj.84.2015.03.19.10.16.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Mar 2015 10:16:50 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by lbcgn8 with SMTP id gn8so57753545lbc.2 for ; Thu, 19 Mar 2015 10:16:50 -0700 (PDT) X-Received: by 10.152.116.11 with SMTP id js11mr47861603lab.106.1426785410533; Thu, 19 Mar 2015 10:16:50 -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.35.133 with SMTP id h5csp528042lbj; Thu, 19 Mar 2015 10:16:50 -0700 (PDT) X-Received: by 10.180.20.43 with SMTP id k11mr17827154wie.93.1426785409925; Thu, 19 Mar 2015 10:16:49 -0700 (PDT) Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com. [209.85.212.181]) by mx.google.com with ESMTPS id u20si4065979wib.59.2015.03.19.10.16.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Mar 2015 10:16:49 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 209.85.212.181 as permitted sender) client-ip=209.85.212.181; Received: by wixw10 with SMTP id w10so75506795wix.0 for ; Thu, 19 Mar 2015 10:16:49 -0700 (PDT) X-Received: by 10.180.216.38 with SMTP id on6mr10223632wic.15.1426785409631; Thu, 19 Mar 2015 10:16:49 -0700 (PDT) Received: from midway01-04-00.lavalab ([81.128.185.50]) by mx.google.com with ESMTPSA id pa4sm2767071wjb.11.2015.03.19.10.16.48 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 19 Mar 2015 10:16:48 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, qemu-devel@nongnu.org, alex.williamson@redhat.com, peter.maydell@linaro.org, agraf@suse.de Cc: christoffer.dall@linaro.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org, pbonzini@redhat.com, alex.bennee@linaro.org, kim.phillips@freescale.com, b.reynal@virtualopensystems.com, a.rigo@virtualopensystems.com Subject: [PATCH v12 1/9] linux-headers: update VFIO header for VFIO platform/amba drivers Date: Thu, 19 Mar 2015 17:16:33 +0000 Message-Id: <1426785402-2091-2-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1426785402-2091-1-git-send-email-eric.auger@linaro.org> References: <1426785402-2091-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.171 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: , Update according to the vfio.h header found in ssh://git@git.linaro.org/people/eric.auger/linux.git branch 4.0-rc3-v14 --- v10 -> v11: - only includes header modifications related to vfio platform driver v14 and not those related to "vfio: type1: support for ARM SMMUS with VFIO_IOMMU_TYPE1" --- linux-headers/linux/vfio.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/linux-headers/linux/vfio.h b/linux-headers/linux/vfio.h index 95ba870..b57b750 100644 --- a/linux-headers/linux/vfio.h +++ b/linux-headers/linux/vfio.h @@ -8,8 +8,8 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#ifndef VFIO_H -#define VFIO_H +#ifndef _UAPIVFIO_H +#define _UAPIVFIO_H #include #include @@ -160,6 +160,8 @@ struct vfio_device_info { __u32 flags; #define VFIO_DEVICE_FLAGS_RESET (1 << 0) /* Device supports reset */ #define VFIO_DEVICE_FLAGS_PCI (1 << 1) /* vfio-pci device */ +#define VFIO_DEVICE_FLAGS_PLATFORM (1 << 2) /* vfio-platform device */ +#define VFIO_DEVICE_FLAGS_AMBA (1 << 3) /* vfio-amba device */ __u32 num_regions; /* Max region index + 1 */ __u32 num_irqs; /* Max IRQ index + 1 */ }; @@ -495,4 +497,4 @@ struct vfio_eeh_pe_op { /* ***************************************************************** */ -#endif /* VFIO_H */ +#endif /* _UAPIVFIO_H */