The 05/22/2023 16:09, Jonathan Cameron wrote:
> Following patches will need access to the mailbox return code
> type so move it to the header.
>
> Reviewed-by: Ira Weiny <ira.we...@intel.com>
> Signed-off-by: Jonathan Cameron <jonathan.came...@huawei.com>
> ---
Reviewed-by: Fan Ni <fan...@samsung.com>
> include/hw/cxl/cxl_device.h | 28 ++++++++++++++++++++++++++++
> hw/cxl/cxl-mailbox-utils.c | 28 ----------------------------
> 2 files changed, 28 insertions(+), 28 deletions(-)
>
> diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h
> index 16993f7098..9f8ee85f8a 100644
> --- a/include/hw/cxl/cxl_device.h
> +++ b/include/hw/cxl/cxl_device.h
> @@ -83,6 +83,34 @@
> (CXL_DEVICE_CAP_REG_SIZE + CXL_DEVICE_STATUS_REGISTERS_LENGTH + \
> CXL_MAILBOX_REGISTERS_LENGTH + CXL_MEMORY_DEVICE_REGISTERS_LENGTH)
>
> +/* 8.2.8.4.5.1 Command Return Codes */
> +typedef enum {
> + CXL_MBOX_SUCCESS = 0x0,
> + CXL_MBOX_BG_STARTED = 0x1,
> + CXL_MBOX_INVALID_INPUT = 0x2,
> + CXL_MBOX_UNSUPPORTED = 0x3,
> + CXL_MBOX_INTERNAL_ERROR = 0x4,
> + CXL_MBOX_RETRY_REQUIRED = 0x5,
> + CXL_MBOX_BUSY = 0x6,
> + CXL_MBOX_MEDIA_DISABLED = 0x7,
> + CXL_MBOX_FW_XFER_IN_PROGRESS = 0x8,
> + CXL_MBOX_FW_XFER_OUT_OF_ORDER = 0x9,
> + CXL_MBOX_FW_AUTH_FAILED = 0xa,
> + CXL_MBOX_FW_INVALID_SLOT = 0xb,
> + CXL_MBOX_FW_ROLLEDBACK = 0xc,
> + CXL_MBOX_FW_REST_REQD = 0xd,
> + CXL_MBOX_INVALID_HANDLE = 0xe,
> + CXL_MBOX_INVALID_PA = 0xf,
> + CXL_MBOX_INJECT_POISON_LIMIT = 0x10,
> + CXL_MBOX_PERMANENT_MEDIA_FAILURE = 0x11,
> + CXL_MBOX_ABORTED = 0x12,
> + CXL_MBOX_INVALID_SECURITY_STATE = 0x13,
> + CXL_MBOX_INCORRECT_PASSPHRASE = 0x14,
> + CXL_MBOX_UNSUPPORTED_MAILBOX = 0x15,
> + CXL_MBOX_INVALID_PAYLOAD_LENGTH = 0x16,
> + CXL_MBOX_MAX = 0x17
> +} CXLRetCode;
> +
> typedef struct cxl_device_state {
> MemoryRegion device_registers;
>
> diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c
> index e3401b6be8..d7e114aaae 100644
> --- a/hw/cxl/cxl-mailbox-utils.c
> +++ b/hw/cxl/cxl-mailbox-utils.c
> @@ -68,34 +68,6 @@ enum {
> #define CLEAR_POISON 0x2
> };
>
> -/* 8.2.8.4.5.1 Command Return Codes */
> -typedef enum {
> - CXL_MBOX_SUCCESS = 0x0,
> - CXL_MBOX_BG_STARTED = 0x1,
> - CXL_MBOX_INVALID_INPUT = 0x2,
> - CXL_MBOX_UNSUPPORTED = 0x3,
> - CXL_MBOX_INTERNAL_ERROR = 0x4,
> - CXL_MBOX_RETRY_REQUIRED = 0x5,
> - CXL_MBOX_BUSY = 0x6,
> - CXL_MBOX_MEDIA_DISABLED = 0x7,
> - CXL_MBOX_FW_XFER_IN_PROGRESS = 0x8,
> - CXL_MBOX_FW_XFER_OUT_OF_ORDER = 0x9,
> - CXL_MBOX_FW_AUTH_FAILED = 0xa,
> - CXL_MBOX_FW_INVALID_SLOT = 0xb,
> - CXL_MBOX_FW_ROLLEDBACK = 0xc,
> - CXL_MBOX_FW_REST_REQD = 0xd,
> - CXL_MBOX_INVALID_HANDLE = 0xe,
> - CXL_MBOX_INVALID_PA = 0xf,
> - CXL_MBOX_INJECT_POISON_LIMIT = 0x10,
> - CXL_MBOX_PERMANENT_MEDIA_FAILURE = 0x11,
> - CXL_MBOX_ABORTED = 0x12,
> - CXL_MBOX_INVALID_SECURITY_STATE = 0x13,
> - CXL_MBOX_INCORRECT_PASSPHRASE = 0x14,
> - CXL_MBOX_UNSUPPORTED_MAILBOX = 0x15,
> - CXL_MBOX_INVALID_PAYLOAD_LENGTH = 0x16,
> - CXL_MBOX_MAX = 0x17
> -} CXLRetCode;
> -
> struct cxl_cmd;
> typedef CXLRetCode (*opcode_handler)(struct cxl_cmd *cmd,
> CXLDeviceState *cxl_dstate, uint16_t
> *len);
> --
> 2.39.2
>
--
Fan Ni <ni...@outlook.com>
