ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/cxl: Line length reductions 

Michael Tsirkin observed that there were some unnecessarily
long lines in the CXL code in a recent review.
This patch is intended to rectify that where it does not
hurt readability.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Fan Ni <fan.ni@samsung.com>

Message-Id: <20231023140210.3089-5-Jonathan.Cameron@huawei.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Jonathan Cameron 2023-10-23 15:02:09 +01:00 committed by Michael S. Tsirkin
parent b34ae3c906
commit b342489ae7
9 changed files with 59 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/cxl/cxl-cdat.c
View File

@ -60,7 +60,8 @@ static void ct3_build_cdat(CDATObject *cdat, Error **errp)
return; return;
} }
cdat->built_buf_len = cdat->build_cdat_table(&cdat->built_buf, cdat->private); cdat->built_buf_len = cdat->build_cdat_table(&cdat->built_buf,
cdat->private);
if (!cdat->built_buf_len) { if (!cdat->built_buf_len) {
/* Build later as not all data available yet */ /* Build later as not all data available yet */

14
hw/cxl/cxl-component-utils.c
View File

@ -241,7 +241,8 @@ static void hdm_init_common(uint32_t *reg_state, uint32_t *write_msk,
ARRAY_FIELD_DP32(reg_state, CXL_HDM_DECODER_CAPABILITY, TARGET_COUNT, 1); ARRAY_FIELD_DP32(reg_state, CXL_HDM_DECODER_CAPABILITY, TARGET_COUNT, 1);
ARRAY_FIELD_DP32(reg_state, CXL_HDM_DECODER_CAPABILITY, INTERLEAVE_256B, 1); ARRAY_FIELD_DP32(reg_state, CXL_HDM_DECODER_CAPABILITY, INTERLEAVE_256B, 1);
ARRAY_FIELD_DP32(reg_state, CXL_HDM_DECODER_CAPABILITY, INTERLEAVE_4K, 1); ARRAY_FIELD_DP32(reg_state, CXL_HDM_DECODER_CAPABILITY, INTERLEAVE_4K, 1);
ARRAY_FIELD_DP32(reg_state, CXL_HDM_DECODER_CAPABILITY, POISON_ON_ERR_CAP, 0); ARRAY_FIELD_DP32(reg_state, CXL_HDM_DECODER_CAPABILITY,
POISON_ON_ERR_CAP, 0);
ARRAY_FIELD_DP32(reg_state, CXL_HDM_DECODER_GLOBAL_CONTROL, ARRAY_FIELD_DP32(reg_state, CXL_HDM_DECODER_GLOBAL_CONTROL,
HDM_DECODER_ENABLE, 0); HDM_DECODER_ENABLE, 0);
write_msk[R_CXL_HDM_DECODER_GLOBAL_CONTROL] = 0x3; write_msk[R_CXL_HDM_DECODER_GLOBAL_CONTROL] = 0x3;
@ -264,15 +265,16 @@ static void hdm_init_common(uint32_t *reg_state, uint32_t *write_msk,
} }
} }
void cxl_component_register_init_common(uint32_t *reg_state, uint32_t *write_msk, void cxl_component_register_init_common(uint32_t *reg_state,
uint32_t *write_msk,
enum reg_type type) enum reg_type type)
{ {
int caps = 0; int caps = 0;
/* /*
* In CXL 2.0 the capabilities required for each CXL component are such that, * In CXL 2.0 the capabilities required for each CXL component are such
* with the ordering chosen here, a single number can be used to define * that, with the ordering chosen here, a single number can be used to
* which capabilities should be provided. * define which capabilities should be provided.
*/ */
switch (type) { switch (type) {
case CXL2_DOWNSTREAM_PORT: case CXL2_DOWNSTREAM_PORT:
@ -449,7 +451,7 @@ void cxl_component_create_dvsec(CXLComponentState *cxl,
default: /* Registers are RO for other component types */ default: /* Registers are RO for other component types */
break; break;
} }
/* There are rw1cs bits in the status register but never set currently */ /* There are rw1cs bits in the status register but never set */
break; break;
} }

9
hw/cxl/cxl-events.c
View File

@ -170,8 +170,10 @@ CXLRetCode cxl_event_get_records(CXLDeviceState *cxlds, CXLGetEventPayload *pl,
if (log->overflow_err_count) { if (log->overflow_err_count) {
pl->flags |= CXL_GET_EVENT_FLAG_OVERFLOW; pl->flags |= CXL_GET_EVENT_FLAG_OVERFLOW;
pl->overflow_err_count = cpu_to_le16(log->overflow_err_count); pl->overflow_err_count = cpu_to_le16(log->overflow_err_count);
pl->first_overflow_timestamp = cpu_to_le64(log->first_overflow_timestamp); pl->first_overflow_timestamp =
pl->last_overflow_timestamp = cpu_to_le64(log->last_overflow_timestamp); cpu_to_le64(log->first_overflow_timestamp);
pl->last_overflow_timestamp =
cpu_to_le64(log->last_overflow_timestamp);
} }
pl->record_count = cpu_to_le16(nr); pl->record_count = cpu_to_le16(nr);
@ -180,7 +182,8 @@ CXLRetCode cxl_event_get_records(CXLDeviceState *cxlds, CXLGetEventPayload *pl,
return CXL_MBOX_SUCCESS; return CXL_MBOX_SUCCESS;
} }
CXLRetCode cxl_event_clear_records(CXLDeviceState *cxlds, CXLClearEventPayload *pl) CXLRetCode cxl_event_clear_records(CXLDeviceState *cxlds,
CXLClearEventPayload *pl)
{ {
CXLEventLog *log; CXLEventLog *log;
uint8_t log_type; uint8_t log_type;

21
hw/cxl/cxl-mailbox-utils.c
View File

@ -366,9 +366,12 @@ static CXLRetCode cmd_identify_memory_device(struct cxl_cmd *cmd,
snprintf(id->fw_revision, 0x10, "BWFW VERSION %02d", 0); snprintf(id->fw_revision, 0x10, "BWFW VERSION %02d", 0);
stq_le_p(&id->total_capacity, cxl_dstate->mem_size / CXL_CAPACITY_MULTIPLIER); stq_le_p(&id->total_capacity,
stq_le_p(&id->persistent_capacity, cxl_dstate->pmem_size / CXL_CAPACITY_MULTIPLIER); cxl_dstate->mem_size / CXL_CAPACITY_MULTIPLIER);
stq_le_p(&id->volatile_capacity, cxl_dstate->vmem_size / CXL_CAPACITY_MULTIPLIER); stq_le_p(&id->persistent_capacity,
cxl_dstate->pmem_size / CXL_CAPACITY_MULTIPLIER);
stq_le_p(&id->volatile_capacity,
cxl_dstate->vmem_size / CXL_CAPACITY_MULTIPLIER);
stl_le_p(&id->lsa_size, cvc->get_lsa_size(ct3d)); stl_le_p(&id->lsa_size, cvc->get_lsa_size(ct3d));
/* 256 poison records */ /* 256 poison records */
st24_le_p(id->poison_list_max_mer, 256); st24_le_p(id->poison_list_max_mer, 256);
@ -396,13 +399,15 @@ static CXLRetCode cmd_ccls_get_partition_info(struct cxl_cmd *cmd,
return CXL_MBOX_INTERNAL_ERROR; return CXL_MBOX_INTERNAL_ERROR;
} }
stq_le_p(&part_info->active_vmem, cxl_dstate->vmem_size / CXL_CAPACITY_MULTIPLIER); stq_le_p(&part_info->active_vmem,
cxl_dstate->vmem_size / CXL_CAPACITY_MULTIPLIER);
/* /*
* When both next_vmem and next_pmem are 0, there is no pending change to * When both next_vmem and next_pmem are 0, there is no pending change to
* partitioning. * partitioning.
*/ */
stq_le_p(&part_info->next_vmem, 0); stq_le_p(&part_info->next_vmem, 0);
stq_le_p(&part_info->active_pmem, cxl_dstate->pmem_size / CXL_CAPACITY_MULTIPLIER); stq_le_p(&part_info->active_pmem,
cxl_dstate->pmem_size / CXL_CAPACITY_MULTIPLIER);
stq_le_p(&part_info->next_pmem, 0); stq_le_p(&part_info->next_pmem, 0);
*len = sizeof(*part_info); *len = sizeof(*part_info);
@ -681,8 +686,10 @@ static struct cxl_cmd cxl_cmd_set[256][256] = {
[FIRMWARE_UPDATE][GET_INFO] = { "FIRMWARE_UPDATE_GET_INFO", [FIRMWARE_UPDATE][GET_INFO] = { "FIRMWARE_UPDATE_GET_INFO",
cmd_firmware_update_get_info, 0, 0 }, cmd_firmware_update_get_info, 0, 0 },
[TIMESTAMP][GET] = { "TIMESTAMP_GET", cmd_timestamp_get, 0, 0 }, [TIMESTAMP][GET] = { "TIMESTAMP_GET", cmd_timestamp_get, 0, 0 },
[TIMESTAMP][SET] = { "TIMESTAMP_SET", cmd_timestamp_set, 8, IMMEDIATE_POLICY_CHANGE }, [TIMESTAMP][SET] = { "TIMESTAMP_SET", cmd_timestamp_set,
[LOGS][GET_SUPPORTED] = { "LOGS_GET_SUPPORTED", cmd_logs_get_supported, 0, 0 }, 8, IMMEDIATE_POLICY_CHANGE },
[LOGS][GET_SUPPORTED] = { "LOGS_GET_SUPPORTED", cmd_logs_get_supported,
0, 0 },
[LOGS][GET_LOG] = { "LOGS_GET_LOG", cmd_logs_get_log, 0x18, 0 }, [LOGS][GET_LOG] = { "LOGS_GET_LOG", cmd_logs_get_log, 0x18, 0 },
[IDENTIFY][MEMORY_DEVICE] = { "IDENTIFY_MEMORY_DEVICE", [IDENTIFY][MEMORY_DEVICE] = { "IDENTIFY_MEMORY_DEVICE",
cmd_identify_memory_device, 0, 0 }, cmd_identify_memory_device, 0, 0 },

31
hw/mem/cxl_type3.c
View File

@ -208,10 +208,9 @@ static int ct3_build_cdat_table(CDATSubHeader ***cdat_table, void *priv)
} }
if (nonvolatile_mr) { if (nonvolatile_mr) {
uint64_t base = volatile_mr ? memory_region_size(volatile_mr) : 0;
rc = ct3_build_cdat_entries_for_mr(&(table[cur_ent]), dsmad_handle++, rc = ct3_build_cdat_entries_for_mr(&(table[cur_ent]), dsmad_handle++,
nonvolatile_mr, true, nonvolatile_mr, true, base);
(volatile_mr ?
memory_region_size(volatile_mr) : 0));
if (rc < 0) { if (rc < 0) {
goto error_cleanup; goto error_cleanup;
} }
@ -514,7 +513,8 @@ static void ct3d_reg_write(void *opaque, hwaddr offset, uint64_t value,
case A_CXL_RAS_UNC_ERR_STATUS: case A_CXL_RAS_UNC_ERR_STATUS:
{ {
uint32_t capctrl = ldl_le_p(cache_mem + R_CXL_RAS_ERR_CAP_CTRL); uint32_t capctrl = ldl_le_p(cache_mem + R_CXL_RAS_ERR_CAP_CTRL);
uint32_t fe = FIELD_EX32(capctrl, CXL_RAS_ERR_CAP_CTRL, FIRST_ERROR_POINTER); uint32_t fe = FIELD_EX32(capctrl, CXL_RAS_ERR_CAP_CTRL,
FIRST_ERROR_POINTER);
CXLError *cxl_err; CXLError *cxl_err;
uint32_t unc_err; uint32_t unc_err;
@ -533,7 +533,8 @@ static void ct3d_reg_write(void *opaque, hwaddr offset, uint64_t value,
* closest to behavior of hardware not capable of multiple * closest to behavior of hardware not capable of multiple
* header recording. * header recording.
*/ */
QTAILQ_FOREACH_SAFE(cxl_err, &ct3d->error_list, node, cxl_next) { QTAILQ_FOREACH_SAFE(cxl_err, &ct3d->error_list, node,
cxl_next) {
if ((1 << cxl_err->type) & value) { if ((1 << cxl_err->type) & value) {
QTAILQ_REMOVE(&ct3d->error_list, cxl_err, node); QTAILQ_REMOVE(&ct3d->error_list, cxl_err, node);
g_free(cxl_err); g_free(cxl_err);
@ -1072,7 +1073,8 @@ void qmp_cxl_inject_poison(const char *path, uint64_t start, uint64_t length,
if (((start >= p->start) && (start < p->start + p->length)) || if (((start >= p->start) && (start < p->start + p->length)) ||
((start + length > p->start) && ((start + length > p->start) &&
(start + length <= p->start + p->length))) { (start + length <= p->start + p->length))) {
error_setg(errp, "Overlap with existing poisoned region not supported"); error_setg(errp,
"Overlap with existing poisoned region not supported");
return; return;
} }
} }
@ -1085,7 +1087,8 @@ void qmp_cxl_inject_poison(const char *path, uint64_t start, uint64_t length,
p = g_new0(CXLPoison, 1); p = g_new0(CXLPoison, 1);
p->length = length; p->length = length;
p->start = start; p->start = start;
p->type = CXL_POISON_TYPE_INTERNAL; /* Different from injected via the mbox */ /* Different from injected via the mbox */
p->type = CXL_POISON_TYPE_INTERNAL;
QLIST_INSERT_HEAD(&ct3d->poison_list, p, node); QLIST_INSERT_HEAD(&ct3d->poison_list, p, node);
ct3d->poison_list_cnt++; ct3d->poison_list_cnt++;
@ -1222,7 +1225,8 @@ void qmp_cxl_inject_correctable_error(const char *path, CxlCorErrorType type,
return; return;
} }
/* If the error is masked, nothting to do here */ /* If the error is masked, nothting to do here */
if (!((1 << cxl_err_type) & ~ldl_le_p(reg_state + R_CXL_RAS_COR_ERR_MASK))) { if (!((1 << cxl_err_type) &
~ldl_le_p(reg_state + R_CXL_RAS_COR_ERR_MASK))) {
return; return;
} }
@ -1372,7 +1376,8 @@ void qmp_cxl_inject_dram_event(const char *path, CxlEventLog log, uint8_t flags,
bool has_bank, uint8_t bank, bool has_bank, uint8_t bank,
bool has_row, uint32_t row, bool has_row, uint32_t row,
bool has_column, uint16_t column, bool has_column, uint16_t column,
bool has_correction_mask, uint64List *correction_mask, bool has_correction_mask,
uint64List *correction_mask,
Error **errp) Error **errp)
{ {
Object *obj = object_resolve_path(path, NULL); Object *obj = object_resolve_path(path, NULL);
@ -1473,7 +1478,7 @@ void qmp_cxl_inject_memory_module_event(const char *path, CxlEventLog log,
int16_t temperature, int16_t temperature,
uint32_t dirty_shutdown_count, uint32_t dirty_shutdown_count,
uint32_t corrected_volatile_error_count, uint32_t corrected_volatile_error_count,
uint32_t corrected_persistent_error_count, uint32_t corrected_persist_error_count,
Error **errp) Error **errp)
{ {
Object *obj = object_resolve_path(path, NULL); Object *obj = object_resolve_path(path, NULL);
@ -1513,8 +1518,10 @@ void qmp_cxl_inject_memory_module_event(const char *path, CxlEventLog log,
module.life_used = life_used; module.life_used = life_used;
stw_le_p(&module.temperature, temperature); stw_le_p(&module.temperature, temperature);
stl_le_p(&module.dirty_shutdown_count, dirty_shutdown_count); stl_le_p(&module.dirty_shutdown_count, dirty_shutdown_count);
stl_le_p(&module.corrected_volatile_error_count, corrected_volatile_error_count); stl_le_p(&module.corrected_volatile_error_count,
stl_le_p(&module.corrected_persistent_error_count, corrected_persistent_error_count); corrected_volatile_error_count);
stl_le_p(&module.corrected_persistent_error_count,
corrected_persist_error_count);
if (cxl_event_insert(cxlds, enc_log, (CXLEventRecordRaw *)&module)) { if (cxl_event_insert(cxlds, enc_log, (CXLEventRecordRaw *)&module)) {
cxl_event_irq_assert(ct3d); cxl_event_irq_assert(ct3d);

5
hw/mem/cxl_type3_stubs.c
View File

@ -33,7 +33,8 @@ void qmp_cxl_inject_dram_event(const char *path, CxlEventLog log, uint8_t flags,
bool has_bank, uint8_t bank, bool has_bank, uint8_t bank,
bool has_row, uint32_t row, bool has_row, uint32_t row,
bool has_column, uint16_t column, bool has_column, uint16_t column,
bool has_correction_mask, uint64List *correction_mask, bool has_correction_mask,
uint64List *correction_mask,
Error **errp) {} Error **errp) {}
void qmp_cxl_inject_memory_module_event(const char *path, CxlEventLog log, void qmp_cxl_inject_memory_module_event(const char *path, CxlEventLog log,
@ -45,7 +46,7 @@ void qmp_cxl_inject_memory_module_event(const char *path, CxlEventLog log,
int16_t temperature, int16_t temperature,
uint32_t dirty_shutdown_count, uint32_t dirty_shutdown_count,
uint32_t corrected_volatile_error_count, uint32_t corrected_volatile_error_count,
uint32_t corrected_persistent_error_count, uint32_t corrected_persist_error_count,
Error **errp) {} Error **errp) {}
void qmp_cxl_inject_poison(const char *path, uint64_t start, uint64_t length, void qmp_cxl_inject_poison(const char *path, uint64_t start, uint64_t length,

3
include/hw/cxl/cxl_component.h
View File

@ -175,7 +175,8 @@ HDM_DECODER_INIT(3);
(CXL_IDE_REGISTERS_OFFSET + CXL_IDE_REGISTERS_SIZE) (CXL_IDE_REGISTERS_OFFSET + CXL_IDE_REGISTERS_SIZE)
#define CXL_SNOOP_REGISTERS_SIZE 0x8 #define CXL_SNOOP_REGISTERS_SIZE 0x8
QEMU_BUILD_BUG_MSG((CXL_SNOOP_REGISTERS_OFFSET + CXL_SNOOP_REGISTERS_SIZE) >= 0x1000, QEMU_BUILD_BUG_MSG((CXL_SNOOP_REGISTERS_OFFSET +
CXL_SNOOP_REGISTERS_SIZE) >= 0x1000,
"No space for registers"); "No space for registers");
typedef struct component_registers { typedef struct component_registers {

5
include/hw/cxl/cxl_device.h
View File

@ -192,7 +192,7 @@ void cxl_device_register_init_common(CXLDeviceState *dev);
* Documented as a 128 bit register, but 64 bit accesses and the second * Documented as a 128 bit register, but 64 bit accesses and the second
* 64 bits are currently reserved. * 64 bits are currently reserved.
*/ */
REG64(CXL_DEV_CAP_ARRAY, 0) /* Documented as 128 bit register but 64 byte accesses */ REG64(CXL_DEV_CAP_ARRAY, 0)
FIELD(CXL_DEV_CAP_ARRAY, CAP_ID, 0, 16) FIELD(CXL_DEV_CAP_ARRAY, CAP_ID, 0, 16)
FIELD(CXL_DEV_CAP_ARRAY, CAP_VERSION, 16, 8) FIELD(CXL_DEV_CAP_ARRAY, CAP_VERSION, 16, 8)
FIELD(CXL_DEV_CAP_ARRAY, CAP_COUNT, 32, 16) FIELD(CXL_DEV_CAP_ARRAY, CAP_COUNT, 32, 16)
@ -361,7 +361,8 @@ struct CXLType3Class {
uint64_t offset); uint64_t offset);
void (*set_lsa)(CXLType3Dev *ct3d, const void *buf, uint64_t size, void (*set_lsa)(CXLType3Dev *ct3d, const void *buf, uint64_t size,
uint64_t offset); uint64_t offset);
bool (*set_cacheline)(CXLType3Dev *ct3d, uint64_t dpa_offset, uint8_t *data); bool (*set_cacheline)(CXLType3Dev *ct3d, uint64_t dpa_offset,
uint8_t *data);
}; };
MemTxResult cxl_type3_read(PCIDevice *d, hwaddr host_addr, uint64_t *data, MemTxResult cxl_type3_read(PCIDevice *d, hwaddr host_addr, uint64_t *data,

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

@ -92,7 +92,8 @@ typedef enum CXLEventIntMode {
CXL_INT_RES = 0x03, CXL_INT_RES = 0x03,
} CXLEventIntMode; } CXLEventIntMode;
#define CXL_EVENT_INT_MODE_MASK 0x3 #define CXL_EVENT_INT_MODE_MASK 0x3
#define CXL_EVENT_INT_SETTING(vector) ((((uint8_t)vector & 0xf) << 4) | CXL_INT_MSI_MSIX) #define CXL_EVENT_INT_SETTING(vector) \
((((uint8_t)vector & 0xf) << 4) | CXL_INT_MSI_MSIX)
typedef struct CXLEventInterruptPolicy { typedef struct CXLEventInterruptPolicy {
uint8_t info_settings; uint8_t info_settings;
uint8_t warn_settings; uint8_t warn_settings;