Commit d99f1384 authored by Ira Weiny's avatar Ira Weiny Committed by Dave Jiang
Browse files

cxl/cper: Remove duplicated GUID defines 



Commit 54ce1927 ("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: default avatarFabio M. De Francesco <fabio.maria.de.francesco@intel.com>
Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Link: https://lore.kernel.org/r/20240502-cper-fix-dup-guid-v1-1-283cc447c7bf@intel.com


Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
parent 55111470

drivers/acpi/apei/ghes.c

+0 −26
Original line number Diff line number Diff line
@@ -676,32 +676,6 @@ static void ghes_defer_non_standard_event(struct acpi_hest_generic_data *gdata, 
	schedule_work(&entry->work);

}



/* CXL Event record UUIDs are formated as GUIDs and reported in section type */



/*

 * General Media Event Record

 * CXL rev 3.0 Section 8.2.9.2.1.1; Table 8-43

 */

#define CPER_SEC_CXL_GEN_MEDIA_GUID					\

	GUID_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

 */

#define CPER_SEC_CXL_DRAM_GUID						\

	GUID_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

 */

#define CPER_SEC_CXL_MEM_MODULE_GUID					\

	GUID_INIT(0xfe927475, 0xdd59, 0x4339,				\

		  0xa5, 0x86, 0x79, 0xba, 0xb1, 0x13, 0xb7, 0x74)



/* Room for 8 entries for each of the 4 event log queues */

#define CXL_CPER_FIFO_DEPTH 32

DEFINE_KFIFO(cxl_cper_fifo, struct cxl_cper_work_data, CXL_CPER_FIFO_DEPTH);