Dynamic capacity partitions are exposed as a singular dynamic ram
partition.
Add CXL library support to read this partition information.
Signed-off-by: Ira Weiny <ira.we...@intel.com>
---
Documentation/cxl/lib/libcxl.txt | 6 ++++--
cxl/lib/libcxl.c | 43 ++++++++++++++++++++++++++++++++++++++++
cxl/lib/libcxl.sym | 4 ++++
cxl/lib/private.h | 3 +++
cxl/libcxl.h | 10 +++++++++-
5 files changed, 63 insertions(+), 3 deletions(-)
diff --git a/Documentation/cxl/lib/libcxl.txt b/Documentation/cxl/lib/libcxl.txt
index 40598a08b9f4..7e2136519229 100644
--- a/Documentation/cxl/lib/libcxl.txt
+++ b/Documentation/cxl/lib/libcxl.txt
@@ -68,6 +68,7 @@ int cxl_memdev_get_major(struct cxl_memdev *memdev);
int cxl_memdev_get_minor(struct cxl_memdev *memdev);
unsigned long long cxl_memdev_get_pmem_size(struct cxl_memdev *memdev);
unsigned long long cxl_memdev_get_ram_size(struct cxl_memdev *memdev);
+unsigned long long cxl_memdev_get_dynamic_ram_a_size(struct cxl_memdev
*memdev);
const char *cxl_memdev_get_firmware_version(struct cxl_memdev *memdev);
size_t cxl_memdev_get_label_size(struct cxl_memdev *memdev);
int cxl_memdev_nvdimm_bridge_active(struct cxl_memdev *memdev);
@@ -87,8 +88,8 @@ The character device node for command submission can be found
by default
at /dev/cxl/mem%d, or created with a major / minor returned from
cxl_memdev_get_{major,minor}().
-The 'pmem_size' and 'ram_size' attributes return the current
-provisioning of DPA (Device Physical Address / local capacity) in the
+The 'pmem_size', 'ram_size', and 'dynamic_ram_a_size' attributes return the
+current provisioning of DPA (Device Physical Address / local capacity) in the
device.
cxl_memdev_get_numa_node() returns the affinitized CPU node number if
@@ -422,6 +423,7 @@ enum cxl_decoder_mode {
CXL_DECODER_MODE_MIXED,
CXL_DECODER_MODE_PMEM,
CXL_DECODER_MODE_RAM,
+ CXL_DECODER_MODE_DYNAMIC_RAM_A,
};
enum cxl_decoder_mode cxl_decoder_get_mode(struct cxl_decoder *decoder);
int cxl_decoder_set_mode(struct cxl_decoder *decoder, enum cxl_decoder_mode
mode);
diff --git a/cxl/lib/libcxl.c b/cxl/lib/libcxl.c
index 566870acb30a..81810a4ae862 100644
--- a/cxl/lib/libcxl.c
+++ b/cxl/lib/libcxl.c
@@ -437,6 +437,9 @@ CXL_EXPORT bool cxl_region_qos_class_mismatch(struct
cxl_region *region)
} else if (region->mode == CXL_DECODER_MODE_PMEM) {
if (root_decoder->qos_class != memdev->pmem_qos_class)
return true;
+ } else if (region->mode == CXL_DECODER_MODE_DYNAMIC_RAM_A) {
+ if (root_decoder->qos_class !=
memdev->dynamic_ram_a_qos_class)
+ return true;
}
}
@@ -1351,6 +1354,10 @@ static void *add_cxl_memdev(void *parent, int id, const
char *cxlmem_base)
if (sysfs_read_attr(ctx, path, buf) == 0)
memdev->ram_size = strtoull(buf, NULL, 0);
+ sprintf(path, "%s/dynamic_ram_a/size", cxlmem_base);
+ if (sysfs_read_attr(ctx, path, buf) == 0)
+ memdev->dynamic_ram_a_size = strtoull(buf, NULL, 0);
+
sprintf(path, "%s/pmem/qos_class", cxlmem_base);
if (sysfs_read_attr(ctx, path, buf) < 0)
memdev->pmem_qos_class = CXL_QOS_CLASS_NONE;
@@ -1363,6 +1370,12 @@ static void *add_cxl_memdev(void *parent, int id, const
char *cxlmem_base)
else
memdev->ram_qos_class = atoi(buf);
+ sprintf(path, "%s/dynamic_ram_a/qos_class", cxlmem_base);
+ if (sysfs_read_attr(ctx, path, buf) < 0)
+ memdev->dynamic_ram_a_qos_class = CXL_QOS_CLASS_NONE;
+ else
+ memdev->dynamic_ram_a_qos_class = atoi(buf);
+
sprintf(path, "%s/payload_max", cxlmem_base);
if (sysfs_read_attr(ctx, path, buf) == 0) {
memdev->payload_max = strtoull(buf, NULL, 0);
@@ -1599,6 +1612,11 @@ CXL_EXPORT unsigned long long
cxl_memdev_get_ram_size(struct cxl_memdev *memdev)
return memdev->ram_size;
}
+CXL_EXPORT unsigned long long cxl_memdev_get_dynamic_ram_a_size(struct
cxl_memdev *memdev)
+{
+ return memdev->dynamic_ram_a_size;
+}
+
CXL_EXPORT int cxl_memdev_get_pmem_qos_class(struct cxl_memdev *memdev)
{
return memdev->pmem_qos_class;
@@ -1609,6 +1627,11 @@ CXL_EXPORT int cxl_memdev_get_ram_qos_class(struct
cxl_memdev *memdev)
return memdev->ram_qos_class;
}
+CXL_EXPORT int cxl_memdev_get_dynamic_ram_a_qos_class(struct cxl_memdev
*memdev)
+{
+ return memdev->dynamic_ram_a_qos_class;
+}
+
CXL_EXPORT const char *cxl_memdev_get_firmware_verison(struct cxl_memdev
*memdev)
{
return memdev->firmware_version;
@@ -2348,6 +2371,8 @@ static void *add_cxl_decoder(void *parent, int id, const
char *cxldecoder_base)
decoder->mode = CXL_DECODER_MODE_MIXED;
else if (strcmp(buf, "none") == 0)
decoder->mode = CXL_DECODER_MODE_NONE;
+ else if (strcmp(buf, "dynamic_ram_a") == 0)
+ decoder->mode = CXL_DECODER_MODE_DYNAMIC_RAM_A;
else
decoder->mode = CXL_DECODER_MODE_MIXED;
} else
@@ -2387,6 +2412,7 @@ static void *add_cxl_decoder(void *parent, int id, const
char *cxldecoder_base)
case CXL_PORT_SWITCH:
decoder->pmem_capable = true;
decoder->volatile_capable = true;
+ decoder->dynamic_ram_a_capable = true;
decoder->mem_capable = true;
decoder->accelmem_capable = true;
sprintf(path, "%s/locked", cxldecoder_base);
@@ -2411,6 +2437,7 @@ static void *add_cxl_decoder(void *parent, int id, const
char *cxldecoder_base)
{ "cap_type3", &decoder->mem_capable },
{ "cap_ram", &decoder->volatile_capable },
{ "cap_pmem", &decoder->pmem_capable },
+ { "cap_dynamic_ram_a", &decoder->dynamic_ram_a_capable
},
{ "locked", &decoder->locked },
};
@@ -2661,6 +2688,9 @@ CXL_EXPORT int cxl_decoder_set_mode(struct cxl_decoder
*decoder,
case CXL_DECODER_MODE_RAM:
sprintf(buf, "ram");
break;
+ case CXL_DECODER_MODE_DYNAMIC_RAM_A:
+ sprintf(buf, "dynamic_ram_a");
+ break;
default:
err(ctx, "%s: unsupported mode: %d\n",
cxl_decoder_get_devname(decoder), mode);
@@ -2712,6 +2742,11 @@ CXL_EXPORT bool cxl_decoder_is_volatile_capable(struct
cxl_decoder *decoder)
return decoder->volatile_capable;
}
+CXL_EXPORT bool cxl_decoder_is_dynamic_ram_a_capable(struct cxl_decoder
*decoder)
+{
+ return decoder->dynamic_ram_a_capable;
+}
+
CXL_EXPORT bool cxl_decoder_is_mem_capable(struct cxl_decoder *decoder)
{
return decoder->mem_capable;
@@ -2786,6 +2821,8 @@ static struct cxl_region
*cxl_decoder_create_region(struct cxl_decoder *decoder,
sprintf(path, "%s/create_pmem_region", decoder->dev_path);
else if (mode == CXL_DECODER_MODE_RAM)
sprintf(path, "%s/create_ram_region", decoder->dev_path);
+ else if (mode == CXL_DECODER_MODE_DYNAMIC_RAM_A)
+ sprintf(path, "%s/create_dynamic_ram_a_region",
decoder->dev_path);
rc = sysfs_read_attr(ctx, path, buf);
if (rc < 0) {
@@ -2837,6 +2874,12 @@ cxl_decoder_create_ram_region(struct cxl_decoder
*decoder)
return cxl_decoder_create_region(decoder, CXL_DECODER_MODE_RAM);
}
+CXL_EXPORT struct cxl_region *
+cxl_decoder_create_dynamic_ram_a_region(struct cxl_decoder *decoder)
+{
+ return cxl_decoder_create_region(decoder,
CXL_DECODER_MODE_DYNAMIC_RAM_A);
+}
+
CXL_EXPORT int cxl_decoder_get_nr_targets(struct cxl_decoder *decoder)
{
return decoder->nr_targets;
diff --git a/cxl/lib/libcxl.sym b/cxl/lib/libcxl.sym
index ba82bc3da589..06f7d40344ab 100644
--- a/cxl/lib/libcxl.sym
+++ b/cxl/lib/libcxl.sym
@@ -293,4 +293,8 @@ global:
cxl_bus_get_by_provider;
cxl_memdev_get_fwctl_major;
cxl_memdev_get_fwctl_minor;
+ cxl_memdev_get_dynamic_ram_a_size;
+ cxl_memdev_get_dynamic_ram_a_qos_class;
+ cxl_decoder_is_dynamic_ram_a_capable;
+ cxl_decoder_create_dynamic_ram_a_region;
} LIBECXL_8;
diff --git a/cxl/lib/private.h b/cxl/lib/private.h
index 676bf1573487..57c9fa0b8f52 100644
--- a/cxl/lib/private.h
+++ b/cxl/lib/private.h
@@ -48,8 +48,10 @@ struct cxl_memdev {
struct list_node list;
unsigned long long pmem_size;
unsigned long long ram_size;
+ unsigned long long dynamic_ram_a_size;
int ram_qos_class;
int pmem_qos_class;
+ int dynamic_ram_a_qos_class;
int payload_max;
size_t lsa_size;
struct kmod_module *module;
@@ -140,6 +142,7 @@ struct cxl_decoder {
unsigned int interleave_granularity;
bool pmem_capable;
bool volatile_capable;
+ bool dynamic_ram_a_capable;
bool mem_capable;
bool accelmem_capable;
bool locked;
diff --git a/cxl/libcxl.h b/cxl/libcxl.h
index 010ac0b78039..de66f2462311 100644
--- a/cxl/libcxl.h
+++ b/cxl/libcxl.h
@@ -74,8 +74,10 @@ int cxl_memdev_get_fwctl_minor(struct cxl_memdev *memdev);
struct cxl_ctx *cxl_memdev_get_ctx(struct cxl_memdev *memdev);
unsigned long long cxl_memdev_get_pmem_size(struct cxl_memdev *memdev);
unsigned long long cxl_memdev_get_ram_size(struct cxl_memdev *memdev);
+unsigned long long cxl_memdev_get_dynamic_ram_a_size(struct cxl_memdev
*memdev);
int cxl_memdev_get_pmem_qos_class(struct cxl_memdev *memdev);
int cxl_memdev_get_ram_qos_class(struct cxl_memdev *memdev);
+int cxl_memdev_get_dynamic_ram_a_qos_class(struct cxl_memdev *memdev);
const char *cxl_memdev_get_firmware_verison(struct cxl_memdev *memdev);
bool cxl_memdev_fw_update_in_progress(struct cxl_memdev *memdev);
size_t cxl_memdev_fw_update_get_remaining(struct cxl_memdev *memdev);
@@ -200,6 +202,7 @@ enum cxl_decoder_mode {
CXL_DECODER_MODE_MIXED,
CXL_DECODER_MODE_PMEM,
CXL_DECODER_MODE_RAM,
+ CXL_DECODER_MODE_DYNAMIC_RAM_A,
};
static inline const char *cxl_decoder_mode_name(enum cxl_decoder_mode mode)
@@ -209,9 +212,10 @@ static inline const char *cxl_decoder_mode_name(enum
cxl_decoder_mode mode)
[CXL_DECODER_MODE_MIXED] = "mixed",
[CXL_DECODER_MODE_PMEM] = "pmem",
[CXL_DECODER_MODE_RAM] = "ram",
+ [CXL_DECODER_MODE_DYNAMIC_RAM_A] = "dynamic_ram_a",
};
- if (mode < CXL_DECODER_MODE_NONE || mode > CXL_DECODER_MODE_RAM)
+ if (mode < CXL_DECODER_MODE_NONE || mode >
CXL_DECODER_MODE_DYNAMIC_RAM_A)
mode = CXL_DECODER_MODE_NONE;
return names[mode];
}
@@ -225,6 +229,8 @@ cxl_decoder_mode_from_ident(const char *ident)
return CXL_DECODER_MODE_RAM;
else if (strcmp(ident, "pmem") == 0)
return CXL_DECODER_MODE_PMEM;
+ else if (strcmp(ident, "dynamic_ram_a") == 0)
+ return CXL_DECODER_MODE_DYNAMIC_RAM_A;
return CXL_DECODER_MODE_NONE;
}
@@ -254,6 +260,7 @@ cxl_decoder_get_target_type(struct cxl_decoder *decoder);
bool cxl_decoder_is_pmem_capable(struct cxl_decoder *decoder);
bool cxl_decoder_is_volatile_capable(struct cxl_decoder *decoder);
bool cxl_decoder_is_mem_capable(struct cxl_decoder *decoder);
+bool cxl_decoder_is_dynamic_ram_a_capable(struct cxl_decoder *decoder);
bool cxl_decoder_is_accelmem_capable(struct cxl_decoder *decoder);
bool cxl_decoder_is_locked(struct cxl_decoder *decoder);
unsigned int
@@ -262,6 +269,7 @@ unsigned int cxl_decoder_get_interleave_ways(struct
cxl_decoder *decoder);
struct cxl_region *cxl_decoder_get_region(struct cxl_decoder *decoder);
struct cxl_region *cxl_decoder_create_pmem_region(struct cxl_decoder *decoder);
struct cxl_region *cxl_decoder_create_ram_region(struct cxl_decoder *decoder);
+struct cxl_region *cxl_decoder_create_dynamic_ram_a_region(struct cxl_decoder
*decoder);
struct cxl_decoder *cxl_decoder_get_by_name(struct cxl_ctx *ctx,
const char *ident);
struct cxl_memdev *cxl_decoder_get_memdev(struct cxl_decoder *decoder);
--
2.49.0
