Skip to content

Commit d99f138

Browse files
weiny2davejiang
authored andcommitted
cxl/cper: Remove duplicated GUID defines
Commit 54ce192 ("cxl/cper: Fix errant CPER prints for CXL events") moved the CXL CPER section defines to include/linux/cper.h from ghes.c When the latest cxl/cper series was reworked those defines were kept in ghes.c by accident. Thus they were duplicated. Delete the duplicate defines keeping them in the header to be shared between efi and apei. Suggested-by: Fabio M. De Francesco <[email protected]> Signed-off-by: Ira Weiny <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dave Jiang <[email protected]>
1 parent 5511147 commit d99f138

File tree

1 file changed

+0
-26
lines changed

1 file changed

+0
-26
lines changed

drivers/acpi/apei/ghes.c

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -676,32 +676,6 @@ static void ghes_defer_non_standard_event(struct acpi_hest_generic_data *gdata,
676676
schedule_work(&entry->work);
677677
}
678678

679-
/* CXL Event record UUIDs are formated as GUIDs and reported in section type */
680-
681-
/*
682-
* General Media Event Record
683-
* CXL rev 3.0 Section 8.2.9.2.1.1; Table 8-43
684-
*/
685-
#define CPER_SEC_CXL_GEN_MEDIA_GUID \
686-
GUID_INIT(0xfbcd0a77, 0xc260, 0x417f, \
687-
0x85, 0xa9, 0x08, 0x8b, 0x16, 0x21, 0xeb, 0xa6)
688-
689-
/*
690-
* DRAM Event Record
691-
* CXL rev 3.0 section 8.2.9.2.1.2; Table 8-44
692-
*/
693-
#define CPER_SEC_CXL_DRAM_GUID \
694-
GUID_INIT(0x601dcbb3, 0x9c06, 0x4eab, \
695-
0xb8, 0xaf, 0x4e, 0x9b, 0xfb, 0x5c, 0x96, 0x24)
696-
697-
/*
698-
* Memory Module Event Record
699-
* CXL rev 3.0 section 8.2.9.2.1.3; Table 8-45
700-
*/
701-
#define CPER_SEC_CXL_MEM_MODULE_GUID \
702-
GUID_INIT(0xfe927475, 0xdd59, 0x4339, \
703-
0xa5, 0x86, 0x79, 0xba, 0xb1, 0x13, 0xb7, 0x74)
704-
705679
/* Room for 8 entries for each of the 4 event log queues */
706680
#define CXL_CPER_FIFO_DEPTH 32
707681
DEFINE_KFIFO(cxl_cper_fifo, struct cxl_cper_work_data, CXL_CPER_FIFO_DEPTH);

0 commit comments

Comments
 (0)