From bbc0da95d12b3c890cc323a34b48cf489d4b467a Mon Sep 17 00:00:00 2001

From: Dan Williams <dan.j.williams@intel.com>

Date: Thu, 14 Jul 2022 10:02:09 -0700

Subject: [PATCH 178/217] cxl/list: Add DPA span to endpoint decoder listings

Optionally include in decoder listings the device local address space for

endpoint decoders with active / allocated capacity.

Link: https://lore.kernel.org/r/165781812967.1555691.4685129673233918478.stgit@dwillia2-xfh.jf.intel.com

Signed-off-by: Dan Williams <dan.j.williams@intel.com>

Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>

---

 Documentation/cxl/lib/libcxl.txt |  2 ++

 cxl/json.c                       | 18 +++++++++++++

 cxl/lib/libcxl.c                 | 43 +++++++++++++++++++++++++++++++-

 cxl/lib/libcxl.sym               |  6 +++++

 cxl/lib/private.h                |  2 ++

 cxl/libcxl.h                     |  2 ++

 6 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/Documentation/cxl/lib/libcxl.txt b/Documentation/cxl/lib/libcxl.txt

index f8f0e66..2aef489 100644

--- a/Documentation/cxl/lib/libcxl.txt

+++ b/Documentation/cxl/lib/libcxl.txt

@@ -392,6 +392,8 @@ more CXL decoder objects.

 ----

 unsigned long long cxl_decoder_get_resource(struct cxl_decoder *decoder);

 unsigned long long cxl_decoder_get_size(struct cxl_decoder *decoder);

+unsigned long long cxl_decoder_get_dpa_resource(struct cxl_decoder *decoder);

+unsigned long long cxl_decoder_get_dpa_size(struct cxl_decoder *decoder);

 const char *cxl_decoder_get_devname(struct cxl_decoder *decoder);

 int cxl_decoder_get_id(struct cxl_decoder *decoder);

 int cxl_decoder_get_nr_targets(struct cxl_decoder *decoder);

diff --git a/cxl/json.c b/cxl/json.c

index a213fda..3f52d3b 100644

--- a/cxl/json.c

+++ b/cxl/json.c

@@ -472,6 +472,24 @@ struct json_object *util_cxl_decoder_to_json(struct cxl_decoder *decoder,

 			json_object_object_add(jdecoder, "state", jobj);

 	}

+	if (cxl_port_is_endpoint(port)) {

+		size = cxl_decoder_get_dpa_size(decoder);

+		val = cxl_decoder_get_dpa_resource(decoder);

+		if (size && val < ULLONG_MAX) {

+			jobj = util_json_object_hex(val, flags);

+			if (jobj)

+				json_object_object_add(jdecoder, "dpa_resource",

+						       jobj);

+		}

+

+		if (size && size < ULLONG_MAX) {

+			jobj = util_json_object_size(size, flags);

+			if (jobj)

+				json_object_object_add(jdecoder, "dpa_size",

+						       jobj);

+		}

+	}

