From d466c851e430726974c683de0ed541826365cde51a2ff251e8e1028dc263ef11 Mon Sep 17 00:00:00 2001
From: Nicolas Morey <nicolas.morey@suse.com>
Date: Wed, 14 Feb 2024 13:32:23 +0000
Subject: [PATCH] Accepting request 1146576 from
 home:NMorey:branches:science:HPC

- Add kernel-boot-do-not-load-module-unsupported-on-s390.patch
  to prevent autoload of module not supported on s390. (bsc#1219805)

OBS-URL: https://build.opensuse.org/request/show/1146576
OBS-URL: https://build.opensuse.org/package/show/science:HPC/rdma-core?expand=0&rev=182
---
 ...-not-load-module-unsupported-on-s390.patch | 53 +++++++++++++++++++
 rdma-core.changes                             |  6 +++
 rdma-core.spec                                |  5 ++
 3 files changed, 64 insertions(+)
 create mode 100644 kernel-boot-do-not-load-module-unsupported-on-s390.patch

diff --git a/kernel-boot-do-not-load-module-unsupported-on-s390.patch b/kernel-boot-do-not-load-module-unsupported-on-s390.patch
new file mode 100644
index 0000000..fdc90a0
--- /dev/null
+++ b/kernel-boot-do-not-load-module-unsupported-on-s390.patch
@@ -0,0 +1,53 @@
+commit c5ab85be2f7e5ec20e1d135d23847c07ee45e23c
+Author: Nicolas Morey <nmorey@suse.com>
+Date:   Wed Feb 14 14:11:53 2024 +0100
+
+    kernel-boot: do not load module unsupported on s390
+    
+    Signed-off-by: Nicolas Morey <nmorey@suse.com>
+
+diff --git kernel-boot/modules/infiniband.conf kernel-boot/modules/infiniband.conf
+index 99526e156fff..7f75b85c9ceb 100644
+--- kernel-boot/modules/infiniband.conf
++++ kernel-boot/modules/infiniband.conf
+@@ -1,9 +1,9 @@
+ # These modules are loaded by the system if any InfiniBand device is installed
+ # InfiniBand over IP netdevice
+-ib_ipoib
++#ib_ipoib
+ 
+ # Access to fabric management SMPs and GMPs from userspace.
+-ib_umad
++#ib_umad
+ 
+ # SCSI Remote Protocol target support
+ # ib_srpt
+diff --git kernel-boot/modules/opa.conf kernel-boot/modules/opa.conf
+index b9bc9f1f0146..3f9e6658b1ef 100644
+--- kernel-boot/modules/opa.conf
++++ kernel-boot/modules/opa.conf
+@@ -1,10 +1,10 @@
+ # These modules are loaded by the system if any OmniPath Architecture device
+ # is installed
+ # Infiniband over IP netdevice
+-ib_ipoib
++#ib_ipoib
+ 
+ # Access to fabric management SMPs and GMPs from userspace.
+-ib_umad
++#ib_umad
+ 
+ # Omnipath Ethernet Virtual NIC netdevice
+ opa_vnic
+diff --git kernel-boot/modules/rdma.conf kernel-boot/modules/rdma.conf
+index 2d342dd82f7d..0ebe3b786b28 100644
+--- kernel-boot/modules/rdma.conf
++++ kernel-boot/modules/rdma.conf
+@@ -1,6 +1,6 @@
+ # These modules are loaded by the system if any RDMA devices is installed
+ # iSCSI over RDMA client support
+-ib_iser
++#ib_iser
+ 
+ # iSCSI over RDMA target support
+ # ib_isert
diff --git a/rdma-core.changes b/rdma-core.changes
index 081ce22..505744e 100644
--- a/rdma-core.changes
+++ b/rdma-core.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 14 13:13:23 UTC 2024 - Nicolas Morey <nicolas.morey@suse.com>
+
+- Add kernel-boot-do-not-load-module-unsupported-on-s390.patch
+  to prevent autoload of module not supported on s390. (bsc#1219805)
+
 -------------------------------------------------------------------
 Mon Jan 22 18:41:25 UTC 2024 - Nicolas Morey <nicolas.morey@suse.com>
 
diff --git a/rdma-core.spec b/rdma-core.spec
index 5a45f46..d406554 100644
--- a/rdma-core.spec
+++ b/rdma-core.spec
@@ -75,6 +75,7 @@ Source4:        rdma-core-rpmlintrc
 Source5:        gen-pandoc.sh
 Source6:        get_build.py
 Patch0:         disable-rdma-interface-renaming.patch
+Patch1:         kernel-boot-do-not-load-module-unsupported-on-s390.patch
 BuildRequires:  binutils
 BuildRequires:  cmake >= 2.8.11
 BuildRequires:  gcc
@@ -425,6 +426,10 @@ easy, object-oriented access to IB verbs.
 #Extract prebuilt pandoc file in the buildlib directory
 (cd buildlib && tar -xf %{S:3})
 %patch0
+# On s390, disable autoload of unsupported modules
+%ifarch s390 s390x
+%patch1
+%endif
 
 %build