diff mbox series

[ndctl] Revert "cxl/list: Add parent_dport attribute to port listings"

Message ID 20230105-vv-revert-v1-1-45df35ad410b@intel.com
State Accepted
Commit b9ecc503d5de131bf0484d49884a1106919959f5
Headers show
Series [ndctl] Revert "cxl/list: Add parent_dport attribute to port listings" | expand

Commit Message

Verma, Vishal L Jan. 5, 2023, 9:09 p.m. UTC 
This reverts commit 6df696a5debfd619ddcd480b51249e3d7a254e7c.

Dan writes[1]:

  I should not have sent this out. It was sitting in my development tree
  for other work, but should have been held back until the kernel support
  landed.

  Drop this for now as the kernel support will not arrive until v6.3:

  http://lore.kernel.org/r/167124082375.1626103.6047000000121298560.stgit@dwillia2-xfh.jf.intel.com

[1]: https://lore.kernel.org/all/639d1d3bc99a_b41e32948@dwillia2-xfh.jf.intel.com.notmuch/

Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
---
 cxl/lib/private.h  |  2 --
 cxl/lib/libcxl.c   | 38 --------------------------------------
 cxl/libcxl.h       |  1 -
 cxl/json.c         |  8 --------
 cxl/lib/libcxl.sym |  1 -
 5 files changed, 50 deletions(-)


---
base-commit: 45b9d1e2256bbcc71b9572e06865a5069ed382fc
change-id: 20230105-vv-revert-002362819ff0

Best regards,
diff mbox series

Patch

diff --git a/cxl/lib/private.h b/cxl/lib/private.h
index 81d6fac..f8871bd 100644
--- a/cxl/lib/private.h
+++ b/cxl/lib/private.h
@@ -63,8 +63,6 @@  struct cxl_port {
 	size_t buf_len;
 	char *dev_path;
 	char *uport;
-	char *parent_dport_path;
-	struct cxl_dport *parent_dport;
 	int ports_init;
 	int endpoints_init;
 	int decoders_init;
diff --git a/cxl/lib/libcxl.c b/cxl/lib/libcxl.c
index abc7344..4205a58 100644
--- a/cxl/lib/libcxl.c
+++ b/cxl/lib/libcxl.c
@@ -165,7 +165,6 @@  static void __free_port(struct cxl_port *port, struct list_head *head)
 	free(port->dev_buf);
 	free(port->dev_path);
 	free(port->uport);
-	free(port->parent_dport_path);
 }
 
 static void free_port(struct cxl_port *port, struct list_head *head)
@@ -1543,20 +1542,6 @@  static int cxl_port_init(struct cxl_port *port, struct cxl_port *parent_port,
 	if (!port->uport)
 		goto err;
 
-	/*
-	 * CXL root devices have no parents and level 1 ports are both
-	 * CXL root targets and hosts of the next level, so:
-	 *     parent_dport == uport
-	 * ...at depth == 1
-	 */
-	if (port->depth > 1) {
-		rc = snprintf(port->dev_buf, port->buf_len, "%s/parent_dport",
-			      cxlport_base);
-		if (rc >= port->buf_len)
-			goto err;
-		port->parent_dport_path = realpath(port->dev_buf, NULL);
-	}
-
 	sprintf(path, "%s/modalias", cxlport_base);
 	if (sysfs_read_attr(ctx, path, buf) == 0)
 		port->module = util_modalias_to_module(ctx, buf);
@@ -2532,29 +2517,6 @@  CXL_EXPORT const char *cxl_port_get_host(struct cxl_port *port)
 	return devpath_to_devname(port->uport);
 }
 
-CXL_EXPORT struct cxl_dport *cxl_port_get_parent_dport(struct cxl_port *port)
-{
-	struct cxl_port *parent;
-	struct cxl_dport *dport;
-	const char *name;
-
-	if (port->parent_dport)
-		return port->parent_dport;
-
-	if (!port->parent_dport_path)
-		return NULL;
-
-	parent = cxl_port_get_parent(port);
-	name = devpath_to_devname(port->parent_dport_path);
-	cxl_dport_foreach(parent, dport)
-		if (strcmp(cxl_dport_get_devname(dport), name) == 0) {
-			port->parent_dport = dport;
-			return dport;
-		}
-
-	return NULL;
-}
-
 CXL_EXPORT bool cxl_port_hosts_memdev(struct cxl_port *port,
 				      struct cxl_memdev *memdev)
 {
diff --git a/cxl/libcxl.h b/cxl/libcxl.h
index 499b965..cc1b90c 100644
--- a/cxl/libcxl.h
+++ b/cxl/libcxl.h
@@ -96,7 +96,6 @@  bool cxl_port_is_endpoint(struct cxl_port *port);
 struct cxl_endpoint *cxl_port_to_endpoint(struct cxl_port *port);
 struct cxl_bus *cxl_port_get_bus(struct cxl_port *port);
 const char *cxl_port_get_host(struct cxl_port *port);
-struct cxl_dport *cxl_port_get_parent_dport(struct cxl_port *port);
 bool cxl_port_hosts_memdev(struct cxl_port *port, struct cxl_memdev *memdev);
 int cxl_port_get_nr_dports(struct cxl_port *port);
 int cxl_port_disable_invalidate(struct cxl_port *port);
diff --git a/cxl/json.c b/cxl/json.c
index 0b0bf7c..0fc44e4 100644
--- a/cxl/json.c
+++ b/cxl/json.c
@@ -982,14 +982,6 @@  static struct json_object *__util_cxl_port_to_json(struct cxl_port *port,
 	if (jobj)
 		json_object_object_add(jport, "host", jobj);
 
-	if (cxl_port_get_parent_dport(port)) {
-		struct cxl_dport *dport = cxl_port_get_parent_dport(port);
-
-		jobj = json_object_new_string(cxl_dport_get_devname(dport));
-		if (jobj)
-			json_object_object_add(jport, "parent_dport", jobj);
-	}
-
 	jobj = json_object_new_int(cxl_port_get_depth(port));
 	if (jobj)
 		json_object_object_add(jport, "depth", jobj);
diff --git a/cxl/lib/libcxl.sym b/cxl/lib/libcxl.sym
index c02d0a6..6bc0810 100644
--- a/cxl/lib/libcxl.sym
+++ b/cxl/lib/libcxl.sym
@@ -241,5 +241,4 @@  global:
 	cxl_cmd_alert_config_get_corrected_pmem_err_prog_warn_threshold;
 	cxl_target_get_firmware_node;
 	cxl_dport_get_firmware_node;
-	cxl_port_get_parent_dport;
 } LIBCXL_3;