On Mon, Sep 25, 2023 at 05:11:09PM +0100, Jonathan Cameron wrote:
> By moving the parts of the mailbox command handling that are CCI type
> specific out to the caller, make the main handling code generic. Rename it
> to cxl_process_cci_message() to reflect this new generality.
>
> Signed-off-by: Jonathan Cameron <jonathan.came...@huawei.com>
> ---
Reviewed-by: Fan Ni <fan...@samsung.com>
> include/hw/cxl/cxl_device.h | 5 +++-
> hw/cxl/cxl-device-utils.c | 51 ++++++++++++++++++++++++++++++++++++-
> hw/cxl/cxl-mailbox-utils.c | 43 ++++++++-----------------------
> 3 files changed, 64 insertions(+), 35 deletions(-)
>
> diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h
> index c883d9dd8f..0e3f6c3c0b 100644
> --- a/include/hw/cxl/cxl_device.h
> +++ b/include/hw/cxl/cxl_device.h
> @@ -270,7 +270,10 @@ CXL_DEVICE_CAPABILITY_HEADER_REGISTER(MEMORY_DEVICE,
>
> void cxl_initialize_mailbox_t3(CXLCCI *cci, DeviceState *d, size_t
> payload_max);
> void cxl_init_cci(CXLCCI *cci, size_t payload_max);
> -void cxl_process_mailbox(CXLCCI *cci);
> +int cxl_process_cci_message(CXLCCI *cci, uint8_t set, uint8_t cmd,
> + size_t len_in, uint8_t *pl_in,
> + size_t *len_out, uint8_t *pl_out,
> + bool *bg_started);
>
> #define cxl_device_cap_init(dstate, reg, cap_id, ver) \
> do { \
> diff --git a/hw/cxl/cxl-device-utils.c b/hw/cxl/cxl-device-utils.c
> index 327949a805..f3a6e17154 100644
> --- a/hw/cxl/cxl-device-utils.c
> +++ b/hw/cxl/cxl-device-utils.c
> @@ -79,6 +79,25 @@ static uint64_t mailbox_reg_read(void *opaque, hwaddr
> offset, unsigned size)
> case 4:
> return cxl_dstate->mbox_reg_state32[offset / size];
> case 8:
> + if (offset == A_CXL_DEV_BG_CMD_STS) {
> + uint64_t bg_status_reg;
> + bg_status_reg = FIELD_DP64(0, CXL_DEV_BG_CMD_STS, OP,
> + cci->bg.opcode);
> + bg_status_reg = FIELD_DP64(bg_status_reg, CXL_DEV_BG_CMD_STS,
> + PERCENTAGE_COMP,
> cci->bg.complete_pct);
> + bg_status_reg = FIELD_DP64(bg_status_reg, CXL_DEV_BG_CMD_STS,
> + RET_CODE, cci->bg.ret_code);
> + /* endian? */
> + cxl_dstate->mbox_reg_state64[offset / size] = bg_status_reg;
> + }
> + if (offset == A_CXL_DEV_MAILBOX_STS) {
> + uint64_t status_reg = cxl_dstate->mbox_reg_state64[offset /
> size];
> + if (cci->bg.complete_pct) {
> + status_reg = FIELD_DP64(status_reg, CXL_DEV_MAILBOX_STS,
> BG_OP,
> + 0);
> + cxl_dstate->mbox_reg_state64[offset / size] = status_reg;
> + }
> + }
> return cxl_dstate->mbox_reg_state64[offset / size];
> default:
> g_assert_not_reached();
> @@ -157,7 +176,37 @@ static void mailbox_reg_write(void *opaque, hwaddr
> offset, uint64_t value,
>
> if (ARRAY_FIELD_EX32(cxl_dstate->mbox_reg_state32, CXL_DEV_MAILBOX_CTRL,
> DOORBELL)) {
> - cxl_process_mailbox(cci);
> + uint64_t command_reg =
> + cxl_dstate->mbox_reg_state64[R_CXL_DEV_MAILBOX_CMD];
> + uint8_t cmd_set = FIELD_EX64(command_reg, CXL_DEV_MAILBOX_CMD,
> + COMMAND_SET);
> + uint8_t cmd = FIELD_EX64(command_reg, CXL_DEV_MAILBOX_CMD, COMMAND);
> + size_t len_in = FIELD_EX64(command_reg, CXL_DEV_MAILBOX_CMD, LENGTH);
> + uint8_t *pl = cxl_dstate->mbox_reg_state + A_CXL_DEV_CMD_PAYLOAD;
> + size_t len_out;
> + uint64_t status_reg;
> + bool bg_started;
> + int rc;
> +
> + rc = cxl_process_cci_message(cci, cmd_set, cmd, len_in, pl,
> + &len_out, pl, &bg_started);
> +
> + /* Set bg and the return code */
> + status_reg = FIELD_DP64(0, CXL_DEV_MAILBOX_STS, BG_OP,
> + bg_started ? 1 : 0);
> + status_reg = FIELD_DP64(status_reg, CXL_DEV_MAILBOX_STS, ERRNO, rc);
> + /* Set the return length */
> + command_reg = FIELD_DP64(0, CXL_DEV_MAILBOX_CMD, COMMAND_SET,
> cmd_set);
> + command_reg = FIELD_DP64(command_reg, CXL_DEV_MAILBOX_CMD,
> + COMMAND, cmd);
> + command_reg = FIELD_DP64(command_reg, CXL_DEV_MAILBOX_CMD,
> + LENGTH, len_out);
> +
> + cxl_dstate->mbox_reg_state64[R_CXL_DEV_MAILBOX_CMD] = command_reg;
> + cxl_dstate->mbox_reg_state64[R_CXL_DEV_MAILBOX_STS] = status_reg;
> + /* Tell the host we're done */
> + ARRAY_FIELD_DP32(cxl_dstate->mbox_reg_state32, CXL_DEV_MAILBOX_CTRL,
> + DOORBELL, 0);
> }
> }
>
> diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c
> index 376367c118..239acc659d 100644
> --- a/hw/cxl/cxl-mailbox-utils.c
> +++ b/hw/cxl/cxl-mailbox-utils.c
> @@ -754,50 +754,27 @@ static const struct cxl_cmd cxl_cmd_set[256][256] = {
> cmd_media_clear_poison, 72, 0 },
> };
>
> -void cxl_process_mailbox(CXLCCI *cci)
> +int cxl_process_cci_message(CXLCCI *cci, uint8_t set, uint8_t cmd,
> + size_t len_in, uint8_t *pl_in, size_t *len_out,
> + uint8_t *pl_out, bool *bg_started)
> {
> - uint16_t ret = CXL_MBOX_SUCCESS;
> const struct cxl_cmd *cxl_cmd;
> - uint64_t status_reg = 0;
> opcode_handler h;
> - CXLDeviceState *cxl_dstate = &CXL_TYPE3(cci->d)->cxl_dstate;
> - uint64_t command_reg =
> cxl_dstate->mbox_reg_state64[R_CXL_DEV_MAILBOX_CMD];
> -
> - uint8_t set = FIELD_EX64(command_reg, CXL_DEV_MAILBOX_CMD, COMMAND_SET);
> - uint8_t cmd = FIELD_EX64(command_reg, CXL_DEV_MAILBOX_CMD, COMMAND);
> - uint16_t len_in = FIELD_EX64(command_reg, CXL_DEV_MAILBOX_CMD, LENGTH);
> - uint8_t *pl = cxl_dstate->mbox_reg_state + A_CXL_DEV_CMD_PAYLOAD;
> - size_t len_out = 0;
>
> + *len_out = 0;
> cxl_cmd = &cci->cxl_cmd_set[set][cmd];
> h = cxl_cmd->handler;
> - if (h) {
> - if (len_in == cxl_cmd->in || cxl_cmd->in == ~0) {
> - ret = (*h)(cxl_cmd, pl, len_in, pl, &len_out, cci);
> - assert(len_out <= cci->payload_max);
> - } else {
> - ret = CXL_MBOX_INVALID_PAYLOAD_LENGTH;
> - }
> - } else {
> + if (!h) {
> qemu_log_mask(LOG_UNIMP, "Command %04xh not implemented\n",
> set << 8 | cmd);
> - ret = CXL_MBOX_UNSUPPORTED;
> + return CXL_MBOX_UNSUPPORTED;
> }
>
> - /* Set the return code */
> - status_reg = FIELD_DP64(0, CXL_DEV_MAILBOX_STS, ERRNO, ret);
> -
> - /* Set the return length */
> - command_reg = FIELD_DP64(command_reg, CXL_DEV_MAILBOX_CMD, COMMAND_SET,
> 0);
> - command_reg = FIELD_DP64(command_reg, CXL_DEV_MAILBOX_CMD, COMMAND, 0);
> - command_reg = FIELD_DP64(command_reg, CXL_DEV_MAILBOX_CMD, LENGTH,
> len_out);
> -
> - cxl_dstate->mbox_reg_state64[R_CXL_DEV_MAILBOX_CMD] = command_reg;
> - cxl_dstate->mbox_reg_state64[R_CXL_DEV_MAILBOX_STS] = status_reg;
> + if (len_in != cxl_cmd->in && cxl_cmd->in != ~0) {
> + return CXL_MBOX_INVALID_PAYLOAD_LENGTH;
> + }
>
> - /* Tell the host we're done */
> - ARRAY_FIELD_DP32(cxl_dstate->mbox_reg_state32, CXL_DEV_MAILBOX_CTRL,
> - DOORBELL, 0);
> + return (*h)(cxl_cmd, pl_in, len_in, pl_out, len_out, cci);
> }
>
> void cxl_init_cci(CXLCCI *cci, size_t payload_max)
> --
> 2.39.2
>
