From 33cc29e3dc0e6530a1eb0a318ff7a414c0c21068 Mon Sep 17 00:00:00 2001 From: Michal Wajdeczko Date: Fri, 14 Aug 2026 19:17:47 +0200 Subject: [PATCH] drm/xe/survivability: Report sysfs failure in one place If we fail to create any of the survivability sysfs files, actual error is reported by the caller. Move that reporting to sysfs helper. Signed-off-by: Michal Wajdeczko Cc: Rodrigo Vivi Cc: Riana Tauro Cc: Aravind Iddamsetty Cc: Mallesh Koujalagi Reviewed-by: Rodrigo Vivi Link: https://patch.msgid.link/20260814171801.13347-22-michal.wajdeczko@intel.com Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/xe/xe_survivability_mode.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_survivability_mode.c b/drivers/gpu/drm/xe/xe_survivability_mode.c index 0ace10ae500a..8b74bbc96390 100644 --- a/drivers/gpu/drm/xe/xe_survivability_mode.c +++ b/drivers/gpu/drm/xe/xe_survivability_mode.c @@ -18,6 +18,7 @@ #include "xe_mmio.h" #include "xe_nvm.h" #include "xe_pcode_api.h" +#include "xe_printk.h" #include "xe_vsec.h" /** @@ -309,24 +310,26 @@ static int create_survivability_sysfs(struct pci_dev *pdev) int ret; ret = device_create_file(dev, &dev_attr_survivability_mode); - if (ret) { - dev_warn(dev, "Failed to create survivability sysfs files\n"); - return ret; - } + if (ret) + goto failed; ret = devm_add_action_or_reset(xe->drm.dev, xe_survivability_mode_fini, xe); if (ret) - return ret; + goto failed; /* Survivability info is not required if enabled via configfs */ if (!xe_configfs_get_survivability_mode(pdev)) { ret = devm_device_add_group(dev, &survivability_info_group); if (ret) - return ret; + goto failed; } return 0; + +failed: + xe_err(xe, "Failed to create survivability sysfs files: %pe\n", ERR_PTR(ret)); + return ret; } static int enable_boot_survivability_mode(struct pci_dev *pdev) @@ -432,9 +435,7 @@ void xe_survivability_mode_runtime_enable(struct xe_device *xe) } populate_survivability_info(xe); - - if (create_survivability_sysfs(pdev)) - dev_err(&pdev->dev, "Failed to create survivability sysfs\n"); + create_survivability_sysfs(pdev); survivability->type = XE_SURVIVABILITY_TYPE_RUNTIME; dev_err(&pdev->dev, "Runtime Survivability mode enabled\n");