cxl/events: Create common event UUID defines

Dan points out in review that the cxl_test code could be made better
through the use of UUID's defines rather than being open coded.[1]

Create UUID defines and use them rather than open coding them.

Suggested-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Link: http://lore.kernel.org/r/65738d09e30e2_45e0129451@dwillia2-xfh.jf.intel.com.notmuch
Link: https://lore.kernel.org/r/20231220-cxl-cper-v5-3-1bb8a4ca2c7a@intel.com
[djbw: clang-format uuid definitions]
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c
index 00f429c440dfe6023dad9a56d188ebe65685c1dc..1ccc3a56e0af6dcf3935ef198140bb050b3f1454 100644 (file)
--- a/drivers/cxl/core/mbox.c
+++ b/drivers/cxl/core/mbox.c
@@ -836,46 +836,22 @@ out:
 }
 EXPORT_SYMBOL_NS_GPL(cxl_enumerate_cmds, CXL);
 
-/*
- * General Media Event Record
- * CXL rev 3.0 Section 8.2.9.2.1.1; Table 8-43
- */
-static const uuid_t gen_media_event_uuid =
-       UUID_INIT(0xfbcd0a77, 0xc260, 0x417f,
-                 0x85, 0xa9, 0x08, 0x8b, 0x16, 0x21, 0xeb, 0xa6);
-
-/*
- * DRAM Event Record
- * CXL rev 3.0 section 8.2.9.2.1.2; Table 8-44
- */
-static const uuid_t dram_event_uuid =
-       UUID_INIT(0x601dcbb3, 0x9c06, 0x4eab,
-                 0xb8, 0xaf, 0x4e, 0x9b, 0xfb, 0x5c, 0x96, 0x24);
-
-/*
- * Memory Module Event Record
- * CXL rev 3.0 section 8.2.9.2.1.3; Table 8-45
- */
-static const uuid_t mem_mod_event_uuid =
-       UUID_INIT(0xfe927475, 0xdd59, 0x4339,
-                 0xa5, 0x86, 0x79, 0xba, 0xb1, 0x13, 0xb7, 0x74);
-
 static void cxl_event_trace_record(const struct cxl_memdev *cxlmd,
                                   enum cxl_event_log_type type,
                                   struct cxl_event_record_raw *record)
 {
        uuid_t *id = &record->hdr.id;
 
-       if (uuid_equal(id, &gen_media_event_uuid)) {
+       if (uuid_equal(id, &CXL_EVENT_GEN_MEDIA_UUID)) {
                struct cxl_event_gen_media *rec =
                                (struct cxl_event_gen_media *)record;
 
                trace_cxl_general_media(cxlmd, type, id, rec);
-       } else if (uuid_equal(id, &dram_event_uuid)) {
+       } else if (uuid_equal(id, &CXL_EVENT_DRAM_UUID)) {
                struct cxl_event_dram *rec = (struct cxl_event_dram *)record;
 
                trace_cxl_dram(cxlmd, type, id, rec);
-       } else if (uuid_equal(id, &mem_mod_event_uuid)) {
+       } else if (uuid_equal(id, &CXL_EVENT_MEM_MODULE_UUID)) {
                struct cxl_event_mem_module *rec =
                                (struct cxl_event_mem_module *)record;
 

diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h
index f0e7ebb84f028d146b566c5af814e0cb6cbb327a..27575513ec689a720cf0e53d1fbdea5b296aa546 100644 (file)
--- a/drivers/cxl/cxlmem.h
+++ b/drivers/cxl/cxlmem.h
@@ -580,6 +580,30 @@ struct cxl_mbox_identify {
        u8 qos_telemetry_caps;
 } __packed;
 
+/*
+ * General Media Event Record UUID
+ * CXL rev 3.0 Section 8.2.9.2.1.1; Table 8-43
+ */
+#define CXL_EVENT_GEN_MEDIA_UUID                                            \
+       UUID_INIT(0xfbcd0a77, 0xc260, 0x417f, 0x85, 0xa9, 0x08, 0x8b, 0x16, \
+                 0x21, 0xeb, 0xa6)
+
+/*
+ * DRAM Event Record UUID
+ * CXL rev 3.0 section 8.2.9.2.1.2; Table 8-44
+ */
+#define CXL_EVENT_DRAM_UUID                                                 \
+       UUID_INIT(0x601dcbb3, 0x9c06, 0x4eab, 0xb8, 0xaf, 0x4e, 0x9b, 0xfb, \
+                 0x5c, 0x96, 0x24)
+
+/*
+ * Memory Module Event Record UUID
+ * CXL rev 3.0 section 8.2.9.2.1.3; Table 8-45
+ */
+#define CXL_EVENT_MEM_MODULE_UUID                                           \
+       UUID_INIT(0xfe927475, 0xdd59, 0x4339, 0xa5, 0x86, 0x79, 0xba, 0xb1, \
+                 0x13, 0xb7, 0x74)
+
 /*
  * Get Event Records output payload
  * CXL rev 3.0 section 8.2.9.2.2; Table 8-50

diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c
index ee61fa3a2411f8c2acc7272a20252fad95a8a811..5a95b04b329aeab753e5de8e18e6e69140e161c7 100644 (file)
--- a/tools/testing/cxl/test/mem.c
+++ b/tools/testing/cxl/test/mem.c
@@ -362,8 +362,7 @@ struct cxl_event_record_raw hardware_replace = {
 
 struct cxl_event_gen_media gen_media = {
        .hdr = {
-               .id = UUID_INIT(0xfbcd0a77, 0xc260, 0x417f,
-                               0x85, 0xa9, 0x08, 0x8b, 0x16, 0x21, 0xeb, 0xa6),
+               .id = CXL_EVENT_GEN_MEDIA_UUID,
                .length = sizeof(struct cxl_event_gen_media),
                .flags[0] = CXL_EVENT_RECORD_FLAG_PERMANENT,
                /* .handle = Set dynamically */
@@ -380,8 +379,7 @@ struct cxl_event_gen_media gen_media = {
 
 struct cxl_event_dram dram = {
        .hdr = {
-               .id = UUID_INIT(0x601dcbb3, 0x9c06, 0x4eab,
-                               0xb8, 0xaf, 0x4e, 0x9b, 0xfb, 0x5c, 0x96, 0x24),
+               .id = CXL_EVENT_DRAM_UUID,
                .length = sizeof(struct cxl_event_dram),
                .flags[0] = CXL_EVENT_RECORD_FLAG_PERF_DEGRADED,
                /* .handle = Set dynamically */
@@ -400,8 +398,7 @@ struct cxl_event_dram dram = {
 
 struct cxl_event_mem_module mem_module = {
        .hdr = {
-               .id = UUID_INIT(0xfe927475, 0xdd59, 0x4339,
-                               0xa5, 0x86, 0x79, 0xba, 0xb1, 0x13, 0xb7, 0x74),
+               .id = CXL_EVENT_MEM_MODULE_UUID,
                .length = sizeof(struct cxl_event_mem_module),
                /* .handle = Set dynamically */
                .related_handle = cpu_to_le16(0),