hmm, ok
On 12-11-2026 19:16, Mallesh Koujalagi wrote:
Add a software CPER emission handler for CRI SIGIDs. Keep hardware CPER handling unchanged and return early when the Xe device is unavailable.I think no need to mention this explicitly.
Cc: Badal Nilawar <badal.nilawar@intel.com> Signed-off-by: Mallesh Koujalagi <mallesh.koujalagi@intel.com> --- v3: - Handle early PCI probe where xe device is null. (Sashiko) v4: - Add has_driver_cper flag. (Badal) --- drivers/gpu/drm/xe/xe_cper.c | 22 +++++++++++++++++++++- drivers/gpu/drm/xe/xe_device_types.h | 2 ++ drivers/gpu/drm/xe/xe_pci.c | 2 ++ drivers/gpu/drm/xe/xe_pci_types.h | 1 + 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_cper.c b/drivers/gpu/drm/xe/xe_cper.c index bb90030bcd2d..dd6d4251dd1d 100644 --- a/drivers/gpu/drm/xe/xe_cper.c +++ b/drivers/gpu/drm/xe/xe_cper.c @@ -32,6 +32,11 @@ static bool is_hw_sigid(enum xe_sigid sigid) return in_range(sigid, INTEL_SIGID_GPU_XE_HARDWARE_START, INTEL_SIGID_BATCH); } +static bool is_sw_sigid(enum xe_sigid sigid) +{ + return in_range(sigid, INTEL_SIGID_GPU_XE_SOFTWARE_START, INTEL_SIGID_BATCH); +} + /* CPER platform_id GUIDs (RFC 9562 UUIDv5) for each PCI device ID. */ static const struct xe_device_guid_entry xe_device_guids[] = { { 0x674C, GUID_INIT(0x9046afe5, 0x9041, 0x5124, @@ -240,6 +245,12 @@ static void cper_emit_hw_err(struct xe_device *xe, int cper_sev, enum xe_sigid s xe_cper_emit_counter(xe, cper_sev, sigid, counter, &response); } +static void cper_emit_sw_err(struct xe_device *xe, int cper_sev, enum xe_sigid sigid, + u32 component, u32 location, const void *data, + struct va_format *vaf) +{ +} + /** * xe_cper_emit() - Emit a CPER record for a SIGID log entry * @xe: The &xe_device @@ -268,12 +279,21 @@ void xe_cper_emit(struct xe_device *xe, int cper_sev, enum xe_sigid sigid, u32 component, u32 location, const void *data, size_t len, struct va_format *vaf) { + if (!xe) + return;Add a TO DO to track a future enhancement to handle this using pdev instead of xe.
Ok, will update it like
/* TODO: Handle using pdev instead of xe */
+ if (is_hw_sigid(sigid) && !IS_ERR_OR_NULL(data)) { cper_emit_hw_err(xe, cper_sev, sigid, data); return; } - /* TODO software CPER */ + if (xe->info.has_driver_cper) { + if (is_sw_sigid(sigid) && + (cper_sev == CPER_SEV_RECOVERABLE || + cper_sev == CPER_SEV_FATAL))Nit: Severity check can fit on a single line.
Ok
Thanks Badal!
With comments addressed this is
Reviewed-by: Badal Nilawar <badal.nilawar@intel.com>
Thanks,
Badal+ cper_emit_sw_err(xe, cper_sev, sigid, component, location, data, vaf); + return; + } } static ssize_t cper_on_query_show(struct device *dev, struct device_attribute *attr, char *buf) diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h index 933f5d27aa62..d992ff8d2fc9 100644 --- a/drivers/gpu/drm/xe/xe_device_types.h +++ b/drivers/gpu/drm/xe/xe_device_types.h @@ -170,6 +170,8 @@ struct xe_device { u8 has_device_atomics_on_smem:1; /** @info.has_device_uid: Device supports unique 64-bit GPU SOC ID */ u8 has_device_uid:1; + /** @info.has_driver_cper: Device supports driver-generated CPER records */ + u8 has_driver_cper:1; /** @info.has_drm_ras: Device supports drm_ras (Reliability, Availability, Serviceability) */ u8 has_drm_ras:1; /** @info.has_fan_control: Device supports fan control */ diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c index ce231069880a..c615eddb2abc 100644 --- a/drivers/gpu/drm/xe/xe_pci.c +++ b/drivers/gpu/drm/xe/xe_pci.c @@ -475,6 +475,7 @@ static const struct xe_device_desc cri_desc = { .dma_mask_size = 52, .has_display = false, .has_device_uid = true, + .has_driver_cper = true, .has_drm_ras = true, .has_flat_ccs = false, .has_gsc_nvm = 1, @@ -802,6 +803,7 @@ static int xe_info_init_early(struct xe_device *xe, xe->info.is_dgfx = desc->is_dgfx; xe->info.has_cached_pt = desc->has_cached_pt; xe->info.has_device_uid = desc->has_device_uid; + xe->info.has_driver_cper = desc->has_driver_cper; xe->info.has_drm_ras = desc->has_drm_ras; xe->info.has_fan_control = desc->has_fan_control; xe->info.has_fixed_vram_channels = desc->has_fixed_vram_channels; diff --git a/drivers/gpu/drm/xe/xe_pci_types.h b/drivers/gpu/drm/xe/xe_pci_types.h index 74a6cd461b21..e7bf46ea729f 100644 --- a/drivers/gpu/drm/xe/xe_pci_types.h +++ b/drivers/gpu/drm/xe/xe_pci_types.h @@ -42,6 +42,7 @@ struct xe_device_desc { u8 has_cached_pt:1; u8 has_display:1; u8 has_device_uid:1; + u8 has_driver_cper:1; u8 has_drm_ras:1; u8 has_fan_control:1; u8 has_fixed_vram_channels:1;