Skip to content

Commit 6cdbd84

Browse files
shijujose4davejiang
authored andcommitted
cxl/test: Update test code for event records to CXL spec rev 3.1
Update test code for General Media, DRAM, Memory Module Event Records to CXL spec rev 3.1. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Ira Weiny <ira.weiny@intel.com> Tested-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Shiju Jose <shiju.jose@huawei.com> Link: https://patch.msgid.link/20250111091756.1682-7-shiju.jose@huawei.com Signed-off-by: Dave Jiang <dave.jiang@intel.com>
1 parent 4c6e20e commit 6cdbd84

File tree

1 file changed

+20
-3
lines changed
  • tools/testing/cxl/test

1 file changed

+20
-3
lines changed

tools/testing/cxl/test/mem.c

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,10 @@ struct cxl_test_gen_media gen_media = {
401401
.channel = 1,
402402
.rank = 30,
403403
},
404+
.component_id = { 0x3, 0x74, 0xc5, 0x8, 0x9a, 0x1a, 0xb, 0xfc, 0xd2, 0x7e, 0x2f, 0x31, 0x9b, 0x3c, 0x81, 0x4d },
405+
.cme_threshold_ev_flags = 3,
406+
.cme_count = { 33, 0, 0 },
407+
.sub_type = 0x2,
404408
},
405409
};
406410

@@ -429,6 +433,11 @@ struct cxl_test_dram dram = {
429433
.bank_group = 5,
430434
.bank = 2,
431435
.column = {0xDE, 0xAD},
436+
.component_id = { 0x1, 0x74, 0xc5, 0x8, 0x9a, 0x1a, 0xb, 0xfc, 0xd2, 0x7e, 0x2f, 0x31, 0x9b, 0x3c, 0x81, 0x4d },
437+
.sub_channel = 8,
438+
.cme_threshold_ev_flags = 2,
439+
.cvme_count = { 14, 0, 0 },
440+
.sub_type = 0x5,
432441
},
433442
};
434443

@@ -456,7 +465,10 @@ struct cxl_test_mem_module mem_module = {
456465
.dirty_shutdown_cnt = { 0xde, 0xad, 0xbe, 0xef },
457466
.cor_vol_err_cnt = { 0xde, 0xad, 0xbe, 0xef },
458467
.cor_per_err_cnt = { 0xde, 0xad, 0xbe, 0xef },
459-
}
468+
},
469+
/* .validity_flags = <set below> */
470+
.component_id = { 0x2, 0x74, 0xc5, 0x8, 0x9a, 0x1a, 0xb, 0xfc, 0xd2, 0x7e, 0x2f, 0x31, 0x9b, 0x3c, 0x81, 0x4d },
471+
.event_sub_type = 0x3,
460472
},
461473
};
462474

@@ -478,13 +490,18 @@ static int mock_set_timestamp(struct cxl_dev_state *cxlds,
478490

479491
static void cxl_mock_add_event_logs(struct mock_event_store *mes)
480492
{
481-
put_unaligned_le16(CXL_GMER_VALID_CHANNEL | CXL_GMER_VALID_RANK,
493+
put_unaligned_le16(CXL_GMER_VALID_CHANNEL | CXL_GMER_VALID_RANK |
494+
CXL_GMER_VALID_COMPONENT | CXL_GMER_VALID_COMPONENT_ID_FORMAT,
482495
&gen_media.rec.media_hdr.validity_flags);
483496

484497
put_unaligned_le16(CXL_DER_VALID_CHANNEL | CXL_DER_VALID_BANK_GROUP |
485-
CXL_DER_VALID_BANK | CXL_DER_VALID_COLUMN,
498+
CXL_DER_VALID_BANK | CXL_DER_VALID_COLUMN | CXL_DER_VALID_SUB_CHANNEL |
499+
CXL_DER_VALID_COMPONENT | CXL_DER_VALID_COMPONENT_ID_FORMAT,
486500
&dram.rec.media_hdr.validity_flags);
487501

502+
put_unaligned_le16(CXL_MMER_VALID_COMPONENT | CXL_MMER_VALID_COMPONENT_ID_FORMAT,
503+
&mem_module.rec.validity_flags);
504+
488505
mes_add_event(mes, CXL_EVENT_TYPE_INFO, &maint_needed);
489506
mes_add_event(mes, CXL_EVENT_TYPE_INFO,
490507
(struct cxl_event_record_raw *)&gen_media);

0 commit comments

Comments
 (0)