UBUNTU: [Config] add CONFIG_INFINIBAND_VIRT_DMA

Add CONFIG_INFINIBAND_VIRT_DMA, introduced after rebasing to 5.10-rc5.

NOTE: this config option can only be enabled if CONFIG_HIGHMEM is not
set and that is false in armhf, so it needs to be disabled in this
specific architecture.

As a consequence the following dependent config options are also
disabled (on armhf only):

 - CONFIG_RDMA_RXE
 - CONFIG_RDMA_SIW

This shouldn't be a problem, since these options are used by infiniband,
that is unlikely to be used with armhf.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>

diff --git a/debian.master/abi/5.10.0-4.5/armhf/generic-lpae.modules b/debian.master/abi/5.10.0-4.5/armhf/generic-lpae.modules
index 919c79bcaebf97f8b2dfaceb79107e8e4d7f213d..82a45c42428783bc7465d3da9d237f2824a693ac 100644 (file)
--- a/debian.master/abi/5.10.0-4.5/armhf/generic-lpae.modules
+++ b/debian.master/abi/5.10.0-4.5/armhf/generic-lpae.modules
@@ -4212,7 +4212,6 @@ rcuscale
 rdacm20-camera_module
 rdc321x-southbridge
 rdma_cm
-rdma_rxe
 rdma_ucm
 rds
 rds_rdma
@@ -4708,7 +4707,6 @@ sis_i2c
 sisfb
 sisusbvga
 sit
-siw
 sja1000
 sja1000_isa
 sja1000_platform

diff --git a/debian.master/abi/5.10.0-4.5/armhf/generic.modules b/debian.master/abi/5.10.0-4.5/armhf/generic.modules
index 9618aee0e648799d6fc34d7836ad86c207db715a..aed09be2eb082f90755c44adee34ad8c8bd3a1ea 100644 (file)
--- a/debian.master/abi/5.10.0-4.5/armhf/generic.modules
+++ b/debian.master/abi/5.10.0-4.5/armhf/generic.modules
@@ -4293,7 +4293,6 @@ rcuscale
 rdacm20-camera_module
 rdc321x-southbridge
 rdma_cm
-rdma_rxe
 rdma_ucm
 rds
 rds_rdma
@@ -4799,7 +4798,6 @@ sis_i2c
 sisfb
 sisusbvga
 sit
-siw
 sja1000
 sja1000_isa
 sja1000_platform

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index d0c7f4d4d0267b1e2464a5344b50b8f9d91ddbde..f7f4da8cda89aed1f6297f2db3a41f0eedd1ff17 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -3444,8 +3444,9 @@ CONFIG_HFI1_DEBUG_SDMA_ORDER                    policy<{'amd64': 'n'}>
 CONFIG_SDMA_VERBOSITY                           policy<{'amd64': 'n'}>
 CONFIG_INFINIBAND_QEDR                          policy<{'amd64': 'm', 'arm64': 'm', 'ppc64el': 'm'}>
 CONFIG_INFINIBAND_RDMAVT                        policy<{'amd64': 'm'}>
-CONFIG_RDMA_RXE                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
-CONFIG_RDMA_SIW                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_INFINIBAND_VIRT_DMA                      policy<{'amd64': 'y', 'arm64': 'y', 'armhf': '-', 'ppc64el': 'y', 's390x': 'y'}>
+CONFIG_RDMA_RXE                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': '-', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_RDMA_SIW                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': '-', 'ppc64el': 'm', 's390x': 'm'}>
 
 # Menu: Device Drivers >> InfiniBand support >> RDMA/CM
 CONFIG_INFINIBAND_ADDR_TRANS                    policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 27cace9ee68c022a20dac099bcdbf2b97880a25d..91314462f5a18fe74a0158d27b45f657854927bc 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4643,6 +4643,7 @@ CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_MEM=y
 CONFIG_INFINIBAND_USNIC=m
+CONFIG_INFINIBAND_VIRT_DMA=y
 CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 CONFIG_INFTL=m
 CONFIG_INITRAMFS_SOURCE=""