From ca964f0add31d50618fe12aa92b825f841532446 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Mon, 20 Apr 2020 11:14:47 +0100
Subject: [PATCH] [cloud] Enable INFINIBAND configs for HyperV/Azure

Closes: #958300

Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
(cherry picked from commit 1315e2b78a0b65711a0346cafb02d5eef7e962e1)
---
 debian/changelog                       |  3 +
 debian/config/amd64/config.cloud-amd64 | 96 +++++++++++++++++++++++++-
 2 files changed, 98 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c14feb2c7..887d0c4e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1022,6 +1022,9 @@ linux (4.19.131-1) UNRELEASED; urgency=medium
     migrated to FPXX yet and this breaks the golang packages on Octeon
     hardware. In turns this disables MSA on 32-bit kernels.
 
+  [ Luca Boccassi ]
+  * [cloud] Enable INFINIBAND configs for HyperV/Azure (Closes: #958300)
+
  -- Salvatore Bonaccorso <carnil@debian.org>  Wed, 13 May 2020 17:44:43 +0200
 
 linux (4.19.118-2+deb10u1) buster-security; urgency=high
diff --git a/debian/config/amd64/config.cloud-amd64 b/debian/config/amd64/config.cloud-amd64
index 6095b8a7c..4d27bd1db 100644
--- a/debian/config/amd64/config.cloud-amd64
+++ b/debian/config/amd64/config.cloud-amd64
@@ -334,7 +334,96 @@ CONFIG_HYPERV=m
 ##
 ## file: drivers/infiniband/Kconfig
 ##
-# CONFIG_INFINIBAND is not set
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+
+##
+## file: drivers/infiniband/hw/cxgb4/Kconfig
+##
+# CONFIG_INFINIBAND_CXGB4 is not set
+
+##
+## file: drivers/infiniband/hw/hfi1/Kconfig
+##
+# CONFIG_INFINIBAND_HFI1 is not set
+
+##
+## file: drivers/infiniband/hw/i40iw/Kconfig
+##
+# CONFIG_INFINIBAND_I40IW is not set
+
+##
+## file: drivers/infiniband/hw/mlx4/Kconfig
+##
+CONFIG_MLX4_INFINIBAND=m
+
+##
+## file: drivers/infiniband/hw/mlx5/Kconfig
+##
+CONFIG_MLX5_INFINIBAND=m
+
+##
+## file: drivers/infiniband/hw/mthca/Kconfig
+##
+# CONFIG_INFINIBAND_MTHCA is not set
+# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
+
+##
+## file: drivers/infiniband/hw/ocrdma/Kconfig
+##
+# CONFIG_INFINIBAND_OCRDMA is not set
+
+##
+## file: drivers/infiniband/hw/qedr/Kconfig
+##
+# CONFIG_INFINIBAND_QEDR is not set
+
+##
+## file: drivers/infiniband/hw/qib/Kconfig
+##
+# CONFIG_INFINIBAND_QIB is not set
+# CONFIG_INFINIBAND_QIB_DCA is not set
+
+##
+## file: drivers/infiniband/sw/rdmavt/Kconfig
+##
+# CONFIG_INFINIBAND_RDMAVT is not set
+
+##
+## file: drivers/infiniband/sw/rxe/Kconfig
+##
+# CONFIG_RDMA_RXE is not set
+
+##
+## file: drivers/infiniband/ulp/ipoib/Kconfig
+##
+# CONFIG_INFINIBAND_IPOIB is not set
+# CONFIG_INFINIBAND_IPOIB_CM is not set
+# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+
+##
+## file: drivers/infiniband/ulp/iser/Kconfig
+##
+# CONFIG_INFINIBAND_ISER is not set
+
+##
+## file: drivers/infiniband/ulp/isert/Kconfig
+##
+# CONFIG_INFINIBAND_ISERT is not set
+
+##
+## file: drivers/infiniband/ulp/srp/Kconfig
+##
+# CONFIG_INFINIBAND_SRP is not set
+
+##
+## file: drivers/infiniband/ulp/srpt/Kconfig
+##
+# CONFIG_INFINIBAND_SRPT is not set
 
 ##
 ## file: drivers/input/Kconfig
@@ -1524,6 +1613,11 @@ CONFIG_HYPERV_STORAGE=m
 ##
 # CONFIG_X25 is not set
 
+##
+## file: security/Kconfig
+##
+CONFIG_SECURITY_INFINIBAND=y
+
 ##
 ## file: security/integrity/Kconfig
 ##