From 3c5cff613bce7ef167536f9aaa0e2c49f90dbfde Mon Sep 17 00:00:00 2001
From: Krzysztof Karas <krzysztof.karas@intel.com>
Date: Wed, 18 Aug 2021 09:59:44 +0200
Subject: [PATCH] dpdk: update DPDK to 21.08 version

Update submodule DPDK to version 21.08 and modify
CHANGELOG.

Added bus auxiliary dependencies to dpdkbuild/Makefile
and lib/env_dpdk/env.mk. This dependency was introduced
in DPDK 21.08.

Change-Id: I72d9fde456583dc129f4c7fced4f10875bbc38e2
Signed-off-by: Krzysztof Karas <krzysztof.karas@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9211
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
---
 CHANGELOG.md        | 4 ++++
 dpdk                | 2 +-
 dpdkbuild/Makefile  | 2 +-
 lib/env_dpdk/env.mk | 4 ++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e9aa9fd6..ab7a206d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,10 @@ have been added. These functions accept `spdk_nvme_ns_cmd_ext_io_opts` structure
 options, e.g. DMA memory domain which describes data that may belong to another memory domain and
 can't be accessed directly.
 
+### dpdk
+
+Updated DPDK submodule to DPDK 21.08.
+
 ## v21.07:
 
 ### accel_fw
diff --git a/dpdk b/dpdk
index bad3c0e51..19608c918 160000
--- a/dpdk
+++ b/dpdk
@@ -1 +1 @@
-Subproject commit bad3c0e51d7a34e3188d75d94f15a36c8f5e8301
+Subproject commit 19608c918c91a519c33edaabb3c7d31fdde30b46
diff --git a/dpdkbuild/Makefile b/dpdkbuild/Makefile
index 5c6b4facf..d51b1a6e5 100644
--- a/dpdkbuild/Makefile
+++ b/dpdkbuild/Makefile
@@ -68,7 +68,7 @@ endif
 ifeq ($(CONFIG_REDUCE),y)
 DPDK_DRIVERS += compress compress/isal
 ifeq ($(CONFIG_REDUCE_MLX5),y)
-DPDK_DRIVERS += common/mlx5 compress/mlx5
+DPDK_DRIVERS += common/mlx5 compress/mlx5 bus/auxiliary
 endif
 DPDK_CFLAGS += -I$(ISAL_DIR)
 DPDK_LDFLAGS += -L$(ISAL_DIR)/.libs -lisal
diff --git a/lib/env_dpdk/env.mk b/lib/env_dpdk/env.mk
index 3ff5a7db6..cc7db8aab 100644
--- a/lib/env_dpdk/env.mk
+++ b/lib/env_dpdk/env.mk
@@ -96,6 +96,10 @@ DPDK_LIB_LIST += rte_pmd_isal
 endif
 ifeq ($(CONFIG_REDUCE_MLX5),y)
 DPDK_LIB_LIST += rte_common_mlx5 rte_compress_mlx5
+# Introduced in DPDK 21.08
+ifneq (, $(wildcard $(DPDK_LIB_DIR)/librte_bus_auxiliary.*))
+DPDK_LIB_LIST += rte_bus_auxiliary
+endif
 endif
 endif