Dan Williams wrote: > Initial tests with the CXL CPER implementation identified that error > reports were being duplicated in the log and the trace event [1]. Then > it was discovered that the notification handler took sleeping locks > while the GHES event handling runs in spin_lock_irqsave() context [2] > > Given multiple bugs to fix and how late it is in the development cycle, > remove the CXL hookup for now and try again during the next merge > window. > > Cc: Ard Biesheuvel <ardb@xxxxxxxxxx> > Cc: Rafael J. Wysocki <rafael@xxxxxxxxxx> > Cc: Ira Weiny <ira.weiny@xxxxxxxxx> > Cc: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx> > Link: http://lore.kernel.org/r/20240108165855.00002f5a@xxxxxxxxxx [1] > Closes: http://lore.kernel.org/r/b963c490-2c13-4b79-bbe7-34c6568423c7@moroto.mountain [2] > Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx> Dan should we add the following hunk to remove that dead code for now? With or without this hunk. Reviewed-by: Ira Weiny <ira.weiny@xxxxxxxxx> diff --git a/include/linux/cxl-event.h b/include/linux/cxl-event.h index 03fa6d50d46f..f4934d0d1fb2 100644 --- a/include/linux/cxl-event.h +++ b/include/linux/cxl-event.h @@ -114,30 +114,4 @@ enum cxl_event_type { CXL_CPER_EVENT_MEM_MODULE, }; -#define CPER_CXL_DEVICE_ID_VALID BIT(0) -#define CPER_CXL_DEVICE_SN_VALID BIT(1) -#define CPER_CXL_COMP_EVENT_LOG_VALID BIT(2) -struct cxl_cper_event_rec { - struct { - u32 length; - u64 validation_bits; - struct cper_cxl_event_devid { - u16 vendor_id; - u16 device_id; - u8 func_num; - u8 device_num; - u8 bus_num; - u16 segment_num; - u16 slot_num; /* bits 2:0 reserved */ - u8 reserved; - } __packed device_id; - struct cper_cxl_event_sn { - u32 lower_dw; - u32 upper_dw; - } __packed dev_serial_num; - } __packed hdr; - - union cxl_event event; -} __packed; - #endif /* _LINUX_CXL_EVENT_H */