From: <shiju.jose@huawei.com>
To: <qemu-devel@nongnu.org>, <linux-cxl@vger.kernel.org>
Cc: <jonathan.cameron@huawei.com>, <tanxiaofei@huawei.com>,
<prime.zeng@hisilicon.com>, <linuxarm@huawei.com>,
<shiju.jose@huawei.com>
Subject: [PATCH v3 3/3] hw/cxl/cxl-mailbox-utils: Add device DDR5 ECS control feature
Date: Thu, 15 Feb 2024 19:01:46 +0800 [thread overview]
Message-ID: <20240215110146.1444-4-shiju.jose@huawei.com> (raw)
In-Reply-To: <20240215110146.1444-1-shiju.jose@huawei.com>
From: Shiju Jose <shiju.jose@huawei.com>
CXL spec 3.1 section 8.2.9.9.11.2 describes the DDR5 Error Check Scrub (ECS)
control feature.
The Error Check Scrub (ECS) is a feature defined in JEDEC DDR5 SDRAM
Specification (JESD79-5) and allows the DRAM to internally read, correct
single-bit errors, and write back corrected data bits to the DRAM array
while providing transparency to error counts. The ECS control feature
allows the request to configure ECS input configurations during system
boot or at run-time.
The ECS control allows the requester to change the log entry type, the ECS
threshold count provided that the request is within the definition
specified in DDR5 mode registers, change mode between codeword mode and
row count mode, and reset the ECS counter.
Reviewed-by: Davidlohr Bueso <dave@stgolabs.net>
Signed-off-by: Shiju Jose <shiju.jose@huawei.com>
---
hw/cxl/cxl-mailbox-utils.c | 100 ++++++++++++++++++++++++++++++++++++-
1 file changed, 99 insertions(+), 1 deletion(-)
diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c
index 9557c38dd9..a14eee9ff5 100644
--- a/hw/cxl/cxl-mailbox-utils.c
+++ b/hw/cxl/cxl-mailbox-utils.c
@@ -998,6 +998,7 @@ typedef struct CXLSupportedFeatureEntry {
enum CXL_SUPPORTED_FEATURES_LIST {
CXL_FEATURE_PATROL_SCRUB = 0,
+ CXL_FEATURE_DDR5_ECS,
CXL_FEATURE_MAX
};
@@ -1069,6 +1070,42 @@ typedef struct CXLMemPatrolScrubSetFeature {
CXLMemPatrolScrubWriteAttrbs feat_data;
} QEMU_PACKED QEMU_ALIGNED(16) CXLMemPatrolScrubSetFeature;
+/*
+ * CXL r3.1 section 8.2.9.9.11.2:
+ * DDR5 Error Check Scrub (ECS) Control Feature
+ */
+static const QemuUUID ddr5_ecs_uuid = {
+ .data = UUID(0xe5b13f22, 0x2328, 0x4a14, 0xb8, 0xba,
+ 0xb9, 0x69, 0x1e, 0x89, 0x33, 0x86)
+};
+
+#define CXL_DDR5_ECS_GET_FEATURE_VERSION 0x01
+#define CXL_DDR5_ECS_SET_FEATURE_VERSION 0x01
+#define CXL_DDR5_ECS_LOG_ENTRY_TYPE_DEFAULT 0x01
+#define CXL_DDR5_ECS_REALTIME_REPORT_CAP_DEFAULT 1
+#define CXL_DDR5_ECS_THRESHOLD_COUNT_DEFAULT 3 /* 3: 256, 4: 1024, 5: 4096 */
+#define CXL_DDR5_ECS_MODE_DEFAULT 0
+
+#define CXL_DDR5_ECS_NUM_MEDIA_FRUS 3
+
+/* CXL memdev DDR5 ECS control attributes */
+struct CXLMemECSReadAttrbs {
+ uint8_t ecs_log_cap;
+ uint8_t ecs_cap;
+ uint16_t ecs_config;
+ uint8_t ecs_flags;
+} QEMU_PACKED cxl_ddr5_ecs_feat_read_attrbs[CXL_DDR5_ECS_NUM_MEDIA_FRUS];
+
+typedef struct CXLDDR5ECSWriteAttrbs {
+ uint8_t ecs_log_cap;
+ uint16_t ecs_config;
+} QEMU_PACKED CXLDDR5ECSWriteAttrbs;
+
+typedef struct CXLDDR5ECSSetFeature {
+ CXLSetFeatureInHeader hdr;
+ CXLDDR5ECSWriteAttrbs feat_data[];
+} QEMU_PACKED QEMU_ALIGNED(16) CXLDDR5ECSSetFeature;
+
/* CXL r3.1 section 8.2.9.6.1: Get Supported Features (Opcode 0500h) */
static CXLRetCode cmd_features_get_supported(const struct cxl_cmd *cmd,
uint8_t *payload_in,
@@ -1087,7 +1124,7 @@ static CXLRetCode cmd_features_get_supported(const struct cxl_cmd *cmd,
CXLSupportedFeatureHeader hdr;
CXLSupportedFeatureEntry feat_entries[];
} QEMU_PACKED QEMU_ALIGNED(16) * get_feats_out = (void *)payload_out;
- uint16_t index;
+ uint16_t count, index;
uint16_t entry, req_entries;
uint16_t feat_entries = 0;
@@ -1129,6 +1166,35 @@ static CXLRetCode cmd_features_get_supported(const struct cxl_cmd *cmd,
cxl_memdev_ps_feat_read_attrbs.scrub_flags =
CXL_MEMDEV_PS_ENABLE_DEFAULT;
break;
+ case CXL_FEATURE_DDR5_ECS:
+ /* Fill supported feature entry for device DDR5 ECS control */
+ get_feats_out->feat_entries[entry] =
+ (struct CXLSupportedFeatureEntry) {
+ .uuid = ddr5_ecs_uuid,
+ .feat_index = index,
+ .get_feat_size = CXL_DDR5_ECS_NUM_MEDIA_FRUS *
+ sizeof(struct CXLMemECSReadAttrbs),
+ .set_feat_size = CXL_DDR5_ECS_NUM_MEDIA_FRUS *
+ sizeof(CXLDDR5ECSWriteAttrbs),
+ .attrb_flags = 0x1,
+ .get_feat_version = CXL_DDR5_ECS_GET_FEATURE_VERSION,
+ .set_feat_version = CXL_DDR5_ECS_SET_FEATURE_VERSION,
+ .set_feat_effects = 0,
+ };
+ feat_entries++;
+ /* Set default value for DDR5 ECS read attributes */
+ for (count = 0; count < CXL_DDR5_ECS_NUM_MEDIA_FRUS; count++) {
+ cxl_ddr5_ecs_feat_read_attrbs[count].ecs_log_cap =
+ CXL_DDR5_ECS_LOG_ENTRY_TYPE_DEFAULT;
+ cxl_ddr5_ecs_feat_read_attrbs[count].ecs_cap =
+ CXL_DDR5_ECS_REALTIME_REPORT_CAP_DEFAULT;
+ cxl_ddr5_ecs_feat_read_attrbs[count].ecs_config =
+ CXL_DDR5_ECS_THRESHOLD_COUNT_DEFAULT |
+ (CXL_DDR5_ECS_MODE_DEFAULT << 3);
+ /* Reserved */
+ cxl_ddr5_ecs_feat_read_attrbs[count].ecs_flags = 0;
+ }
+ break;
default:
break;
}
@@ -1180,6 +1246,19 @@ static CXLRetCode cmd_features_get_feature(const struct cxl_cmd *cmd,
memcpy(payload_out,
&cxl_memdev_ps_feat_read_attrbs + get_feature->offset,
bytes_to_copy);
+ } else if (qemu_uuid_is_equal(&get_feature->uuid, &ddr5_ecs_uuid)) {
+ if (get_feature->offset >= CXL_DDR5_ECS_NUM_MEDIA_FRUS *
+ sizeof(struct CXLMemECSReadAttrbs)) {
+ return CXL_MBOX_INVALID_INPUT;
+ }
+ bytes_to_copy = CXL_DDR5_ECS_NUM_MEDIA_FRUS *
+ sizeof(struct CXLMemECSReadAttrbs) -
+ get_feature->offset;
+ bytes_to_copy = (bytes_to_copy > get_feature->count) ?
+ get_feature->count : bytes_to_copy;
+ memcpy(payload_out,
+ &cxl_ddr5_ecs_feat_read_attrbs + get_feature->offset,
+ bytes_to_copy);
} else {
return CXL_MBOX_UNSUPPORTED;
}
@@ -1197,8 +1276,11 @@ static CXLRetCode cmd_features_set_feature(const struct cxl_cmd *cmd,
size_t *len_out,
CXLCCI *cci)
{
+ uint16_t count;
CXLMemPatrolScrubWriteAttrbs *ps_write_attrbs;
+ CXLDDR5ECSWriteAttrbs *ecs_write_attrbs;
CXLMemPatrolScrubSetFeature *ps_set_feature;
+ CXLDDR5ECSSetFeature *ecs_set_feature;
CXLSetFeatureInHeader *hdr = (void *)payload_in;
if (qemu_uuid_is_equal(&hdr->uuid, &patrol_scrub_uuid)) {
@@ -1216,6 +1298,22 @@ static CXLRetCode cmd_features_set_feature(const struct cxl_cmd *cmd,
cxl_memdev_ps_feat_read_attrbs.scrub_flags &= ~0x1;
cxl_memdev_ps_feat_read_attrbs.scrub_flags |=
ps_write_attrbs->scrub_flags & 0x1;
+ } else if (qemu_uuid_is_equal(&hdr->uuid,
+ &ddr5_ecs_uuid)) {
+ if (hdr->version != CXL_DDR5_ECS_SET_FEATURE_VERSION ||
+ (hdr->flags & CXL_SET_FEATURE_FLAG_DATA_TRANSFER_MASK) !=
+ CXL_SET_FEATURE_FLAG_FULL_DATA_TRANSFER) {
+ return CXL_MBOX_UNSUPPORTED;
+ }
+
+ ecs_set_feature = (void *)payload_in;
+ ecs_write_attrbs = ecs_set_feature->feat_data;
+ for (count = 0; count < CXL_DDR5_ECS_NUM_MEDIA_FRUS; count++) {
+ cxl_ddr5_ecs_feat_read_attrbs[count].ecs_log_cap =
+ ecs_write_attrbs[count].ecs_log_cap;
+ cxl_ddr5_ecs_feat_read_attrbs[count].ecs_config =
+ ecs_write_attrbs[count].ecs_config & 0x1F;
+ }
} else {
return CXL_MBOX_UNSUPPORTED;
}
--
2.34.1
next prev parent reply other threads:[~2024-02-15 11:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-15 11:01 [PATCH v3 0/3] hw/cxl/cxl-mailbox-utils: Add feature commands, device patrol scrub control and DDR5 ECS control features shiju.jose
2024-02-15 11:01 ` [PATCH v3 1/3] hw/cxl/cxl-mailbox-utils: Add support for feature commands (8.2.9.6) shiju.jose
2024-02-16 18:22 ` fan
2024-02-15 11:01 ` [PATCH v3 2/3] hw/cxl/cxl-mailbox-utils: Add device patrol scrub control feature shiju.jose
2024-02-16 18:27 ` fan
2024-02-15 11:01 ` shiju.jose [this message]
2024-02-16 18:30 ` [PATCH v3 3/3] hw/cxl/cxl-mailbox-utils: Add device DDR5 ECS " fan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240215110146.1444-4-shiju.jose@huawei.com \
--to=shiju.jose@huawei.com \
--cc=jonathan.cameron@huawei.com \
--cc=linux-cxl@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=prime.zeng@hisilicon.com \
--cc=qemu-devel@nongnu.org \
--cc=tanxiaofei@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox