From d7d170a90babad4ad53bac16f74ebd02d5c7e3dc Mon Sep 17 00:00:00 2001
From: Thomas Vegas <tvegas@nvidia.com>
Date: Thu, 30 May 2024 12:07:08 +0300
Subject: [PATCH] UCP/WIREUP: Only skip AM lanes for RMA with supported remote
 addresses

---
 src/ucp/wireup/select.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ucp/wireup/select.c b/src/ucp/wireup/select.c
index 1d61a4d4a9b..0a1579f652b 100644
--- a/src/ucp/wireup/select.c
+++ b/src/ucp/wireup/select.c
@@ -1898,7 +1898,8 @@ ucp_wireup_add_rma_bw_lanes(const ucp_wireup_select_params_t *select_params,
      * use of fence operations usually don't request the TAG feature, hence the
      * check.
      */
-    if (context->config.features & (UCP_FEATURE_TAG | UCP_FEATURE_AM)) {
+    if ((select_params->address->dst_version >= 17) &&
+        (context->config.features & (UCP_FEATURE_TAG | UCP_FEATURE_AM))) {
         ucs_carray_for_each(lane_desc, select_ctx->lane_descs,
                             select_ctx->num_lanes) {
             if (!(lane_desc->lane_types & UCS_BIT(UCP_LANE_TYPE_AM))) {