riscv
/
qemu
mirror of https://gitea.goldendeliverer.com/riscv/qemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

hw/cxl/events: Updates for rev3.2 DRAM event record 

CXL spec rev3.2 section 8.2.10.2.1.2 Table 8-58, DRAM event record
has updated with following new fields.
1. Component Identifier
2. Sub-channel of the memory event location
3. Advanced Programmable Corrected Memory Error Threshold Event Flags
4. Corrected Volatile Memory Error Count at Event
5. Memory Event Sub-Type

Add updates for the above spec changes in the CXL DRAM event
reporting and QMP command to inject DRAM event.

In order to ensure consistency update all specification references
for this command to CXL r3.2.

Signed-off-by: Shiju Jose <shiju.jose@huawei.com>
Acked-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20260205112350.60681-5-Jonathan.Cameron@huawei.com>
master
Shiju Jose 6 months ago
committed by Michael S. Tsirkin
parent
1aa989a176
commit
94976b8631
4 changed files with 83 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      hw/mem/cxl_type3.c
  2. 7
      hw/mem/cxl_type3_stubs.c
  3. 9
      include/hw/cxl/cxl_events.h
  4. 33
      qapi/cxl.json

44
hw/mem/cxl_type3.c
View File

@ -1783,6 +1783,13 @@ void qmp_cxl_inject_general_media_event(const char *path, CxlEventLog log,
#define CXL_DRAM_VALID_ROW BIT(5)
#define CXL_DRAM_VALID_COLUMN BIT(6)
#define CXL_DRAM_VALID_CORRECTION_MASK BIT(7)
#define CXL_DRAM_VALID_COMPONENT BIT(8)
#define CXL_DRAM_VALID_COMPONENT_ID_FORMAT BIT(9)
#define CXL_DRAM_VALID_SUB_CHANNEL BIT(10)
#define CXL_DRAM_EV_DESC_UCE BIT(0)
#define CXL_DRAM_EV_DESC_THRESHOLD_EVENT BIT(1)
#define CXL_DRAM_EV_DESC_POISON_LIST_OVERFLOW_EVENT BIT(2)
void qmp_cxl_inject_dram_event(const char *path, CxlEventLog log,
uint32_t flags,
@ -1802,6 +1809,12 @@ void qmp_cxl_inject_dram_event(const char *path, CxlEventLog log,
bool has_column, uint16_t column,
bool has_correction_mask,
uint64List *correction_mask,
const char *component_id,
bool has_comp_id_pldm, bool is_comp_id_pldm,
bool has_sub_channel, uint8_t sub_channel,
bool has_cme_ev_flags, uint8_t cme_ev_flags,
bool has_cvme_count, uint32_t cvme_count,
uint8_t sub_type,
Error **errp)
{
Object *obj = object_resolve_path(path, NULL);
@ -1838,7 +1851,6 @@ void qmp_cxl_inject_dram_event(const char *path, CxlEventLog log,
has_maint_op_subclass, maint_op_subclass,
has_ld_id, ld_id, has_head_id, head_id);
stq_le_p(&dram.phys_addr, dpa);
dram.descriptor = descriptor;
dram.type = type;
dram.transaction_type = transaction_type;
@ -1888,6 +1900,36 @@ void qmp_cxl_inject_dram_event(const char *path, CxlEventLog log,
valid_flags |= CXL_DRAM_VALID_CORRECTION_MASK;
}
if (component_id) {
strncpy((char *)dram.component_id, component_id,
sizeof(dram.component_id) - 1);
valid_flags |= CXL_DRAM_VALID_COMPONENT;
if (has_comp_id_pldm && is_comp_id_pldm) {
valid_flags |= CXL_DRAM_VALID_COMPONENT_ID_FORMAT;
}
}
if (has_sub_channel) {
dram.sub_channel = sub_channel;
valid_flags |= CXL_DRAM_VALID_SUB_CHANNEL;
}
if (has_cme_ev_flags) {
dram.cme_ev_flags = cme_ev_flags;
} else {
dram.cme_ev_flags = 0;
}
if (has_cvme_count) {
descriptor |= CXL_DRAM_EV_DESC_THRESHOLD_EVENT;
st24_le_p(dram.cvme_count, cvme_count);
} else {
st24_le_p(dram.cvme_count, 0);
}
dram.descriptor = descriptor;
dram.sub_type = sub_type;
stw_le_p(&dram.validity_flags, valid_flags);
if (cxl_event_insert(cxlds, enc_log, (CXLEventRecordRaw *)&dram)) {

7
hw/mem/cxl_type3_stubs.c
View File

@ -53,6 +53,13 @@ void qmp_cxl_inject_dram_event(const char *path, CxlEventLog log,
bool has_column, uint16_t column,
bool has_correction_mask,
uint64List *correction_mask,
const char *component_id,
bool has_comp_id_pldm,
bool is_comp_id_pldm,
bool has_sub_channel, uint8_t sub_channel,
bool has_cme_ev_flags, uint8_t cme_ev_flags,
bool has_cvme_count, uint32_t cvme_count,
uint8_t sub_type,
Error **errp) {}
void qmp_cxl_inject_memory_module_event(const char *path, CxlEventLog log,

9
include/hw/cxl/cxl_events.h
View File

@ -138,7 +138,7 @@ typedef struct CXLEventGenMedia {
/*
* DRAM Event Record
* CXL r3.1 Section 8.2.9.2.1.2: Table 8-46
* CXL r3.2 Section 8.2.10.2.1.2: Table 8-58
* All fields little endian.
*/
typedef struct CXLEventDram {
@ -156,7 +156,12 @@ typedef struct CXLEventDram {
uint8_t row[3];
uint16_t column;
uint64_t correction_mask[4];
uint8_t reserved[0x17];
uint8_t component_id[CXL_EVENT_GEN_MED_COMP_ID_SIZE];
uint8_t sub_channel;
uint8_t cme_ev_flags;
uint8_t cvme_count[3];
uint8_t sub_type;
uint8_t reserved;
} QEMU_PACKED CXLEventDram;
/*

33
qapi/cxl.json
View File

@ -131,21 +131,21 @@
##
# @CXLDRAMEvent:
#
# Event record for a DRAM Event (CXL r3.0 8.2.9.2.1.2).
# Event record for a DRAM Event (CXL r3.2 8.2.10.2.1.2).
#
# @dpa: Device Physical Address (relative to @path device). Note
# lower bits include some flags. See CXL r3.0 Table 8-44 DRAM
# lower bits include some flags. See CXL r3.2 Table 8-58 DRAM
# Event Record, Physical Address.
#
# @descriptor: Memory Event Descriptor with additional memory event
# information. See CXL r3.0 Table 8-44 DRAM Event Record, Memory
# information. See CXL r3.2 Table 8-58 DRAM Event Record, Memory
# Event Descriptor for bit definitions.
#
# @type: Type of memory event that occurred. See CXL r3.0 Table 8-44
# @type: Type of memory event that occurred. See CXL r3.2 Table 8-58
# DRAM Event Record, Memory Event Type for possible values.
#
# @transaction-type: Type of first transaction that caused the event
# to occur. See CXL r3.0 Table 8-44 DRAM Event Record,
# to occur. See CXL r3.2 Table 8-58 DRAM Event Record,
# Transaction Type for possible values.
#
# @channel: The channel of the memory event location. A channel is an
@ -169,6 +169,21 @@
# @correction-mask: Bits within each nibble. Used in order of bits
# set in the nibble-mask. Up to 4 nibbles may be covered.
#
# @component-id: Device specific component identifier for the event.
# May describe a field replaceable sub-component of the device.
#
# @is-comp-id-pldm: This flag specifies whether the device-specific
# component identifier format follows PLDM.
#
# @sub-channel: The sub-channel of the memory event location.
#
# @cme-ev-flags: Advanced programmable corrected memory error
# threshold event flags.
#
# @cvme-count: Corrected volatile memory error count at event.
#
# @sub-type: Memory event sub-type.
#
# Since: 8.1
##
{ 'struct': 'CXLDRAMEvent',
@ -177,13 +192,17 @@
'type': 'uint8', 'transaction-type': 'uint8',
'*channel': 'uint8', '*rank': 'uint8', '*nibble-mask': 'uint32',
'*bank-group': 'uint8', '*bank': 'uint8', '*row': 'uint32',
'*column': 'uint16', '*correction-mask': [ 'uint64' ]
'*column': 'uint16', '*correction-mask': [ 'uint64' ],
'*component-id': 'str', '*is-comp-id-pldm':'bool',
'*sub-channel':'uint8',
'*cme-ev-flags':'uint8', '*cvme-count':'uint32',
'sub-type':'uint8'
}}
##
# @cxl-inject-dram-event:
#
# Inject an event record for a DRAM Event (CXL r3.0 8.2.9.2.1.2).
# Inject an event record for a DRAM Event (CXL r3.2 8.2.10.2.1.2).
# This event type is reported via one of the event logs
# specified via the log parameter.
#

Write Preview
Loading…
Cancel
Save