mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/cxl/mailbox: change CCI cmd set structure to be a member, not a reference

Browse Source 
This allows devices to have fully customized CCIs, along with complex
devices where wrapper devices can override or add additional CCI
commands without having to replicate full command structures or
pollute a base device with every command that might ever be used.

Signed-off-by: Gregory Price <gregory.price@memverge.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Fan Ni <fan.ni@samsung.com>
Message-Id: <20240523174651.1089554-2-nifan.cxl@gmail.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Gregory Price 2024-05-23 10:44:41 -07:00 committed by Michael S. Tsirkin
parent 6eaf0e612b
commit 05b70ceba0
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1447,10 +1447,21 @@ void cxl_init_cci(CXLCCI *cci, size_t payload_max)
bg_timercb, cci); bg_timercb, cci);
} }
static void cxl_copy_cci_commands(CXLCCI *cci, const struct cxl_cmd (*cxl_cmds)[256])
{
for (int set = 0; set < 256; set++) {
for (int cmd = 0; cmd < 256; cmd++) {
if (cxl_cmds[set][cmd].handler) {
cci->cxl_cmd_set[set][cmd] = cxl_cmds[set][cmd];
}
}
}
}
void cxl_initialize_mailbox_swcci(CXLCCI *cci, DeviceState *intf, void cxl_initialize_mailbox_swcci(CXLCCI *cci, DeviceState *intf,
DeviceState *d, size_t payload_max) DeviceState *d, size_t payload_max)
{ {
cci->cxl_cmd_set = cxl_cmd_set_sw; cxl_copy_cci_commands(cci, cxl_cmd_set_sw);
cci->d = d; cci->d = d;
cci->intf = intf; cci->intf = intf;
cxl_init_cci(cci, payload_max); cxl_init_cci(cci, payload_max);
@ -1458,7 +1469,7 @@ void cxl_initialize_mailbox_swcci(CXLCCI *cci, DeviceState *intf,
void cxl_initialize_mailbox_t3(CXLCCI *cci, DeviceState *d, size_t payload_max) void cxl_initialize_mailbox_t3(CXLCCI *cci, DeviceState *d, size_t payload_max)
{ {
cci->cxl_cmd_set = cxl_cmd_set; cxl_copy_cci_commands(cci, cxl_cmd_set);
cci->d = d; cci->d = d;
/* No separation for PCI MB as protocol handled in PCI device */ /* No separation for PCI MB as protocol handled in PCI device */
@ -1476,7 +1487,7 @@ static const struct cxl_cmd cxl_cmd_set_t3_ld[256][256] = {
void cxl_initialize_t3_ld_cci(CXLCCI *cci, DeviceState *d, DeviceState *intf, void cxl_initialize_t3_ld_cci(CXLCCI *cci, DeviceState *d, DeviceState *intf,
size_t payload_max) size_t payload_max)
{ {
cci->cxl_cmd_set = cxl_cmd_set_t3_ld; cxl_copy_cci_commands(cci, cxl_cmd_set_t3_ld);
cci->d = d; cci->d = d;
cci->intf = intf; cci->intf = intf;
cxl_init_cci(cci, payload_max); cxl_init_cci(cci, payload_max);
@ -1496,7 +1507,7 @@ void cxl_initialize_t3_fm_owned_ld_mctpcci(CXLCCI *cci, DeviceState *d,
DeviceState *intf, DeviceState *intf,
size_t payload_max) size_t payload_max)
{ {
cci->cxl_cmd_set = cxl_cmd_set_t3_fm_owned_ld_mctp; cxl_copy_cci_commands(cci, cxl_cmd_set_t3_fm_owned_ld_mctp);
cci->d = d; cci->d = d;
cci->intf = intf; cci->intf = intf;
cxl_init_cci(cci, payload_max); cxl_init_cci(cci, payload_max);

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

@ -164,7 +164,7 @@ typedef struct CXLEventLog {
} CXLEventLog; } CXLEventLog;
typedef struct CXLCCI { typedef struct CXLCCI {
const struct cxl_cmd (*cxl_cmd_set)[256]; struct cxl_cmd cxl_cmd_set[256][256];
struct cel_log { struct cel_log {
uint16_t opcode; uint16_t opcode;
uint16_t effect; uint16_t effect;