From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id A06576833 for ; Wed, 21 Nov 2018 17:48:07 +0100 (CET) Received: by mail-wm1-f65.google.com with SMTP id 125so6248007wmh.0 for ; Wed, 21 Nov 2018 08:48:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=b8/hH6CGO/H685BDkmwwNqgcq+zBO6jARNABLxL4xpo=; b=EGcwl6E6VpQCJMFmR2V4mj9IRdOqBntkhj/QDEOumJmSPmKRFb9TGqPgHhHe6GNJES Sj3ZRFvXZ0tJA9Tjoi4j7F9YOWC2DS5Z5uXNZYFhkatguffgKS80uDjO1ijdU6IN07q0 +ZlHDE97koNFBbNwQZJTY7pZFs7CZuWmXbpd1w1nhId6EZJp2ltsk6hf12uURWBiDIhg 7JPAMep+Fjje47hRejPx3pE3hUXS6NKpFBAuDag9c+3xbKZL7LKxO88jIYXQRVmQxFHc CZY00V1QfAMoPP/XLNpQ/f6ptqRGxfUQySxUG7ejvFcm/TJrndVmDDTLt5KPVuMBWt2f En9g== X-Gm-Message-State: AA+aEWblLsPyNX3+1Uu1+h9fLGyeMrcoh0lLeTUCi2rw5P+5rByKBan7 cuDXEAyuCQnsBhh1aWSnb/yaNDJ1 X-Google-Smtp-Source: AJdET5cnA5ZqQ24EytD11phWgE/4RT1p41Qbgtr1AkPd0nW2fJfXIyjsv+xEc9GQJvybDZvrYivcew== X-Received: by 2002:a1c:a906:: with SMTP id s6mr7107210wme.44.1542818886938; Wed, 21 Nov 2018 08:48:06 -0800 (PST) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id j125-v6sm1889561wmb.12.2018.11.21.08.48.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Nov 2018 08:48:06 -0800 (PST) From: Luca Boccassi To: stable@dpdk.org Cc: anatoly.burakov@intel.com Date: Wed, 21 Nov 2018 16:48:01 +0000 Message-Id: <20181121164802.8186-1-bluca@debian.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH 16.11 1/2] vfio: fix build on old kernel X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Nov 2018 16:48:07 -0000 From: Anatoly Burakov [ backported from upstream commit 468f42cc264580c078b892fe6886810fe996a75f ] Fixing compile failures for kernels without sPAPR IOMMU support. Fixes: 0fe9830b5345 ("eal/ppc: support sPAPR IOMMU for vfio-pci") Signed-off-by: Anatoly Burakov --- 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 ac31a4fc1..0bf85bb59 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 -- 2.19.1