From 9abf7e8f0072cff569d83f6ef5ce713f5b54e965 Mon Sep 17 00:00:00 2001
From: Seth Howell <seth.howell@intel.com>
Date: Wed, 10 Oct 2018 10:09:07 -0700
Subject: [PATCH] make: build the igb_uio kernel module with crypto

Also, update the qat_setup script to point to this module.

Dependent upon:https://review.gerrithub.io/c/spdk/dpdk/+/428718

Change-Id: Ie8694a1996621165f52a513d9b19c7232aaed9ce
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/428719
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
---
 CONFIG             | 3 +++
 configure          | 8 ++++++++
 dpdkbuild/Makefile | 6 ++++++
 3 files changed, 17 insertions(+)

diff --git a/CONFIG b/CONFIG
index 113e93bc2..78d918a9b 100644
--- a/CONFIG
+++ b/CONFIG
@@ -112,3 +112,6 @@ CONFIG_SHARED=n
 # Build with VTune suport.
 CONFIG_VTUNE=n
 CONFIG_VTUNE_DIR=
+
+# Build the dpdk igb_uio driver
+CONFIG_IGB_UIO_DRIVER=n
diff --git a/configure b/configure
index 0f0e4d2bc..8d8c1f228 100755
--- a/configure
+++ b/configure
@@ -40,6 +40,8 @@ function usage()
 	echo "                           example: /usr/share/dpdk/x86_64-default-linuxapp-gcc"
 	echo " fio                       Required to build fio_plugin."
 	echo "                           example: /usr/src/fio"
+	echo " igb-uio-driver            Required on some systems to use qat devices"
+	echo "                           No path required"
 	echo " vhost                     Required to build vhost target."
 	echo "                           No path required."
 	echo " virtio                    Required to build vhost initiator (Virtio) bdev module."
@@ -247,6 +249,12 @@ for i in "$@"; do
 			CONFIG[VTUNE_DIR]=
 			CONFIG[VTUNE]=n
 			;;
+		--with-igb-uio-driver)
+			CONFIG[IGB_UIO_DRIVER]=y
+			;;
+		--without-igb-uio-driver)
+			CONFIG[IGB_UIO_DRIVER]=n
+			;;
 		--)
 			break
 			;;
diff --git a/dpdkbuild/Makefile b/dpdkbuild/Makefile
index ed3d8b3e7..821f88f99 100644
--- a/dpdkbuild/Makefile
+++ b/dpdkbuild/Makefile
@@ -50,11 +50,17 @@ DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y
 DPDK_OPTS += CONFIG_RTE_LIBRTE_CRYPTODEV=y
 DPDK_OPTS += CONFIG_RTE_LIBRTE_REORDER=y
 DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT=y
+ifeq ($(CONFIG_IGB_UIO_DRIVER),y)
+DPDK_OPTS += CONFIG_RTE_EAL_IGB_UIO=y
+else
+DPDK_OPTS += CONFIG_RTE_EAL_IGB_UIO=n
+endif
 endif
 endif
 endif
 
 ifeq ($(CRYPTO_ENABLED),n)
+DPDK_OPTS += CONFIG_RTE_EAL_IGB_UIO=n
 DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n
 DPDK_OPTS += CONFIG_RTE_LIBRTE_CRYPTODEV=n
 DPDK_OPTS += CONFIG_RTE_LIBRTE_REORDER=n