On Fri, 21 Jul 2023 12:35:04 -0400
Gregory Price <gourry.memve...@gmail.com> wrote:
Typo in patch title. reference
> 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.pr...@memverge.com>
Hi Gregory,
This might give us a nice solution to a problem with rebasing Fan's
DCD set, so I'm reviewing it head of the later part of your series
and may pick it up in the meantime.
> ---
> hw/cxl/cxl-mailbox-utils.c | 18 ++++++++++++++----
> include/hw/cxl/cxl_device.h | 2 +-
> 2 files changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c
> index 2819914e8d..ddee3f1718 100644
> --- a/hw/cxl/cxl-mailbox-utils.c
> +++ b/hw/cxl/cxl-mailbox-utils.c
> @@ -1373,9 +1373,19 @@ void cxl_init_cci(CXLCCI *cci, size_t payload_max)
> bg_timercb, cci);
> }
>
> +static void cxl_copy_cci_commands(CXLCCI *cci, const struct cxl_cmd
> (*cxl_cmds)[256]) {
Bracket on next line.
> + 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,
> 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->intf = intf;
> cxl_init_cci(cci, payload_max);
> @@ -1383,7 +1393,7 @@ void cxl_initialize_mailbox_swcci(CXLCCI *cci,
> DeviceState *intf, DeviceState *d
>
> 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;
>
> /* No separation for PCI MB as protocol handled in PCI device */
> @@ -1398,7 +1408,7 @@ static const struct cxl_cmd
> cxl_cmd_set_t3_mctp[256][256] = {
> void cxl_initialize_t3_mctpcci(CXLCCI *cci, DeviceState *d, DeviceState
> *intf,
> size_t payload_max)
> {
> - cci->cxl_cmd_set = cxl_cmd_set_t3_mctp;
> + cxl_copy_cci_commands(cci, cxl_cmd_set_t3_mctp);
> cci->d = d;
> cci->intf = intf;
> cxl_init_cci(cci, payload_max);
> @@ -1414,7 +1424,7 @@ static const struct cxl_cmd
> cxl_cmd_set_usp_mctp[256][256] = {
>
> void cxl_initialize_usp_mctpcci(CXLCCI *cci, DeviceState *d, DeviceState
> *intf, size_t payload_max)
> {
> - cci->cxl_cmd_set = cxl_cmd_set_usp_mctp;
> + cxl_copy_cci_commands(cci, cxl_cmd_set_usp_mctp);
> cci->d = d;
> cci->intf = intf;
> cxl_init_cci(cci, payload_max);
> diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h
> index c68981b618..9a3c8b2dfa 100644
> --- a/include/hw/cxl/cxl_device.h
> +++ b/include/hw/cxl/cxl_device.h
> @@ -163,7 +163,7 @@ typedef struct CXLEventLog {
> } CXLEventLog;
>
> typedef struct CXLCCI {
> - const struct cxl_cmd (*cxl_cmd_set)[256];
> + struct cxl_cmd cxl_cmd_set[256][256];
> struct cel_log {
> uint16_t opcode;
> uint16_t effect;
