From: Anisa Su <anisa...@samsung.com>
Per the spec, FMAPI commands (0x51-0x59) must be bound with
MCTP_MT_CXL_FMAPI. Fix the conditions ensuring this in i2c_mctp_cxl.c
and dev-mctp.c
Move the opcode enum from cxl-mailbox-utils.c to cxl_mailbox.h to
allow i2c_mctp_cxl.c and dev-mctp.c to use the enum instead of
hardcoding the values.
Signed-off-by: Anisa Su <anisa...@samsung.com>
---
hw/cxl/cxl-mailbox-utils.c | 74 +-----------------------------------
hw/cxl/i2c_mctp_cxl.c | 6 ++-
hw/usb/dev-mctp.c | 6 ++-
include/hw/cxl/cxl_mailbox.h | 73 +++++++++++++++++++++++++++++++++++
4 files changed, 82 insertions(+), 77 deletions(-)
diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c
index 4c01b25110..7f84e147f7 100644
--- a/hw/cxl/cxl-mailbox-utils.c
+++ b/hw/cxl/cxl-mailbox-utils.c
@@ -37,7 +37,7 @@
/*
* How to add a new command, example. The command set FOO, with cmd BAR.
- * 1. Add the command set and cmd to the enum.
+ * 1. Add the command set and cmd to the enum in cxl_mailbox.h.
* FOO = 0x7f,
* #define BAR 0
* 2. Implement the handler
@@ -60,78 +60,6 @@
* a register interface that already deals with it.
*/
-enum {
- INFOSTAT = 0x00,
- #define IS_IDENTIFY 0x1
- #define BACKGROUND_OPERATION_STATUS 0x2
- #define GET_RESPONSE_MSG_LIMIT 0x3
- #define SET_RESPONSE_MSG_LIMIT 0x4
- #define BACKGROUND_OPERATION_ABORT 0x5
- EVENTS = 0x01,
- #define GET_RECORDS 0x0
- #define CLEAR_RECORDS 0x1
- #define GET_INTERRUPT_POLICY 0x2
- #define SET_INTERRUPT_POLICY 0x3
- FIRMWARE_UPDATE = 0x02,
- #define GET_INFO 0x0
- #define TRANSFER 0x1
- #define ACTIVATE 0x2
- TIMESTAMP = 0x03,
- #define GET 0x0
- #define SET 0x1
- LOGS = 0x04,
- #define GET_SUPPORTED 0x0
- #define GET_LOG 0x1
- #define GET_LOG_CAPABILITIES 0x2
- #define CLEAR_LOG 0x3
- #define POPULATE_LOG 0x4
- FEATURES = 0x05,
- #define GET_SUPPORTED 0x0
- #define GET_FEATURE 0x1
- #define SET_FEATURE 0x2
- IDENTIFY = 0x40,
- #define MEMORY_DEVICE 0x0
- CCLS = 0x41,
- #define GET_PARTITION_INFO 0x0
- #define GET_LSA 0x2
- #define SET_LSA 0x3
- HEALTH_INFO_ALERTS = 0x42,
- #define GET_ALERT_CONFIG 0x1
- #define SET_ALERT_CONFIG 0x2
- SANITIZE = 0x44,
- #define OVERWRITE 0x0
- #define SECURE_ERASE 0x1
- #define MEDIA_OPERATIONS 0x2
- PERSISTENT_MEM = 0x45,
- #define GET_SECURITY_STATE 0x0
- MEDIA_AND_POISON = 0x43,
- #define GET_POISON_LIST 0x0
- #define INJECT_POISON 0x1
- #define CLEAR_POISON 0x2
- #define GET_SCAN_MEDIA_CAPABILITIES 0x3
- #define SCAN_MEDIA 0x4
- #define GET_SCAN_MEDIA_RESULTS 0x5
- DCD_CONFIG = 0x48,
- #define GET_DC_CONFIG 0x0
- #define GET_DYN_CAP_EXT_LIST 0x1
- #define ADD_DYN_CAP_RSP 0x2
- #define RELEASE_DYN_CAP 0x3
- PHYSICAL_SWITCH = 0x51,
- #define IDENTIFY_SWITCH_DEVICE 0x0
- #define GET_PHYSICAL_PORT_STATE 0x1
- TUNNEL = 0x53,
- #define MANAGEMENT_COMMAND 0x0
- MHD = 0x55,
- #define GET_MHD_INFO 0x0
- FMAPI_DCD_MGMT = 0x56,
- #define GET_DCD_INFO 0x0
- #define GET_HOST_DC_REGION_CONFIG 0x1
- #define SET_DC_REGION_CONFIG 0x2
- #define GET_DC_REGION_EXTENT_LIST 0x3
- #define INITIATE_DC_ADD 0x4
- #define INITIATE_DC_RELEASE 0x5
-};
-
/* CCI Message Format CXL r3.1 Figure 7-19 */
typedef struct CXLCCIMessage {
uint8_t category;
diff --git a/hw/cxl/i2c_mctp_cxl.c b/hw/cxl/i2c_mctp_cxl.c
index 1714f36e8e..3f17779562 100644
--- a/hw/cxl/i2c_mctp_cxl.c
+++ b/hw/cxl/i2c_mctp_cxl.c
@@ -29,6 +29,7 @@
#include "hw/pci/pcie_port.h"
#include "hw/qdev-properties.h"
#include "hw/registerfields.h"
+#include "hw/cxl/cxl_mailbox.h"
#define TYPE_I2C_MCTP_CXL "i2c_mctp_cxl"
@@ -198,9 +199,10 @@ static void i2c_mctp_cxl_handle_message(MCTPI2CEndpoint
*mctp)
*/
if (!(msg->message_type == MCTP_MT_CXL_TYPE3 &&
- msg->command_set < 0x51) &&
+ msg->command_set < PHYSICAL_SWITCH) &&
!(msg->message_type == MCTP_MT_CXL_FMAPI &&
- msg->command_set >= 0x51 && msg->command_set < 0x56)) {
+ msg->command_set >= PHYSICAL_SWITCH &&
+ msg->command_set < GLOBAL_MEM_ACCESS_EP_MGMT)) {
buf->rc = CXL_MBOX_UNSUPPORTED;
st24_le_p(buf->pl_length, len_out);
s->len = s->pos;
diff --git a/hw/usb/dev-mctp.c b/hw/usb/dev-mctp.c
index aafb9e7e96..b82a269561 100644
--- a/hw/usb/dev-mctp.c
+++ b/hw/usb/dev-mctp.c
@@ -25,6 +25,7 @@
#include "hw/usb.h"
#include "hw/usb/desc.h"
#include "net/mctp.h"
+#include "hw/cxl/cxl_mailbox.h"
/* TODO: Move to header */
@@ -504,9 +505,10 @@ static void usb_cxl_mctp_handle_data(USBDevice *dev,
USBPacket *p)
* onwards.
*/
if (!(req->message_type == MCTP_MT_CXL_TYPE3 &&
- req->command_set < 0x51) &&
+ req->command_set < PHYSICAL_SWITCH) &&
!(req->message_type == MCTP_MT_CXL_FMAPI &&
- req->command_set >= 0x51 && req->command_set < 0x56)) {
+ req->command_set >= PHYSICAL_SWITCH &&
+ req->command_set < GLOBAL_MEM_ACCESS_EP_MGMT)) {
len_out = 0;
usb_pkt_len = sizeof(MCTPUSBPacket) + sizeof(CXLMCTPMessage) +
len_out;
diff --git a/include/hw/cxl/cxl_mailbox.h b/include/hw/cxl/cxl_mailbox.h
index 820c411cbb..209a11ecbc 100644
--- a/include/hw/cxl/cxl_mailbox.h
+++ b/include/hw/cxl/cxl_mailbox.h
@@ -27,4 +27,77 @@
#define CXL_LOG_CAP_AUTO_POPULATE_SUPPORTED (1 << 2)
#define CXL_LOG_CAP_PERSISTENT_COLD_RESET_SUPPORTED (1 << 3)
+enum {
+ INFOSTAT = 0x00,
+ #define IS_IDENTIFY 0x1
+ #define BACKGROUND_OPERATION_STATUS 0x2
+ #define GET_RESPONSE_MSG_LIMIT 0x3
+ #define SET_RESPONSE_MSG_LIMIT 0x4
+ #define BACKGROUND_OPERATION_ABORT 0x5
+ EVENTS = 0x01,
+ #define GET_RECORDS 0x0
+ #define CLEAR_RECORDS 0x1
+ #define GET_INTERRUPT_POLICY 0x2
+ #define SET_INTERRUPT_POLICY 0x3
+ FIRMWARE_UPDATE = 0x02,
+ #define GET_INFO 0x0
+ #define TRANSFER 0x1
+ #define ACTIVATE 0x2
+ TIMESTAMP = 0x03,
+ #define GET 0x0
+ #define SET 0x1
+ LOGS = 0x04,
+ #define GET_SUPPORTED 0x0
+ #define GET_LOG 0x1
+ #define GET_LOG_CAPABILITIES 0x2
+ #define CLEAR_LOG 0x3
+ #define POPULATE_LOG 0x4
+ FEATURES = 0x05,
+ #define GET_SUPPORTED 0x0
+ #define GET_FEATURE 0x1
+ #define SET_FEATURE 0x2
+ IDENTIFY = 0x40,
+ #define MEMORY_DEVICE 0x0
+ CCLS = 0x41,
+ #define GET_PARTITION_INFO 0x0
+ #define GET_LSA 0x2
+ #define SET_LSA 0x3
+ HEALTH_INFO_ALERTS = 0x42,
+ #define GET_ALERT_CONFIG 0x1
+ #define SET_ALERT_CONFIG 0x2
+ SANITIZE = 0x44,
+ #define OVERWRITE 0x0
+ #define SECURE_ERASE 0x1
+ #define MEDIA_OPERATIONS 0x2
+ PERSISTENT_MEM = 0x45,
+ #define GET_SECURITY_STATE 0x0
+ MEDIA_AND_POISON = 0x43,
+ #define GET_POISON_LIST 0x0
+ #define INJECT_POISON 0x1
+ #define CLEAR_POISON 0x2
+ #define GET_SCAN_MEDIA_CAPABILITIES 0x3
+ #define SCAN_MEDIA 0x4
+ #define GET_SCAN_MEDIA_RESULTS 0x5
+ DCD_CONFIG = 0x48,
+ #define GET_DC_CONFIG 0x0
+ #define GET_DYN_CAP_EXT_LIST 0x1
+ #define ADD_DYN_CAP_RSP 0x2
+ #define RELEASE_DYN_CAP 0x3
+ PHYSICAL_SWITCH = 0x51,
+ #define IDENTIFY_SWITCH_DEVICE 0x0
+ #define GET_PHYSICAL_PORT_STATE 0x1
+ TUNNEL = 0x53,
+ #define MANAGEMENT_COMMAND 0x0
+ MHD = 0x55,
+ #define GET_MHD_INFO 0x0
+ FMAPI_DCD_MGMT = 0x56,
+ #define GET_DCD_INFO 0x0
+ #define GET_HOST_DC_REGION_CONFIG 0x1
+ #define SET_DC_REGION_CONFIG 0x2
+ #define GET_DC_REGION_EXTENT_LIST 0x3
+ #define INITIATE_DC_ADD 0x4
+ #define INITIATE_DC_RELEASE 0x5
+ GLOBAL_MEM_ACCESS_EP_MGMT = 0X59,
+};
+
#endif
--
2.47.2
