[c/azure][PATCH 2/2] UBUNTU: [Config] linux-azure: CONFIG_MLX{4, 5}_INFINIBAND=m

[Marcelo Henrique Cerri]

BugLink: https://bugs.launchpad.net/bugs/1837397

Make all the necessary mlx* and ib* modules loadable to allow Mellanox
OFED drivers to be built and loaded by users.

Ensure that all the new .ko files are include into the regular
linux-modules package and not into the linux-modules-extra package.

Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri at canonical.com>
---
 debian.azure/config/annotations             | 26 +++++++++++++--------
 debian.azure/config/config.common.ubuntu    | 17 +++++++-------
 debian.azure/control.d/azure.inclusion-list |  4 ++++
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
index ca3d81e5a17d..cb1270559268 100644
--- a/debian.azure/config/annotations
+++ b/debian.azure/config/annotations
@@ -4,11 +4,23 @@
 
 include "../../debian.master/config/annotations"
 
-CONFIG_MLX4_INFINIBAND                             policy<{'amd64': 'y'}>
-CONFIG_MLX4_INFINIBAND                             mark<ENFORCED> note<LP:#1759656>
+CONFIG_MLX5_CORE                                   policy<{'amd64': 'm'}>
+CONFIG_MLX5_CORE                                   mark<ENFORCED> note<LP:#1827916>
 
-CONFIG_MLX5_INFINIBAND                             policy<{'amd64': 'y'}>
-CONFIG_MLX5_INFINIBAND                             mark<ENFORCED> note<LP:#1759656>
+CONFIG_MLX4_CORE                                   policy<{'amd64': 'm'}>
+CONFIG_MLX4_CORE                                   mark<ENFORCED> note<LP:#1827916>
+
+CONFIG_MLX4_INFINIBAND                             policy<{'amd64': 'm'}>
+CONFIG_MLX4_INFINIBAND                             mark<ENFORCED> note<LP:#1827916>
+
+CONFIG_MLX5_INFINIBAND                             policy<{'amd64': 'm'}>
+CONFIG_MLX5_INFINIBAND                             mark<ENFORCED> note<LP:#1827916>
+
+CONFIG_INFINIBAND_USER_MAD                         policy<{'amd64': 'm'}>
+CONFIG_INFINIBAND_USER_MAD                         mark<ENFORCED> note<LP:#1827916>
+
+CONFIG_INFINIBAND_IPOIB                            policy<{'amd64': 'm'}>
+CONFIG_INFINIBAND_IPOIB                            mark<ENFORCED> note<LP:#1827916>
 
 CONFIG_BLK_DEV_NVME                                policy<{'amd64': 'y'}>
 CONFIG_BLK_DEV_NVME                                mark<ENFORCED> note<LP:#1793386>
@@ -43,12 +55,6 @@ CONFIG_IOSCHED_BFQ                                 policy<{'amd64': 'm'}>
 CONFIG_BFQ_GROUP_IOSCHED                           policy<{'amd64': 'y'}>
 CONFIG_BFQ_GROUP_IOSCHED                           mark<ENFORCED> note<LP:#1813211>
 
-CONFIG_INFINIBAND_USER_MAD                         policy<{'amd64': 'y'}>
-CONFIG_INFINIBAND_USER_MAD                         note<LP:#1818141> note<LP:#1798185> mark<ENFORCED>
-
-CONFIG_INFINIBAND_IPOIB                            policy<{'amd64': 'y'}>
-CONFIG_INFINIBAND_IPOIB                            note<LP:#1818141> note<LP:#1798185> mark<ENFORCED>
-
 CONFIG_INFINIBAND_IPOIB_DEBUG                      policy<{'amd64': 'y'}>
 CONFIG_INFINIBAND_IPOIB_DEBUG                      note<LP:#1818141> note<LP:#1798185> mark<ENFORCED>
 
diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
index 014e52409c29..8bd78ceb2e75 100644
--- a/debian.azure/config/config.common.ubuntu
+++ b/debian.azure/config/config.common.ubuntu
@@ -1983,7 +1983,7 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INFINIBAND=y
+CONFIG_INFINIBAND=m
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
 # CONFIG_INFINIBAND_BNXT_RE is not set
@@ -1991,7 +1991,7 @@ CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
 # CONFIG_INFINIBAND_CXGB4 is not set
 # CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set
 # CONFIG_INFINIBAND_I40IW is not set
-CONFIG_INFINIBAND_IPOIB=y
+CONFIG_INFINIBAND_IPOIB=m
 # CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
@@ -2007,8 +2007,8 @@ CONFIG_INFINIBAND_OPA_VNIC=m
 # CONFIG_INFINIBAND_RDMAVT is not set
 CONFIG_INFINIBAND_SRP=m
 # CONFIG_INFINIBAND_SRPT is not set
-CONFIG_INFINIBAND_USER_ACCESS=y
-CONFIG_INFINIBAND_USER_MAD=y
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_MEM=y
 CONFIG_INFINIBAND_USNIC=m
 CONFIG_INITRAMFS_SOURCE=""
@@ -2686,21 +2686,22 @@ CONFIG_MISC_RTSX=m
 CONFIG_MISC_RTSX_PCI=m
 # CONFIG_MK8 is not set
 # CONFIG_MKISS is not set
-CONFIG_MLX4_CORE=y
+CONFIG_MLX4_CORE=m
 CONFIG_MLX4_CORE_GEN2=y
 CONFIG_MLX4_DEBUG=y
 CONFIG_MLX4_EN=m
 CONFIG_MLX4_EN_DCB=y
-CONFIG_MLX4_INFINIBAND=y
+CONFIG_MLX4_INFINIBAND=m
 CONFIG_MLX5_ACCEL=y
-CONFIG_MLX5_CORE=y
+CONFIG_MLX5_CORE=m
 CONFIG_MLX5_CORE_EN=y
 CONFIG_MLX5_CORE_EN_DCB=y
 CONFIG_MLX5_CORE_IPOIB=y
 CONFIG_MLX5_EN_IPSEC=y
+CONFIG_MLX5_EN_TLS=y
 CONFIG_MLX5_ESWITCH=y
 CONFIG_MLX5_FPGA=y
-CONFIG_MLX5_INFINIBAND=y
+CONFIG_MLX5_INFINIBAND=m
 CONFIG_MLX5_MPFS=y
 CONFIG_MLXFW=m
 CONFIG_MLXREG_HOTPLUG=m
diff --git a/debian.azure/control.d/azure.inclusion-list b/debian.azure/control.d/azure.inclusion-list
index cb0569fccd6c..693e58e66f8e 100644
--- a/debian.azure/control.d/azure.inclusion-list
+++ b/debian.azure/control.d/azure.inclusion-list
@@ -61,10 +61,14 @@ drivers/infiniband/core/ib_cm.ko
 drivers/infiniband/core/ib_core.ko
 drivers/infiniband/core/ib_mad.ko
 drivers/infiniband/core/ib_sa.ko
+drivers/infiniband/core/ib_umad.ko
 drivers/infiniband/core/iw_cm.ko
 drivers/infiniband/core/rdma_cm.ko
 drivers/infiniband/core/rdma_ucm.ko
+drivers/infiniband/hw/mlx4/*
+drivers/infiniband/hw/mlx5/*
 drivers/infiniband/hw/vmbus-rdma/*
+drivers/infiniband/ulp/ipoib/ib_ipoib.ko
 drivers/infiniband/ulp/iser/ib_iser.ko
 drivers/infiniband/ulp/isert/ib_isert.ko
 drivers/input/evbug.ko
-- 
2.20.1