prov/cxi: Remove lingering COMPAT references

Signed-off-by: James Swaro <[email protected]>
jswaro · Mar 20, 2024 · 68de55c · 68de55c
1 parent 90cafcf
commit 68de55c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 16 deletions.
diff --git a/prov/cxi/src/cxip_ep.c b/prov/cxi/src/cxip_ep.c
@@ -1226,9 +1226,6 @@ int cxip_alloc_endpoint(struct cxip_domain *cxip_dom, struct fi_info *hints,
 
 	/* Save EP attributes from hints */
 	ep_obj->protocol = hints->ep_attr->protocol;
-	/* If user is still using CXI_COMPAT point to right protocol */
-	if (ep_obj->protocol == FI_PROTO_OPX)
-		ep_obj->protocol = FI_PROTO_CXI;
 	ep_obj->caps = hints->caps;
 	ep_obj->ep_attr = *hints->ep_attr;
 	ep_obj->txq_size = hints->tx_attr->size;

diff --git a/prov/cxi/src/cxip_info.c b/prov/cxi/src/cxip_info.c
@@ -1699,16 +1699,12 @@ cxip_getinfo(uint32_t version, const char *node, const char *service,
 
 		while (fi_ptr) {
 			/* If hints protocol is not specified, default to use
-			 * protocol FI_PROTO_CXI/FI_PROTO_CXI_COMPAT. This
+			 * protocol FI_PROTO_CXI. This
 			 * requires that FI_PROTO_CXI_RNR be explicitly
 			 * requested if hints are passed to be used.
 			 */
 			if (!hints->ep_attr->protocol) {
-				/* TODO: Only FI_ADDR_CXI will be supported
-				 * upstream.
-				 */
-				proto = fi_ptr->addr_format == FI_ADDR_CXI ?
-						FI_PROTO_CXI : FI_PROTO_OPX;
+				proto = FI_PROTO_CXI;
 			} else {
 				proto = hints->ep_attr->protocol;
 			}

diff --git a/prov/cxi/test/auth_key.c b/prov/cxi/test/auth_key.c
@@ -1297,9 +1297,6 @@ Test(auth_key, max_ep_auth_key_null_hints)
 	int i = 0;
 	size_t expected_ep_auth_key;
 
-	ret = setenv("FI_CXI_COMPAT", "0", 1);
-	cr_assert(ret == 0);
-
 	ret = fi_getinfo(FI_VERSION(FI_MAJOR_VERSION, FI_MINOR_VERSION), "cxi0",
 			 NULL, FI_SOURCE, NULL, &info);
 	cr_assert_eq(ret, FI_SUCCESS, "fi_getinfo failed: %d", ret);
@@ -1337,9 +1334,6 @@ Test(auth_key, zero_max_ep_auth_key_null_hint)
 	int i = 0;
 	size_t expected_ep_auth_key;
 
-	ret = setenv("FI_CXI_COMPAT", "0", 1);
-	cr_assert(ret == 0);
-
 	hints = fi_allocinfo();
 	cr_assert_not_null(hints, "fi_allocinfo failed");
 

diff --git a/prov/cxi/test/fabric.c b/prov/cxi/test/fabric.c
@@ -380,7 +380,6 @@ Test(getinfo, invalid_fi_directed_recv_with_multiple_auth_keys_per_ep)
 TestSuite(getinfo_infos, .timeout = CXIT_DEFAULT_TIMEOUT);
 
 #define MAX_INFOS	24
-#define FI_ADDR_CXI_COMPAT FI_ADDR_OPX
 
 struct info_check {
 	int mr_mode;