From 1c63f25b55ca4f5317e1c85b548469bbc747e147 Mon Sep 17 00:00:00 2001

From: "Goldman, Adam" <adam.goldman@intel.com>

Date: Tue, 4 Feb 2020 08:55:20 -0500

Subject: [PATCH] kernel-boot: Do not perform device rename on OPA devices

PSM2 will not run with recent rdma-core releases. Several tools and

libraries like PSM2, require the hfi1 name to be present.

Recent rdma-core releases added a new feature to rename kernel devices,

but the default configuration will not work with hfi1 fabrics.

Related opa-psm2 github issue:

  https://github.com/intel/opa-psm2/issues/43

Fixes: 5b4099d47be3 ("kernel-boot: Perform device rename to make stable names")

Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>

Signed-off-by: Goldman, Adam <adam.goldman@intel.com>

---

 kernel-boot/rdma-persistent-naming.rules | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel-boot/rdma-persistent-naming.rules b/kernel-boot/rdma-persistent-naming.rules

index 6f9c53a5..3ce34ea9 100644

--- a/kernel-boot/rdma-persistent-naming.rules

+++ b/kernel-boot/rdma-persistent-naming.rules

@@ -26,10 +26,10 @@

 #   Device type = RoCE

 #   mlx5_0 -> rocex525400c0fe123455

 #

-ACTION=="add", SUBSYSTEM=="infiniband", PROGRAM="rdma_rename %k NAME_FALLBACK"

+ACTION=="add", SUBSYSTEM=="infiniband", KERNEL!="hfi1*", PROGRAM="rdma_rename %k NAME_FALLBACK"

 # Example:

 # * NAME_FIXED 

 #   fixed name for specific board_id

 #

-#ACTION=="add", ATTR{board_id}=="MSF0010110035", SUBSYSTEM=="infiniband", PROGRAM="rdma_rename %k NAME_FIXED myib"

\ No newline at end of file

+#ACTION=="add", ATTR{board_id}=="MSF0010110035", SUBSYSTEM=="infiniband", PROGRAM="rdma_rename %k NAME_FIXED myib"

-- 

2.30.1