From patchwork Thu Mar 19 10:05:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 46019 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 85D312153C for ; Thu, 19 Mar 2015 10:05:50 +0000 (UTC) Received: by lams18 with SMTP id s18sf11695488lam.2 for ; Thu, 19 Mar 2015 03:05:49 -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=WK904RHVPU/O18P8gCHKd8yBf6Qaav8btG9t/pRN3Q1SGG96E2YfSfcIy+CZYAjVqJ 7aNOCYhwBCvwofJbZ3cKz9MFP+9XivN9OJERh7eip8kAnG6AvaKkf/VL+WtcFunbEZOC 1N7WXQxVnOGqa1I7AP5lu4++wWMDw4guAajjqjbsbVJ0X9naGthEXopY8YL6L7xwq2Mr +9ln+e2xHYsVJ26vBPJqwKR7QixcaccT0Z1Mb7IGC3lOWBF7QMvU23CWi/JHZjDTaw+0 rGSfFO4UPODDniSJsO8Jih1kX67NR/4+r6HVY+lRcZtvcLQqrQxsES4o8Uj9AGhRgT2i jRKw== X-Gm-Message-State: ALoCoQkMOxLKNdXKvE661RwaZgKxwL6CphQjpXkj1jkDMiBLMWiBb1Eq4S0c3zdm3se5roQ9gTr0 X-Received: by 10.194.95.67 with SMTP id di3mr11917297wjb.0.1426759549025; Thu, 19 Mar 2015 03:05:49 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.1.3 with SMTP id 3ls254757lai.36.gmail; Thu, 19 Mar 2015 03:05:48 -0700 (PDT) X-Received: by 10.112.26.43 with SMTP id i11mr5454910lbg.83.1426759548657; Thu, 19 Mar 2015 03:05:48 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id oz8si618121lbb.88.2015.03.19.03.05.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Mar 2015 03:05:48 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by lagg8 with SMTP id g8so57856519lag.1 for ; Thu, 19 Mar 2015 03:05:48 -0700 (PDT) X-Received: by 10.152.116.11 with SMTP id js11mr46290911lab.106.1426759548236; Thu, 19 Mar 2015 03:05:48 -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 h5csp276933lbj; Thu, 19 Mar 2015 03:05:47 -0700 (PDT) X-Received: by 10.194.177.167 with SMTP id cr7mr109133768wjc.19.1426759547399; Thu, 19 Mar 2015 03:05:47 -0700 (PDT) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com. [74.125.82.178]) by mx.google.com with ESMTPS id ls6si8295860wic.107.2015.03.19.03.05.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Mar 2015 03:05:47 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 74.125.82.178 as permitted sender) client-ip=74.125.82.178; Received: by weop45 with SMTP id p45so53033808weo.0 for ; Thu, 19 Mar 2015 03:05:47 -0700 (PDT) X-Received: by 10.180.76.148 with SMTP id k20mr14845261wiw.71.1426759547055; Thu, 19 Mar 2015 03:05:47 -0700 (PDT) Received: from midway01-04-00.lavalab ([81.128.185.50]) by mx.google.com with ESMTPSA id y14sm1257677wjr.39.2015.03.19.03.05.46 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 19 Mar 2015 03:05:46 -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, b.reynal@virtualopensystems.com Cc: christoffer.dall@linaro.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org, pbonzini@redhat.com, kim.phillips@freescale.com, a.rigo@virtualopensystems.com Subject: [PATCH v11 1/9] linux-headers: update VFIO header for VFIO platform/amba drivers Date: Thu, 19 Mar 2015 10:05:30 +0000 Message-Id: <1426759538-18030-2-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1426759538-18030-1-git-send-email-eric.auger@linaro.org> References: <1426759538-18030-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.215.46 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 */