On Fri, May 30, 2025 at 02:43:35PM +0100, Jonathan Cameron wrote: > On Tue, 20 May 2025 17:33:46 +0000 > Anisa Su <anisa.su...@gmail.com> wrote: > > > On Tue, May 20, 2025 at 08:37:35AM -0700, Fan Ni wrote: > > > On Thu, May 08, 2025 at 12:00:57AM +0000, anisa.su...@gmail.com wrote: > > > > From: Anisa Su <anisa...@samsung.com> > > > > > > > > In preparation for the next patch, move opcodes enum to new > > > > cxl_opcodes.h file > > > > for visibility from mailbox-utils.c and i2c_mctp_cxl.c, which checks > > > > that > > > > certain command sets are bound with the correct MCTP binding. > > > > > > > > Signed-off-by: Anisa Su <anisa...@samsung.com> > > > > --- > > > > hw/cxl/cxl-mailbox-utils.c | 68 ++---------------------------------- > > > > include/hw/cxl/cxl_opcodes.h | 64 +++++++++++++++++++++++++++++++++ > > > > > > Should we put the opcodes into include/hw/cxl/cxl_mailbox.h instead of > > > creating a new file. cxl_mailbox.h only has some macros. > > > > > > Fan > > > > > I had some discussion with Jonathan in the v1 thread about this. We > > agreed it is fine to use mailbox.h because it only has a few macros in it, > > but in case more things get added to it later, I made a separate file. > > Then no need to re-organize later. > > > > > We can always move them in future if it turns out cxl_mailbox.h is > not a good home. > > Also, note that the include file added in this patch has no descriptive > comments or ifndef magic which would have wanted to be there. > > Jonathan > Ah ok~ I'll have it in cxl_mailbox.h for v3 then.
Thanks, Anisa > > > > > > > 2 files changed, 66 insertions(+), 66 deletions(-) > > > > create mode 100644 include/hw/cxl/cxl_opcodes.h > > > > > > > > diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c > > > > index a02d130926..ed3294530f 100644 > > > > --- a/hw/cxl/cxl-mailbox-utils.c > > > > +++ b/hw/cxl/cxl-mailbox-utils.c > > > > @@ -23,6 +23,7 @@ > > > > #include "qemu/uuid.h" > > > > #include "system/hostmem.h" > > > > #include "qemu/range.h" > > > > +#include "hw/cxl/cxl_opcodes.h" > > > > > > > > #define CXL_CAPACITY_MULTIPLIER (256 * MiB) > > > > #define CXL_DC_EVENT_LOG_SIZE 8 > > > > @@ -36,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_opcodes.h. > > > > * FOO = 0x7f, > > > > * #define BAR 0 > > > > * 2. Implement the handler > > > > @@ -59,71 +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 > > > > -}; > > > > - > > > > /* CCI Message Format CXL r3.1 Figure 7-19 */ > > > > typedef struct CXLCCIMessage { > > > > uint8_t category; > > > > diff --git a/include/hw/cxl/cxl_opcodes.h b/include/hw/cxl/cxl_opcodes.h > > > > new file mode 100644 > > > > index 0000000000..26d3a99e8a > > > > --- /dev/null > > > > +++ b/include/hw/cxl/cxl_opcodes.h > > > > @@ -0,0 +1,64 @@ > > > > +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 > > > > +}; > > > > -- > > > > 2.47.2 > > > > > > > > > > -- > > > Fan Ni >