diff mbox

[dpdk-dev,v2] vfio: fix compile on older kernels

Message ID 1490273811-22985-1-git-send-email-anatoly.burakov@intel.com (mailing list archive)
State Superseded, archived
Headers

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Anatoly Burakov March 23, 2017, 12:56 p.m. UTC 
  From: "Burakov, Anatoly" <anatoly.burakov@intel.com>

Fixing compile failures for kernels without sPAPR IOMMU support.

Fixes: 0fe9830b5345 ("eal/ppc: support sPAPR IOMMU for vfio-pci")
Signed-off-by: Burakov, Anatoly <anatoly.burakov@intel.com>
---
v2: Fixed whitespace and newlines

 lib/librte_eal/linuxapp/eal/eal_vfio.h | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

Comments

Thomas Monjalon March 27, 2017, 1:17 p.m. UTC | #1 
2017-03-23 12:56, Anatoly Burakov:
> From: "Burakov, Anatoly" <anatoly.burakov@intel.com>
> 
> Fixing compile failures for kernels without sPAPR IOMMU support.
> 
> Fixes: 0fe9830b5345 ("eal/ppc: support sPAPR IOMMU for vfio-pci")

A blank line is missing also here ;)

> Signed-off-by: Burakov, Anatoly <anatoly.burakov@intel.com>
> ---
> v2: Fixed whitespace and newlines
> 
>  lib/librte_eal/linuxapp/eal/eal_vfio.h | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)

When building for ARM, I see this error:
error: redefinition of 'struct vfio_iommu_spapr_tce_info'
diff mbox

Patch

diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.h b/lib/librte_eal/linuxapp/eal/eal_vfio.h
index ac31a4f..23d2649 100644
--- a/lib/librte_eal/linuxapp/eal/eal_vfio.h
+++ b/lib/librte_eal/linuxapp/eal/eal_vfio.h
@@ -59,22 +59,40 @@ 
 #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)
+#define VFIO_IOMMU_SPAPR_TCE_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)
+
 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;
+};
+
+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;
+};
 #else
 #define RTE_VFIO_SPAPR VFIO_SPAPR_TCE_v2_IOMMU
 #endif