Skip to content

Commit db4fdb7

Browse files
committed
Merge remote-tracking branch 'cxl/for-6.10/add-log-mbox-cmds' into cxl-for-next
Add CXL log related mailbox commands - Add Get Log Capabilities command - Add Get Supported Log Sub-List Commands command - Add Clear Log command
2 parents 0e081a0 + 206f9fa commit db4fdb7

File tree

3 files changed

+18
-0
lines changed

3 files changed

+18
-0
lines changed

drivers/cxl/core/mbox.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ static struct cxl_mem_command cxl_mem_commands[CXL_MEM_COMMAND_ID_MAX] = {
5656
CXL_CMD(GET_LSA, 0x8, CXL_VARIABLE_PAYLOAD, 0),
5757
CXL_CMD(GET_HEALTH_INFO, 0, 0x12, 0),
5858
CXL_CMD(GET_LOG, 0x18, CXL_VARIABLE_PAYLOAD, CXL_CMD_FLAG_FORCE_ENABLE),
59+
CXL_CMD(GET_LOG_CAPS, 0x10, 0x4, 0),
60+
CXL_CMD(CLEAR_LOG, 0x10, 0, 0),
61+
CXL_CMD(GET_SUP_LOG_SUBLIST, 0x2, CXL_VARIABLE_PAYLOAD, 0),
5962
CXL_CMD(SET_PARTITION_INFO, 0x0a, 0, 0),
6063
CXL_CMD(SET_LSA, CXL_VARIABLE_PAYLOAD, 0, 0),
6164
CXL_CMD(GET_ALERT_CONFIG, 0, 0x10, 0),
@@ -331,6 +334,15 @@ static bool cxl_payload_from_user_allowed(u16 opcode, void *payload_in)
331334
return false;
332335
break;
333336
}
337+
case CXL_MBOX_OP_CLEAR_LOG: {
338+
const uuid_t *uuid = (uuid_t *)payload_in;
339+
340+
/*
341+
* Restrict the ‘Clear log’ action to only apply to
342+
* Vendor debug logs.
343+
*/
344+
return uuid_equal(uuid, &DEFINE_CXL_VENDOR_DEBUG_UUID);
345+
}
334346
default:
335347
break;
336348
}

drivers/cxl/cxlmem.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,9 @@ enum cxl_opcode {
527527
CXL_MBOX_OP_SET_TIMESTAMP = 0x0301,
528528
CXL_MBOX_OP_GET_SUPPORTED_LOGS = 0x0400,
529529
CXL_MBOX_OP_GET_LOG = 0x0401,
530+
CXL_MBOX_OP_GET_LOG_CAPS = 0x0402,
531+
CXL_MBOX_OP_CLEAR_LOG = 0x0403,
532+
CXL_MBOX_OP_GET_SUP_LOG_SUBLIST = 0x0405,
530533
CXL_MBOX_OP_IDENTIFY = 0x4000,
531534
CXL_MBOX_OP_GET_PARTITION_INFO = 0x4100,
532535
CXL_MBOX_OP_SET_PARTITION_INFO = 0x4101,

include/uapi/linux/cxl_mem.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
___DEPRECATED(SCAN_MEDIA, "Scan Media"), \
4848
___DEPRECATED(GET_SCAN_MEDIA, "Get Scan Media Results"), \
4949
___C(GET_TIMESTAMP, "Get Timestamp"), \
50+
___C(GET_LOG_CAPS, "Get Log Capabilities"), \
51+
___C(CLEAR_LOG, "Clear Log"), \
52+
___C(GET_SUP_LOG_SUBLIST, "Get Supported Logs Sub-List"), \
5053
___C(MAX, "invalid / last command")
5154

5255
#define ___C(a, b) CXL_MEM_COMMAND_ID_##a

0 commit comments

Comments
 (0)