+

 	if (cxl_port_is_root(port) && cxl_decoder_is_mem_capable(decoder)) {

 		if (cxl_decoder_is_pmem_capable(decoder)) {

 			jobj = json_object_new_boolean(true);

diff --git a/cxl/lib/libcxl.c b/cxl/lib/libcxl.c

index bf3568d..6f4d64d 100644

--- a/cxl/lib/libcxl.c

+++ b/cxl/lib/libcxl.c

@@ -956,8 +956,19 @@ static void *add_cxl_decoder(void *parent, int id, const char *cxldecoder_base)

 		decoder->size = strtoull(buf, NULL, 0);

 	switch (port->type) {

-	case CXL_PORT_SWITCH:

 	case CXL_PORT_ENDPOINT:

+		sprintf(path, "%s/dpa_resource", cxldecoder_base);

+		if (sysfs_read_attr(ctx, path, buf) < 0)

+			decoder->dpa_resource = ULLONG_MAX;

+		else

+			decoder->dpa_resource = strtoull(buf, NULL, 0);

+		sprintf(path, "%s/dpa_size", cxldecoder_base);

+		if (sysfs_read_attr(ctx, path, buf) < 0)

+			decoder->dpa_size = ULLONG_MAX;

+		else

+			decoder->dpa_size = strtoull(buf, NULL, 0);

+

+	case CXL_PORT_SWITCH:

 		decoder->pmem_capable = true;

 		decoder->volatile_capable = true;

 		decoder->mem_capable = true;

@@ -1114,6 +1125,36 @@ CXL_EXPORT unsigned long long cxl_decoder_get_size(struct cxl_decoder *decoder)

 	return decoder->size;

 }

+CXL_EXPORT unsigned long long

+cxl_decoder_get_dpa_resource(struct cxl_decoder *decoder)

+{

+	struct cxl_port *port = cxl_decoder_get_port(decoder);

+	struct cxl_ctx *ctx = cxl_decoder_get_ctx(decoder);

+

+	if (!cxl_port_is_endpoint(port)) {

+		err(ctx, "%s: not an endpoint decoder\n",

+		    cxl_decoder_get_devname(decoder));

+		return ULLONG_MAX;

+	}

+

+	return decoder->dpa_resource;

+}

+

+CXL_EXPORT unsigned long long

+cxl_decoder_get_dpa_size(struct cxl_decoder *decoder)

+{

+	struct cxl_port *port = cxl_decoder_get_port(decoder);

+	struct cxl_ctx *ctx = cxl_decoder_get_ctx(decoder);

+

+	if (!cxl_port_is_endpoint(port)) {

+		err(ctx, "%s: not an endpoint decoder\n",

+		    cxl_decoder_get_devname(decoder));

+		return ULLONG_MAX;

+	}

+

+	return decoder->dpa_size;

+}

+

 CXL_EXPORT enum cxl_decoder_target_type

 cxl_decoder_get_target_type(struct cxl_decoder *decoder)

 {

diff --git a/cxl/lib/libcxl.sym b/cxl/lib/libcxl.sym

index dffcb60..8e2fc75 100644

--- a/cxl/lib/libcxl.sym

+++ b/cxl/lib/libcxl.sym

@@ -167,3 +167,9 @@ global:

 	cxl_cmd_new_set_partition;

 	cxl_cmd_partition_set_mode;

 } LIBCXL_1;

+

+LIBCXL_3 {

+global:

+	cxl_decoder_get_dpa_resource;

+	cxl_decoder_get_dpa_size;

+} LIBCXL_2;

diff --git a/cxl/lib/private.h b/cxl/lib/private.h

index c6d88f7..24a2ae6 100644

--- a/cxl/lib/private.h

+++ b/cxl/lib/private.h

@@ -101,6 +101,8 @@ struct cxl_decoder {

 	struct cxl_ctx *ctx;

 	u64 start;

 	u64 size;

+	u64 dpa_resource;

+	u64 dpa_size;

 	void *dev_buf;

 	size_t buf_len;

 	char *dev_path;

diff --git a/cxl/libcxl.h b/cxl/libcxl.h

index 0007f4d..76aebe3 100644

--- a/cxl/libcxl.h

+++ b/cxl/libcxl.h

@@ -129,6 +129,8 @@ struct cxl_decoder *cxl_decoder_get_first(struct cxl_port *port);

 struct cxl_decoder *cxl_decoder_get_next(struct cxl_decoder *decoder);

 unsigned long long cxl_decoder_get_resource(struct cxl_decoder *decoder);

 unsigned long long cxl_decoder_get_size(struct cxl_decoder *decoder);

+unsigned long long cxl_decoder_get_dpa_resource(struct cxl_decoder *decoder);

+unsigned long long cxl_decoder_get_dpa_size(struct cxl_decoder *decoder);

 const char *cxl_decoder_get_devname(struct cxl_decoder *decoder);

 struct cxl_target *cxl_decoder_get_target_by_memdev(struct cxl_decoder *decoder,

 						    struct cxl_memdev *memdev);

-- 

2.27.0