1)get alert configuration(Opcode 4201h) 2)set alert configuration(Opcode 4202h)
This v2 patch addresses the feedback from the v1 patch and include some minor new changes. Changes in V2: - Removed cover letter as it's a single patch - Added latest spec reference - Fixed alignment issues - Updated shorter variable names to be more descriptive - Replaced field-by-field initialization in 'init_alert_config' with structured initialization for improved readability. - Replaced bit fields with 'uint8_t' and added defines for individual bits. The patch is generated against the Johnathan's tree https://gitlab.com/jic23/qemu.git and branch cxl-2024-11-27. Signed-off-by: Sweta Kumari <s5.kum...@samsung.com> --- hw/cxl/cxl-mailbox-utils.c | 116 ++++++++++++++++++++++++++++++++++++ hw/mem/cxl_type3.c | 16 +++++ include/hw/cxl/cxl_device.h | 15 +++++ 3 files changed, 147 insertions(+) diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c index 9c7ea5bc35..105c63fdec 100644 --- a/hw/cxl/cxl-mailbox-utils.c +++ b/hw/cxl/cxl-mailbox-utils.c @@ -28,6 +28,11 @@ #define CXL_DC_EVENT_LOG_SIZE 8 #define CXL_NUM_EXTENTS_SUPPORTED 512 #define CXL_NUM_TAGS_SUPPORTED 0 +#define CXL_ALERTS_LIFE_USED_WARNING_THRESHOLD (1 << 0) +#define CXL_ALERTS_DEVICE_OVER_TEMP_WARNING_THRESHOLD (1 << 1) +#define CXL_ALERTS_DEVICE_UNDER_TEMP_WARNING_THRESHOLD (1 << 2) +#define CXL_ALERTS_CORRECTED_VOLATILE_MEMORY_ERROR_WARNING_THRESHOLD (1 << 3) +#define CXL_ALERTS_CORRECTED_PERSISTENT_MEMORY_ERROR_WARNING_THRESHOLD (1 << 4) /* * How to add a new command, example. The command set FOO, with cmd BAR. @@ -86,6 +91,9 @@ enum { #define GET_PARTITION_INFO 0x0 #define GET_LSA 0x2 #define SET_LSA 0x3 + HEALTH_INFO_ALERTS = 0x42, + #define GET_ALERT_CONFIGURATION 0x1 + #define SET_ALERT_CONFIGURATION 0x2 SANITIZE = 0x44, #define OVERWRITE 0x0 #define SECURE_ERASE 0x1 @@ -1625,6 +1633,110 @@ static CXLRetCode cmd_ccls_set_lsa(const struct cxl_cmd *cmd, return CXL_MBOX_SUCCESS; } +/* CXL r3.2 Section 8.2.10.9.3.2 Get Alert Configuration (Opcode 4201h) */ +static CXLRetCode cmd_get_alert_config(const struct cxl_cmd *cmd, + uint8_t *payload_in, + size_t len_in, + uint8_t *payload_out, + size_t *len_out, + CXLCCI *cci) +{ + CXLType3Dev *ct3d = CXL_TYPE3(cci->d); + CXLAlertConfig *out = (void *)payload_out; + + memcpy(out, &ct3d->alert_config, sizeof(ct3d->alert_config)); + *len_out = sizeof(ct3d->alert_config); + + return CXL_MBOX_SUCCESS; +} + +/* CXL r3.2 Section 8.2.10.9.3.3 Set Alert Configuration (Opcode 4202h) */ +static CXLRetCode cmd_set_alert_config(const struct cxl_cmd *cmd, + uint8_t *payload_in, + size_t len_in, + uint8_t *payload_out, + size_t *len_out, + CXLCCI *cci) +{ + CXLType3Dev *ct3d = CXL_TYPE3(cci->d); + CXLAlertConfig *alert_config = &ct3d->alert_config; + struct { + uint8_t valid_alert_actions; + uint8_t enable_alert_actions; + uint8_t life_used_warning_threshold; + uint8_t rsvd; + uint16_t device_over_temperature_warning_threshold; + uint16_t device_under_temperature_warning_threshold; + uint16_t Corrected_volatile_memory_error_warning_threshold; + uint16_t Corrected_persistent_memory_error_warning_threshold; + } QEMU_PACKED *in = (void *)payload_in; + + if (in->valid_alert_actions & CXL_ALERTS_LIFE_USED_WARNING_THRESHOLD) { + /* + * CXL 3.2 Table 8-149 The life used warning threshold shall be + * less than the life used critical alert value. + */ + if (in->life_used_warning_threshold >= + alert_config->life_used_critical_alert_threshold) { + return CXL_MBOX_INVALID_INPUT; + } + alert_config->life_used_warning_threshold = + in->life_used_warning_threshold; + alert_config->enable_alerts |= CXL_ALERTS_LIFE_USED_WARNING_THRESHOLD; + } + + if (in->valid_alert_actions & + CXL_ALERTS_DEVICE_OVER_TEMP_WARNING_THRESHOLD) { + /* + * CXL 3.2 Table 8-149 The Device Over-Temperature Warning Threshold + * shall be less than the the Device Over-Temperature Critical + * Alert Threshold. + */ + if (in->device_over_temperature_warning_threshold >= + alert_config->device_over_temperature_critical_alert_threshold) { + return CXL_MBOX_INVALID_INPUT; + } + alert_config->device_over_temperature_warning_threshold = + in->device_over_temperature_warning_threshold; + alert_config->enable_alerts |= + CXL_ALERTS_DEVICE_OVER_TEMP_WARNING_THRESHOLD; + } + + if (in->valid_alert_actions & + CXL_ALERTS_DEVICE_UNDER_TEMP_WARNING_THRESHOLD) { + /* + * CXL 3.2 Table 8-149 The Device Under-Temperature Warning Threshold + * shall be higher than the the Device Under-Temperature Critical + * Alert Threshold. + */ + if (in->device_under_temperature_warning_threshold <= + alert_config->device_under_temperature_critical_alert_threshold) { + return CXL_MBOX_INVALID_INPUT; + } + alert_config->device_under_temperature_warning_threshold = + in->device_under_temperature_warning_threshold; + alert_config->enable_alerts |= + CXL_ALERTS_DEVICE_UNDER_TEMP_WARNING_THRESHOLD; + } + + if (in->valid_alert_actions & + CXL_ALERTS_CORRECTED_VOLATILE_MEMORY_ERROR_WARNING_THRESHOLD) { + alert_config->Corrected_volatile_memory_error_warning_threshold = + in->Corrected_volatile_memory_error_warning_threshold; + alert_config->enable_alerts |= + CXL_ALERTS_CORRECTED_VOLATILE_MEMORY_ERROR_WARNING_THRESHOLD; + } + + if (in->valid_alert_actions & + CXL_ALERTS_CORRECTED_PERSISTENT_MEMORY_ERROR_WARNING_THRESHOLD) { + alert_config->Corrected_persistent_memory_error_warning_threshold = + in->Corrected_persistent_memory_error_warning_threshold; + alert_config->enable_alerts |= + CXL_ALERTS_CORRECTED_PERSISTENT_MEMORY_ERROR_WARNING_THRESHOLD; + } + return CXL_MBOX_SUCCESS; +} + /* Perform the actual device zeroing */ static void __do_sanitization(CXLType3Dev *ct3d) { @@ -2859,6 +2971,10 @@ static const struct cxl_cmd cxl_cmd_set[256][256] = { [CCLS][GET_LSA] = { "CCLS_GET_LSA", cmd_ccls_get_lsa, 8, 0 }, [CCLS][SET_LSA] = { "CCLS_SET_LSA", cmd_ccls_set_lsa, ~0, CXL_MBOX_IMMEDIATE_CONFIG_CHANGE | CXL_MBOX_IMMEDIATE_DATA_CHANGE }, + [HEALTH_INFO_ALERTS][GET_ALERT_CONFIGURATION] = {"GET_ALERT_CONFIGURATION", + cmd_get_alert_config, 0, 0 }, + [HEALTH_INFO_ALERTS][SET_ALERT_CONFIGURATION] = {"SET_ALERT_CONFIGURATION", + cmd_set_alert_config, 12, CXL_MBOX_IMMEDIATE_POLICY_CHANGE }, [SANITIZE][OVERWRITE] = { "SANITIZE_OVERWRITE", cmd_sanitize_overwrite, 0, (CXL_MBOX_IMMEDIATE_DATA_CHANGE | CXL_MBOX_SECURITY_STATE_CHANGE | diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c index 5f365afb4d..5f01684ffc 100644 --- a/hw/mem/cxl_type3.c +++ b/hw/mem/cxl_type3.c @@ -956,6 +956,21 @@ static DOEProtocol doe_comp_prot[] = { { } }; +/* + * Initialize CXL device alerts with default threshold values. + */ +static void init_alert_config(CXLType3Dev *ct3d) +{ + ct3d->alert_config = (CXLAlertConfig) { + .life_used_critical_alert_threshold = 75, + .life_used_warning_threshold = 40, + .device_over_temperature_critical_alert_threshold = 35, + .device_under_temperature_critical_alert_threshold = 10, + .device_over_temperature_warning_threshold = 25, + .device_under_temperature_warning_threshold = 20 + }; +} + void ct3_realize(PCIDevice *pci_dev, Error **errp) { ERRP_GUARD(); @@ -1030,6 +1045,7 @@ void ct3_realize(PCIDevice *pci_dev, Error **errp) goto err_free_special_ops; } + init_alert_config(ct3d); pcie_cap_deverr_init(pci_dev); /* Leave a bit of room for expansion */ rc = pcie_aer_init(pci_dev, PCI_ERR_VER, 0x200, PCI_ERR_SIZEOF, NULL); diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h index a64739be25..1da23bf553 100644 --- a/include/hw/cxl/cxl_device.h +++ b/include/hw/cxl/cxl_device.h @@ -581,6 +581,19 @@ typedef struct CXLSetFeatureInfo { size_t data_size; } CXLSetFeatureInfo; +typedef struct CXLAlertConfig { + uint8_t valid_alerts; + uint8_t enable_alerts; + uint8_t life_used_critical_alert_threshold; + uint8_t life_used_warning_threshold; + uint16_t device_over_temperature_critical_alert_threshold; + uint16_t device_under_temperature_critical_alert_threshold; + uint16_t device_over_temperature_warning_threshold; + uint16_t device_under_temperature_warning_threshold; + uint16_t Corrected_volatile_memory_error_warning_threshold; + uint16_t Corrected_persistent_memory_error_warning_threshold; +} QEMU_PACKED CXLAlertConfig; + struct CXLType3Dev { /* Private */ PCIDevice parent_obj; @@ -605,6 +618,8 @@ struct CXLType3Dev { CXLCCI vdm_fm_owned_ld_mctp_cci; CXLCCI ld0_cci; + CXLAlertConfig alert_config; + /* PCIe link characteristics */ PCIExpLinkSpeed speed; PCIExpLinkWidth width; -- 2.34.1
