From patchwork Tue Mar 28 15:53:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Burakov, Anatoly" X-Patchwork-Id: 22629 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 930B737B1; Tue, 28 Mar 2017 17:53:48 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 383F43277 for ; Tue, 28 Mar 2017 17:53:46 +0200 (CEST) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP; 28 Mar 2017 08:53:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,237,1486454400"; d="scan'208";a="839340610" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by FMSMGA003.fm.intel.com with ESMTP; 28 Mar 2017 08:53:44 -0700 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id v2SFriY5032404; Tue, 28 Mar 2017 16:53:44 +0100 Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id v2SFriiM026258; Tue, 28 Mar 2017 16:53:44 +0100 Received: (from aburakov@localhost) by sivswdev02.ir.intel.com with ? id v2SFrhuD026254; Tue, 28 Mar 2017 16:53:43 +0100 From: Anatoly Burakov To: dev@dpdk.org Cc: gowrishankar.m@linux.vnet.ibm.com, shreyansh.jain@nxp.com, "Burakov, Anatoly" Date: Tue, 28 Mar 2017 16:53:43 +0100 Message-Id: <1490716423-26153-1-git-send-email-anatoly.burakov@intel.com> X-Mailer: git-send-email 1.7.0.7 In-Reply-To: <1490273811-22985-1-git-send-email-anatoly.burakov@intel.com> References: <1490273811-22985-1-git-send-email-anatoly.burakov@intel.com> Subject: [dpdk-dev] [PATCH v3] vfio: fix compile on older kernels X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: "Burakov, Anatoly" Fixing compile failures for kernels without sPAPR IOMMU support. Fixes: 0fe9830b5345 ("eal/ppc: support sPAPR IOMMU for vfio-pci") Signed-off-by: Burakov, Anatoly --- v3: fixed compile on kernels where SPAPR_v2 is not present but SPAPR is v2: fixed newlines lib/librte_eal/linuxapp/eal/eal_vfio.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.h b/lib/librte_eal/linuxapp/eal/eal_vfio.h index ac31a4f..0bf85bb 100644 --- a/lib/librte_eal/linuxapp/eal/eal_vfio.h +++ b/lib/librte_eal/linuxapp/eal/eal_vfio.h @@ -59,22 +59,44 @@ #define VFIO_IOMMU_SPAPR_REGISTER_MEMORY _IO(VFIO_TYPE, VFIO_BASE + 17) #define VFIO_IOMMU_SPAPR_TCE_CREATE _IO(VFIO_TYPE, VFIO_BASE + 19) #define VFIO_IOMMU_SPAPR_TCE_REMOVE _IO(VFIO_TYPE, VFIO_BASE + 20) + +/* SPAPR_v2 is not present, but SPAPR might be */ +#ifndef VFIO_SPAPR_TCE_IOMMU +#define VFIO_IOMMU_SPAPR_TCE_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12) + +struct vfio_iommu_spapr_tce_info { + uint32_t argsz; + uint32_t flags; + uint32_t dma32_window_start; + uint32_t dma32_window_size; + struct vfio_iommu_spapr_tce_ddw_info ddw; +}; +#endif + struct vfio_iommu_spapr_register_memory { uint32_t argsz; uint32_t flags; uint64_t vaddr; uint64_t size; }; + struct vfio_iommu_spapr_tce_create { uint32_t argsz; uint32_t page_shift; uint64_t window_size; uint32_t levels; }; + struct vfio_iommu_spapr_tce_remove { uint32_t argsz; uint64_t start_addr; }; + +struct vfio_iommu_spapr_tce_ddw_info { + uint64_t pgsizes; + uint32_t max_dynamic_windows_supported; + uint32_t levels; +}; #else #define RTE_VFIO_SPAPR VFIO_SPAPR_TCE_v2_IOMMU #endif