From 3cfda9b88f66774b13063968d60e70aa8257c224 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 14 2018 13:05:42 +0000
Subject: import rdma-core-15-7.el7_5


---

diff --git a/SOURCES/i40iw-autoload-breaks-suspend.patch b/SOURCES/i40iw-autoload-breaks-suspend.patch
new file mode 100644
index 0000000..072fc22
--- /dev/null
+++ b/SOURCES/i40iw-autoload-breaks-suspend.patch
@@ -0,0 +1,17 @@
+Index: rdma-core-15/kernel-boot/rdma-hw-modules.rules
+===================================================================
+--- rdma-core-15.orig/kernel-boot/rdma-hw-modules.rules
++++ rdma-core-15/kernel-boot/rdma-hw-modules.rules
+@@ -11,7 +11,11 @@ ENV{ID_NET_DRIVER}=="bnxt_en", RUN{built
+ ENV{ID_NET_DRIVER}=="cxgb3", RUN{builtin}+="kmod load iw_cxgb3"
+ ENV{ID_NET_DRIVER}=="cxgb4", RUN{builtin}+="kmod load iw_cxgb4"
+ ENV{ID_NET_DRIVER}=="hns", RUN{builtin}+="kmod load hns_roce"
+-ENV{ID_NET_DRIVER}=="i40e", RUN{builtin}+="kmod load i40iw"
++# i40iw is not entirely suspend/resume friendly, and many systems with
++# i40e NICs aren't iwarp-capable, so Red Hat defaults to not auto-loading
++# the i40iw driver here to keep suspend/resume working. The i40iw driver
++# can still be loaded as needed by the rdma systemd service script.
++# ENV{ID_NET_DRIVER}=="i40e", RUN{builtin}+="kmod load i40iw"
+ ENV{ID_NET_DRIVER}=="mlx4_en", RUN{builtin}+="kmod load mlx4_ib"
+ ENV{ID_NET_DRIVER}=="mlx5_core", RUN{builtin}+="kmod load mlx5_ib"
+ ENV{ID_NET_DRIVER}=="qede", RUN{builtin}+="kmod load qedr"
diff --git a/SPECS/rdma-core.spec b/SPECS/rdma-core.spec
index 180e37d..b6ef394 100644
--- a/SPECS/rdma-core.spec
+++ b/SPECS/rdma-core.spec
@@ -1,6 +1,6 @@
 Name: rdma-core
 Version: 15
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: RDMA core userspace libraries and daemons
 
 # Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license
@@ -25,6 +25,7 @@ Patch12: 0003-mlx5-Allow-creation-of-a-Multi-Packet-RQ-using-direc.patch
 Patch13: mlx4-add-a-report-of-rss-cap.patch
 Patch14: 0001-iwpmd-fix-double-mutex-unlock.patch
 Patch15: libbnxt_re_fix_lat_test_failure_in_event_mode.patch
+Patch16: i40iw-autoload-breaks-suspend.patch
 
 BuildRequires: binutils
 BuildRequires: cmake >= 2.8.11
@@ -286,6 +287,7 @@ discover and use SCSI devices via the SCSI RDMA Protocol over InfiniBand.
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %build
 
@@ -533,6 +535,12 @@ rm -rf %{buildroot}/%{_initrddir}/
 %doc %{_docdir}/%{name}-%{version}/ibsrpdm.md
 
 %changelog
+* Tue Feb 27 2018 Jarod Wilson <jarod@redhat.com> 15-7
+- i40iw: revoke systemd udev rules auto-load on i40e hardware, due to
+  causing problems with suspend and resume, and fall back to load via
+  systemd rdma initscript.
+- Resolves: rhbz#1568325
+
 * Mon Feb 19 2018 Jarod Wilson <jarod@redhat.com> 15-6
 - libbnxt_re: fix lat test failure in event mode
 - Resolves: rhbz#1545248