From patchwork Fri Sep 18 06:30:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavin Shan X-Patchwork-Id: 519139 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D810D140271 for ; Fri, 18 Sep 2015 16:32:04 +1000 (AEST) Received: from localhost ([::1]:35620 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZcpDG-0003N3-Es for incoming@patchwork.ozlabs.org; Fri, 18 Sep 2015 02:32:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53836) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZcpCd-0002FX-LH for qemu-devel@nongnu.org; Fri, 18 Sep 2015 02:31:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZcpCa-0001ly-Fc for qemu-devel@nongnu.org; Fri, 18 Sep 2015 02:31:23 -0400 Received: from e23smtp06.au.ibm.com ([202.81.31.148]:38900) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZcpCZ-0001hZ-SY for qemu-devel@nongnu.org; Fri, 18 Sep 2015 02:31:20 -0400 Received: from /spool/local by e23smtp06.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 18 Sep 2015 16:31:16 +1000 Received: from d23dlp01.au.ibm.com (202.81.31.203) by e23smtp06.au.ibm.com (202.81.31.212) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 18 Sep 2015 16:31:15 +1000 X-Helo: d23dlp01.au.ibm.com X-MailFrom: gwshan@linux.vnet.ibm.com X-RcptTo: qemu-ppc@nongnu.org Received: from d23relay10.au.ibm.com (d23relay10.au.ibm.com [9.190.26.77]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id B1E242CE8055; Fri, 18 Sep 2015 16:31:14 +1000 (EST) Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay10.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t8I6V6Mi39452720; Fri, 18 Sep 2015 16:31:14 +1000 Received: from d23av02.au.ibm.com (localhost [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t8I6UfZZ013323; Fri, 18 Sep 2015 16:30:41 +1000 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.192.253.14]) by d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t8I6Uf1s012541; Fri, 18 Sep 2015 16:30:41 +1000 Received: from bran.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) by ozlabs.au.ibm.com (Postfix) with ESMTP id 8105DA03BC; Fri, 18 Sep 2015 16:30:17 +1000 (AEST) Received: from gwshan (shangw.ozlabs.ibm.com [10.61.2.199]) by bran.ozlabs.ibm.com (Postfix) with ESMTP id 781ABE451B; Fri, 18 Sep 2015 16:30:17 +1000 (AEST) Received: by gwshan (Postfix, from userid 1000) id 5392B941D64; Fri, 18 Sep 2015 16:30:17 +1000 (AEST) From: Gavin Shan To: qemu-devel@nongnu.org Date: Fri, 18 Sep 2015 16:30:13 +1000 Message-Id: <1442557816-23067-2-git-send-email-gwshan@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1442557816-23067-1-git-send-email-gwshan@linux.vnet.ibm.com> References: <1442557816-23067-1-git-send-email-gwshan@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15091806-0021-0000-0000-000001E50E8D X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 202.81.31.148 Cc: alex.williamson@redhat.com, qemu-ppc@nongnu.org, Gavin Shan , david@gibson.dropbear.id.au Subject: [Qemu-devel] [PATCH RFC 1/4] linux-headers: Sync vfio.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This synchronizes the Linux header vfio.h because of the changes introduced by below Linux commits: 900facd ("drivers/vfio: Support IOMMU group for EEH operations") 108f78d ("drivers/vfio: Support EEH API revision") Signed-off-by: Gavin Shan --- linux-headers/linux/vfio.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/linux-headers/linux/vfio.h b/linux-headers/linux/vfio.h index aa276bc..0cf1c57 100644 --- a/linux-headers/linux/vfio.h +++ b/linux-headers/linux/vfio.h @@ -495,6 +495,10 @@ struct vfio_iommu_spapr_tce_info { * - configure PE; * - inject EEH error. */ +#define VFIO_EEH_DISABLED 0 +#define VFIO_EEH_ENABLED_V1 1 +#define VFIO_EEH_ENABLED_V2 2 + struct vfio_eeh_pe_err { __u32 type; __u32 func; @@ -505,7 +509,9 @@ struct vfio_eeh_pe_err { struct vfio_eeh_pe_op { __u32 argsz; __u32 flags; +#define VFIO_EEH_ENABLED_MASK 0xFF __u32 op; + __u32 groupid; union { struct vfio_eeh_pe_err err; };