From: Shiju Jose <shiju.j...@huawei.com> Memory sparing is defined as a repair function that replaces a portion of memory with a portion of functional memory at that same DPA. The subclasses for this operation vary in terms of the scope of the sparing being performed. The Cacheline sparing subclass refers to a sparing action that can replace a full cacheline. Row sparing is provided as an alternative to PPR sparing functions and its scope is that of a single DDR row. Bank sparing allows an entire bank to be replaced. Rank sparing is defined as an operation in which an entire DDR rank is replaced.
Memory sparing maintenance operations may be supported by CXL devices that implement CXL.mem protocol. A sparing maintenance operation requests the CXL device to perform a repair operation on its media. For example, a CXL device with DRAM components that support memory sparing features may implement sparing Maintenance operations. The host may issue a query command by setting Query Resources flag in the Input Payload (CXL Spec 3.2 Table 8-120) to determine availability of sparing resources for a given address. In response to a query request, the device shall report the resource availability by producing the Memory Sparing Event Record (CXL Spec 3.2 Table 8-60) in which the Channel, Rank, Nibble Mask, Bank Group, Bank, Row, Column, Sub-Channel fields are a copy of the values specified in the request. During the execution of a sparing maintenance operation, a CXL memory device: - May or may not retain data - May or may not be able to process CXL.mem requests correctly. These CXL memory device capabilities are specified by restriction flags in the memory sparing feature readable attributes. When a CXL device identifies error on a memory component, the device may inform the host about the need for a memory sparing maintenance operation by using DRAM event record, where the 'maintenance needed' flag may set. The event record contains some of the DPA, Channel, Rank, Nibble Mask, Bank Group, Bank, Row, Column, Sub-Channel fields that should be repaired. The userspace tool requests for maintenance operation if the 'maintenance needed' flag set in the CXL DRAM error record. CXL spec 3.2 section 8.2.10.7.2.3 describes the memory sparing feature discovery and configuration. CXL spec 3.2 section 8.2.10.7.1.4 describes the device's memory sparing maintenance operation feature. Add emulation for CXL memory device memory sparing control feature and memory sparing maintenance operation command. TODO: Following are the pending tasks, though not sure how to implement. 1. Add emulation for memory sparing maintenance operation. 2. On query, report memory sparing resource availability in a memory sparing event record if required in the future. Signed-off-by: Shiju Jose <shiju.j...@huawei.com> --- hw/cxl/cxl-mailbox-utils.c | 295 ++++++++++++++++++++++++++++++++++++ hw/mem/cxl_type3.c | 44 ++++++ include/hw/cxl/cxl_device.h | 40 +++++ 3 files changed, 379 insertions(+) diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c index 87c5df83b0..a97c0b2757 100644 --- a/hw/cxl/cxl-mailbox-utils.c +++ b/hw/cxl/cxl-mailbox-utils.c @@ -1243,6 +1243,10 @@ enum CXL_SUPPORTED_FEATURES_LIST { CXL_FEATURE_ECS, CXL_FEATURE_SPPR, CXL_FEATURE_HPPR, + CXL_FEATURE_CACHELINE_SPARING, + CXL_FEATURE_ROW_SPARING, + CXL_FEATURE_BANK_SPARING, + CXL_FEATURE_RANK_SPARING, CXL_FEATURE_MAX }; @@ -1331,6 +1335,35 @@ typedef struct CXLMemECSSetFeature { CXLMemECSWriteAttrs feat_data[]; } QEMU_PACKED QEMU_ALIGNED(16) CXLMemECSSetFeature; +/* + * CXL r3.2 section 8.2.10.7.2.3: + * Memory Sparing Features Discovery and Configuration + */ +static const QemuUUID cacheline_sparing_uuid = { + .data = UUID(0x96C33386, 0x91dd, 0x44c7, 0x9e, 0xcb, + 0xfd, 0xaf, 0x65, 0x03, 0xba, 0xc4) +}; + +static const QemuUUID row_sparing_uuid = { + .data = UUID(0x450ebf67, 0xb135, 0x4f97, 0xa4, 0x98, + 0xc2, 0xd5, 0x7f, 0x27, 0x9b, 0xed) +}; + +static const QemuUUID bank_sparing_uuid = { + .data = UUID(0x78b79636, 0x90ac, 0x4b64, 0xa4, 0xef, + 0xfa, 0xac, 0x5d, 0x18, 0xa8, 0x63) +}; + +static const QemuUUID rank_sparing_uuid = { + .data = UUID(0x34dbaff5, 0x0552, 0x4281, 0x8f, 0x76, + 0xda, 0x0b, 0x5e, 0x7a, 0x76, 0xa7) +}; + +typedef struct CXLMemSparingSetFeature { + CXLSetFeatureInHeader hdr; + CXLMemSparingWriteAttrs feat_data; +} QEMU_PACKED QEMU_ALIGNED(16) CXLMemSparingSetFeature; + /* 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, @@ -1431,6 +1464,70 @@ static CXLRetCode cmd_features_get_supported(const struct cxl_cmd *cmd, CXL_FEAT_ENTRY_SFE_CEL_VALID, }; break; + case CXL_FEATURE_CACHELINE_SPARING: + /* Fill supported feature entry for Cacheline Memory Sparing */ + get_feats_out->feat_entries[entry++] = + (struct CXLSupportedFeatureEntry) { + .uuid = cacheline_sparing_uuid, + .feat_index = index, + .get_feat_size = sizeof(CXLMemSparingReadAttrs), + .set_feat_size = sizeof(CXLMemSparingWriteAttrs), + .attr_flags = CXL_FEAT_ENTRY_ATTR_FLAG_CHANGABLE | + CXL_FEAT_ENTRY_ATTR_FLAG_SUPPORT_DEFAULT_SELECTION, + .get_feat_version = CXL_MEMDEV_SPARING_GET_FEATURE_VERSION, + .set_feat_version = CXL_MEMDEV_SPARING_SET_FEATURE_VERSION, + .set_feat_effects = CXL_FEAT_ENTRY_SFE_IMMEDIATE_CONFIG_CHANGE | + CXL_FEAT_ENTRY_SFE_CEL_VALID, + }; + break; + case CXL_FEATURE_ROW_SPARING: + /* Fill supported feature entry for Row Memory Sparing */ + get_feats_out->feat_entries[entry++] = + (struct CXLSupportedFeatureEntry) { + .uuid = row_sparing_uuid, + .feat_index = index, + .get_feat_size = sizeof(CXLMemSparingReadAttrs), + .set_feat_size = sizeof(CXLMemSparingWriteAttrs), + .attr_flags = CXL_FEAT_ENTRY_ATTR_FLAG_CHANGABLE | + CXL_FEAT_ENTRY_ATTR_FLAG_SUPPORT_DEFAULT_SELECTION, + .get_feat_version = CXL_MEMDEV_SPARING_GET_FEATURE_VERSION, + .set_feat_version = CXL_MEMDEV_SPARING_SET_FEATURE_VERSION, + .set_feat_effects = CXL_FEAT_ENTRY_SFE_IMMEDIATE_CONFIG_CHANGE | + CXL_FEAT_ENTRY_SFE_CEL_VALID, + }; + break; + case CXL_FEATURE_BANK_SPARING: + /* Fill supported feature entry for Bank Memory Sparing */ + get_feats_out->feat_entries[entry++] = + (struct CXLSupportedFeatureEntry) { + .uuid = bank_sparing_uuid, + .feat_index = index, + .get_feat_size = sizeof(CXLMemSparingReadAttrs), + .set_feat_size = sizeof(CXLMemSparingWriteAttrs), + .attr_flags = CXL_FEAT_ENTRY_ATTR_FLAG_CHANGABLE | + CXL_FEAT_ENTRY_ATTR_FLAG_SUPPORT_DEFAULT_SELECTION, + .get_feat_version = CXL_MEMDEV_SPARING_GET_FEATURE_VERSION, + .set_feat_version = CXL_MEMDEV_SPARING_SET_FEATURE_VERSION, + .set_feat_effects = CXL_FEAT_ENTRY_SFE_IMMEDIATE_CONFIG_CHANGE | + CXL_FEAT_ENTRY_SFE_CEL_VALID, + }; + break; + case CXL_FEATURE_RANK_SPARING: + /* Fill supported feature entry for Rank Memory Sparing */ + get_feats_out->feat_entries[entry++] = + (struct CXLSupportedFeatureEntry) { + .uuid = rank_sparing_uuid, + .feat_index = index, + .get_feat_size = sizeof(CXLMemSparingReadAttrs), + .set_feat_size = sizeof(CXLMemSparingWriteAttrs), + .attr_flags = CXL_FEAT_ENTRY_ATTR_FLAG_CHANGABLE | + CXL_FEAT_ENTRY_ATTR_FLAG_SUPPORT_DEFAULT_SELECTION, + .get_feat_version = CXL_MEMDEV_SPARING_GET_FEATURE_VERSION, + .set_feat_version = CXL_MEMDEV_SPARING_SET_FEATURE_VERSION, + .set_feat_effects = CXL_FEAT_ENTRY_SFE_IMMEDIATE_CONFIG_CHANGE | + CXL_FEAT_ENTRY_SFE_CEL_VALID, + }; + break; default: __builtin_unreachable(); } @@ -1519,6 +1616,47 @@ static CXLRetCode cmd_features_get_feature(const struct cxl_cmd *cmd, memcpy(payload_out, (uint8_t *)&ct3d->hard_ppr_attrs + get_feature->offset, bytes_to_copy); + } else if (qemu_uuid_is_equal(&get_feature->uuid, + &cacheline_sparing_uuid)) { + if (get_feature->offset >= sizeof(CXLMemSparingReadAttrs)) { + return CXL_MBOX_INVALID_INPUT; + } + bytes_to_copy = sizeof(CXLMemSparingReadAttrs) - + get_feature->offset; + bytes_to_copy = MIN(bytes_to_copy, get_feature->count); + memcpy(payload_out, + (uint8_t *)&ct3d->cacheline_sparing_attrs + get_feature->offset, + bytes_to_copy); + } else if (qemu_uuid_is_equal(&get_feature->uuid, &row_sparing_uuid)) { + if (get_feature->offset >= sizeof(CXLMemSparingReadAttrs)) { + return CXL_MBOX_INVALID_INPUT; + } + bytes_to_copy = sizeof(CXLMemSparingReadAttrs) - + get_feature->offset; + bytes_to_copy = MIN(bytes_to_copy, get_feature->count); + memcpy(payload_out, + (uint8_t *)&ct3d->row_sparing_attrs + get_feature->offset, + bytes_to_copy); + } else if (qemu_uuid_is_equal(&get_feature->uuid, &bank_sparing_uuid)) { + if (get_feature->offset >= sizeof(CXLMemSparingReadAttrs)) { + return CXL_MBOX_INVALID_INPUT; + } + bytes_to_copy = sizeof(CXLMemSparingReadAttrs) - + get_feature->offset; + bytes_to_copy = MIN(bytes_to_copy, get_feature->count); + memcpy(payload_out, + (uint8_t *)&ct3d->bank_sparing_attrs + get_feature->offset, + bytes_to_copy); + } else if (qemu_uuid_is_equal(&get_feature->uuid, &rank_sparing_uuid)) { + if (get_feature->offset >= sizeof(CXLMemSparingReadAttrs)) { + return CXL_MBOX_INVALID_INPUT; + } + bytes_to_copy = sizeof(CXLMemSparingReadAttrs) - + get_feature->offset; + bytes_to_copy = MIN(bytes_to_copy, get_feature->count); + memcpy(payload_out, + (uint8_t *)&ct3d->rank_sparing_attrs + get_feature->offset, + bytes_to_copy); } else { return CXL_MBOX_UNSUPPORTED; } @@ -1666,6 +1804,78 @@ static CXLRetCode cmd_features_set_feature(const struct cxl_cmd *cmd, ct3d->hard_ppr_attrs.op_mode = ct3d->hard_ppr_wr_attrs.op_mode; ct3d->hard_ppr_attrs.hppr_op_mode = ct3d->hard_ppr_wr_attrs.hppr_op_mode; } + } else if (qemu_uuid_is_equal(&hdr->uuid, &cacheline_sparing_uuid)) { + if (hdr->version != CXL_MEMDEV_SPARING_SET_FEATURE_VERSION) { + return CXL_MBOX_UNSUPPORTED; + } + + CXLMemSparingSetFeature *mem_sparing_set_feature = (void *)payload_in; + CXLMemSparingWriteAttrs *mem_sparing_write_attrs = + &mem_sparing_set_feature->feat_data; + memcpy((uint8_t *)&ct3d->cacheline_sparing_wr_attrs + hdr->offset, + mem_sparing_write_attrs, + bytes_to_copy); + set_feat_info->data_size += bytes_to_copy; + + if (data_transfer_flag == CXL_SET_FEATURE_FLAG_FULL_DATA_TRANSFER || + data_transfer_flag == CXL_SET_FEATURE_FLAG_FINISH_DATA_TRANSFER) { + ct3d->cacheline_sparing_attrs.op_mode = + ct3d->cacheline_sparing_wr_attrs.op_mode; + } + } else if (qemu_uuid_is_equal(&hdr->uuid, &row_sparing_uuid)) { + if (hdr->version != CXL_MEMDEV_SPARING_SET_FEATURE_VERSION) { + return CXL_MBOX_UNSUPPORTED; + } + + CXLMemSparingSetFeature *mem_sparing_set_feature = (void *)payload_in; + CXLMemSparingWriteAttrs *mem_sparing_write_attrs = + &mem_sparing_set_feature->feat_data; + memcpy((uint8_t *)&ct3d->row_sparing_wr_attrs + hdr->offset, + mem_sparing_write_attrs, + bytes_to_copy); + set_feat_info->data_size += bytes_to_copy; + + if (data_transfer_flag == CXL_SET_FEATURE_FLAG_FULL_DATA_TRANSFER || + data_transfer_flag == CXL_SET_FEATURE_FLAG_FINISH_DATA_TRANSFER) { + ct3d->row_sparing_attrs.op_mode = + ct3d->row_sparing_wr_attrs.op_mode; + } + } else if (qemu_uuid_is_equal(&hdr->uuid, &bank_sparing_uuid)) { + if (hdr->version != CXL_MEMDEV_SPARING_SET_FEATURE_VERSION) { + return CXL_MBOX_UNSUPPORTED; + } + + CXLMemSparingSetFeature *mem_sparing_set_feature = (void *)payload_in; + CXLMemSparingWriteAttrs *mem_sparing_write_attrs = + &mem_sparing_set_feature->feat_data; + memcpy((uint8_t *)&ct3d->bank_sparing_wr_attrs + hdr->offset, + mem_sparing_write_attrs, + bytes_to_copy); + set_feat_info->data_size += bytes_to_copy; + + if (data_transfer_flag == CXL_SET_FEATURE_FLAG_FULL_DATA_TRANSFER || + data_transfer_flag == CXL_SET_FEATURE_FLAG_FINISH_DATA_TRANSFER) { + ct3d->bank_sparing_attrs.op_mode = + ct3d->bank_sparing_wr_attrs.op_mode; + } + } else if (qemu_uuid_is_equal(&hdr->uuid, &rank_sparing_uuid)) { + if (hdr->version != CXL_MEMDEV_SPARING_SET_FEATURE_VERSION) { + return CXL_MBOX_UNSUPPORTED; + } + + CXLMemSparingSetFeature *mem_sparing_set_feature = (void *)payload_in; + CXLMemSparingWriteAttrs *mem_sparing_write_attrs = + &mem_sparing_set_feature->feat_data; + memcpy((uint8_t *)&ct3d->rank_sparing_wr_attrs + hdr->offset, + mem_sparing_write_attrs, + bytes_to_copy); + set_feat_info->data_size += bytes_to_copy; + + if (data_transfer_flag == CXL_SET_FEATURE_FLAG_FULL_DATA_TRANSFER || + data_transfer_flag == CXL_SET_FEATURE_FLAG_FINISH_DATA_TRANSFER) { + ct3d->rank_sparing_attrs.op_mode = + ct3d->rank_sparing_wr_attrs.op_mode; + } } else { return CXL_MBOX_UNSUPPORTED; } @@ -1682,6 +1892,15 @@ static CXLRetCode cmd_features_set_feature(const struct cxl_cmd *cmd, memset(&ct3d->soft_ppr_wr_attrs, 0, set_feat_info->data_size); } else if (qemu_uuid_is_equal(&hdr->uuid, &hard_ppr_uuid)) { memset(&ct3d->hard_ppr_wr_attrs, 0, set_feat_info->data_size); + } else if (qemu_uuid_is_equal(&hdr->uuid, &cacheline_sparing_uuid)) { + memset(&ct3d->cacheline_sparing_wr_attrs, 0, + set_feat_info->data_size); + } else if (qemu_uuid_is_equal(&hdr->uuid, &row_sparing_uuid)) { + memset(&ct3d->row_sparing_wr_attrs, 0, set_feat_info->data_size); + } else if (qemu_uuid_is_equal(&hdr->uuid, &bank_sparing_uuid)) { + memset(&ct3d->bank_sparing_wr_attrs, 0, set_feat_info->data_size); + } else if (qemu_uuid_is_equal(&hdr->uuid, &rank_sparing_uuid)) { + memset(&ct3d->rank_sparing_wr_attrs, 0, set_feat_info->data_size); } set_feat_info->data_transfer_flag = 0; @@ -1707,8 +1926,64 @@ static void cxl_perform_ppr(CXLType3Dev *ct3d, uint64_t dpa) /* TODO: produce a Memory Sparing Event Record */ } +typedef struct CXLMemSparingMaintInPayload { + uint8_t flags; + uint8_t channel; + uint8_t rank; + uint8_t nibble_mask[3]; + uint8_t bank_group; + uint8_t bank; + uint8_t row[3]; + uint16_t column; + uint8_t sub_channel; +} QEMU_PACKED CXLMemSparingMaintInPayload; + +static CXLRetCode cxl_perform_mem_sparing(CXLType3Dev *ct3d, uint8_t sub_class, + void *maint_pi) +{ + CXLMemSparingMaintInPayload *sparing_maint_pi = (void *)maint_pi; + + qemu_log_mask(LOG_UNIMP, "Memory Sparing Maintenance Input Payload...\n"); + qemu_log_mask(LOG_UNIMP, "flags = %u\n", sparing_maint_pi->flags); + qemu_log_mask(LOG_UNIMP, "channel= %u\n", sparing_maint_pi->channel); + qemu_log_mask(LOG_UNIMP, "rank = %u\n", sparing_maint_pi->rank); + qemu_log_mask(LOG_UNIMP, "nibble_mask[0] = 0x%x\n", + sparing_maint_pi->nibble_mask[0]); + qemu_log_mask(LOG_UNIMP, "nibble_mask[1] = 0x%x\n", + sparing_maint_pi->nibble_mask[1]); + qemu_log_mask(LOG_UNIMP, "nibble_mask[2] = 0x%x\n", + sparing_maint_pi->nibble_mask[2]); + qemu_log_mask(LOG_UNIMP, "bank_group = %u\n", + sparing_maint_pi->bank_group); + qemu_log_mask(LOG_UNIMP, "bank = %u\n", sparing_maint_pi->bank); + qemu_log_mask(LOG_UNIMP, "row[0] = 0x%x\n", sparing_maint_pi->row[0]); + qemu_log_mask(LOG_UNIMP, "row[1] = 0x%x\n", sparing_maint_pi->row[1]); + qemu_log_mask(LOG_UNIMP, "row[2] = 0x%x\n", sparing_maint_pi->row[2]); + qemu_log_mask(LOG_UNIMP, "column = %u\n", sparing_maint_pi->column); + qemu_log_mask(LOG_UNIMP, "sub_channel = %u\n", + sparing_maint_pi->sub_channel); + + switch (sub_class) { + case 0: /* Cacheline Memory Sparing */ + qemu_log("Cacheline Memory Sparing\n"); + return CXL_MBOX_SUCCESS; + case 1: /* Row Memory Sparing */ + qemu_log("Row Memory Sparing\n"); + return CXL_MBOX_SUCCESS; + case 2: /* Bank Memory Sparing */ + qemu_log("Bank Memory Sparing\n"); + return CXL_MBOX_SUCCESS; + case 3: /* Rank Memory Sparing */ + qemu_log("Rank Memory Sparing\n"); + return CXL_MBOX_SUCCESS; + default: + return CXL_MBOX_UNSUPPORTED; + } +} + /* CXL r3.2 section 8.2.10.7.1 - Perform Maintenance (Opcode 0600h) */ #define MAINTENANCE_PPR_QUERY_RESOURCES BIT(0) +#define MAINTENANCE_MEM_SPARING_QUERY_RESOURCES BIT(0) static CXLRetCode cmd_media_perform_maintenance(const struct cxl_cmd *cmd, uint8_t *payload_in, size_t len_in, @@ -1724,6 +1999,7 @@ static CXLRetCode cmd_media_perform_maintenance(const struct cxl_cmd *cmd, uint64_t dpa; uint8_t nibble_mask[3]; } QEMU_PACKED ppr; + CXLMemSparingMaintInPayload mem_sparing_pi; }; } QEMU_PACKED *maint_in = (void *)payload_in; CXLType3Dev *ct3d = CXL_TYPE3(cci->d); @@ -1750,6 +2026,25 @@ static CXLRetCode cmd_media_perform_maintenance(const struct cxl_cmd *cmd, } break; case 2: + if (maint_in->ppr.flags & MAINTENANCE_MEM_SPARING_QUERY_RESOURCES) { + /* + * CXL r3.2 sect 8.2.10.7.1.4 - Memory Sparing Maintenance Operation + * TODO: Produce Memory Sparing Event record to report resource + * availability if needed. Not sure how to support this. + */ + return CXL_MBOX_SUCCESS; + } + + switch (maint_in->subclass) { + case 0: /* Cacheline Memory Sparing */ + case 1: /* Row Memory Sparing */ + case 2: /* Bank Memory Sparing */ + case 3: /* Rank Memory Sparing */ + return cxl_perform_mem_sparing(ct3d, maint_in->subclass, + &maint_in->mem_sparing_pi); + default: + return CXL_MBOX_INVALID_INPUT; + } case 3: return CXL_MBOX_UNSUPPORTED; default: diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c index 965ad3402d..b1bafd6c67 100644 --- a/hw/mem/cxl_type3.c +++ b/hw/mem/cxl_type3.c @@ -1229,6 +1229,50 @@ void ct3_realize(PCIDevice *pci_dev, Error **errp) .hppr_op_mode = 0 }; + /* Set default value for Cacheline Memory Sparing attributes */ + ct3d->cacheline_sparing_attrs = (CXLMemSparingReadAttrs) { + .max_maint_latency = 0x5, /* 100 ms */ + .op_caps = 0, /* require host involvement */ + .op_mode = 0, + .maint_op_class = CXL_MEMDEV_SPARING_MAINT_CLASS, + .maint_op_subclass = CXL_MEMDEV_CACHELINE_SPARING_MAINT_SUBCLASS, + .restriction_flags = CXL_MEMDEV_HARD_SPARING_SUPPORT_FLAG | + CXL_MEMDEV_SOFT_SPARING_SUPPORT_FLAG, + }; + + /* Set default value for Row Memory Sparing attributes */ + ct3d->row_sparing_attrs = (CXLMemSparingReadAttrs) { + .max_maint_latency = 0x5, /* 100 ms */ + .op_caps = 0, /* require host involvement */ + .op_mode = 0, + .maint_op_class = CXL_MEMDEV_SPARING_MAINT_CLASS, + .maint_op_subclass = CXL_MEMDEV_ROW_SPARING_MAINT_SUBCLASS, + .restriction_flags = CXL_MEMDEV_HARD_SPARING_SUPPORT_FLAG | + CXL_MEMDEV_SOFT_SPARING_SUPPORT_FLAG, + }; + + /* Set default value for Bank Memory Sparing attributes */ + ct3d->bank_sparing_attrs = (CXLMemSparingReadAttrs) { + .max_maint_latency = 0x5, /* 100 ms */ + .op_caps = 0, /* require host involvement */ + .op_mode = 0, + .maint_op_class = CXL_MEMDEV_SPARING_MAINT_CLASS, + .maint_op_subclass = CXL_MEMDEV_BANK_SPARING_MAINT_SUBCLASS, + .restriction_flags = CXL_MEMDEV_HARD_SPARING_SUPPORT_FLAG | + CXL_MEMDEV_SOFT_SPARING_SUPPORT_FLAG, + }; + + /* Set default value for Rank Memory Sparing attributes */ + ct3d->rank_sparing_attrs = (CXLMemSparingReadAttrs) { + .max_maint_latency = 0x5, /* 100 ms */ + .op_caps = 0, /* require host involvement */ + .op_mode = 0, + .maint_op_class = CXL_MEMDEV_SPARING_MAINT_CLASS, + .maint_op_subclass = CXL_MEMDEV_RANK_SPARING_MAINT_SUBCLASS, + .restriction_flags = CXL_MEMDEV_HARD_SPARING_SUPPORT_FLAG | + CXL_MEMDEV_SOFT_SPARING_SUPPORT_FLAG, + }; + return; err_release_cdat: diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h index b0e13b02b5..34614792a3 100644 --- a/include/hw/cxl/cxl_device.h +++ b/include/hw/cxl/cxl_device.h @@ -645,6 +645,37 @@ typedef struct CXLMemECSWriteAttrs { CXLMemECSFRUWriteAttrs fru_attrs[CXL_ECS_NUM_MEDIA_FRUS]; } QEMU_PACKED CXLMemECSWriteAttrs; +/* CXL Memory Sparing Repair control attributes */ +#define CXL_MEMDEV_SPARING_MAINT_CLASS 0x2 +#define CXL_MEMDEV_CACHELINE_SPARING_MAINT_SUBCLASS 0x0 +#define CXL_MEMDEV_ROW_SPARING_MAINT_SUBCLASS 0x1 +#define CXL_MEMDEV_BANK_SPARING_MAINT_SUBCLASS 0x2 +#define CXL_MEMDEV_RANK_SPARING_MAINT_SUBCLASS 0x3 + +/* + * CXL r3.2 section 8.2.10.7.2.3, Table 8-134 and 8-135: + * Memory Sparing Feature Readable/Writable Attributes + */ +typedef struct CXLMemSparingReadAttrs { + uint8_t max_maint_latency; + uint16_t op_caps; + uint16_t op_mode; + uint8_t maint_op_class; + uint8_t maint_op_subclass; + uint8_t rsvd[10]; + uint16_t restriction_flags; +} QEMU_PACKED CXLMemSparingReadAttrs; + +typedef struct CXLMemSparingWriteAttrs { + uint16_t op_mode; +} QEMU_PACKED CXLMemSparingWriteAttrs; + +#define CXL_MEMDEV_SPARING_GET_FEATURE_VERSION 0x01 +#define CXL_MEMDEV_SPARING_SET_FEATURE_VERSION 0x01 +#define CXL_MEMDEV_SPARING_SAFE_IN_USE_FLAG BIT(0) +#define CXL_MEMDEV_HARD_SPARING_SUPPORT_FLAG BIT(1) +#define CXL_MEMDEV_SOFT_SPARING_SUPPORT_FLAG BIT(2) + #define DCD_MAX_NUM_REGION 8 typedef struct CXLDCExtentRaw { @@ -792,6 +823,15 @@ struct CXLType3Dev { /* ECS control attributes */ CXLMemECSReadAttrs ecs_attrs; CXLMemECSWriteAttrs ecs_wr_attrs; + /* Memory Sparing control attributes */ + CXLMemSparingReadAttrs cacheline_sparing_attrs; + CXLMemSparingWriteAttrs cacheline_sparing_wr_attrs; + CXLMemSparingReadAttrs row_sparing_attrs; + CXLMemSparingWriteAttrs row_sparing_wr_attrs; + CXLMemSparingReadAttrs bank_sparing_attrs; + CXLMemSparingWriteAttrs bank_sparing_wr_attrs; + CXLMemSparingReadAttrs rank_sparing_attrs; + CXLMemSparingWriteAttrs rank_sparing_wr_attrs; struct dynamic_capacity { HostMemoryBackend *host_dc; -- 2.43.0