Display driver classification details for software CPER records
in the fake CPER emitter used by KUnit tests.
Cc: Badal Nilawar <badal.nilawar@intel.com>
Signed-off-by: Mallesh Koujalagi <mallesh.koujalagi@intel.com>
---
drivers/gpu/drm/xe/tests/xe_log_kunit.c | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/xe/tests/xe_log_kunit.c b/drivers/gpu/drm/xe/tests/xe_log_kunit.c
index 56c36c8a08e1..08828ecc9098 100644
--- a/drivers/gpu/drm/xe/tests/xe_log_kunit.c
+++ b/drivers/gpu/drm/xe/tests/xe_log_kunit.c
@@ -6,11 +6,14 @@
#include <kunit/static_stub.h>
#include <kunit/test.h>
#include <kunit/test-bug.h>
+#include <linux/minmax.h>
#include "tests/xe_kunit_helpers.h"
#include "tests/xe_pci_test.h"
+#include "xe_cper.h"
#include "xe_device.h"
#include "xe_log.h"
+#include "xe_ras_types.h"
static void nop_dmesg_vprintk(struct pci_dev *pdev, int cper_sev, struct va_format *vaf)
{
@@ -43,6 +46,19 @@ static const char *location_type(u32 location)
location ? "?" : "";
}
+static bool is_sw_cper(enum xe_sigid sigid)
+{
+ return in_range(sigid, INTEL_SIGID_GPU_XE_SOFTWARE_START, INTEL_SIGID_BATCH);
+}
+
+static void fake_emit_sw_cper(int cper_sev, u32 component, u32 location, const void *data)
+{
+ /* mirrors xe_cper_driver_error_class: full 16-bit component/tile, unconditional */
+ pr_info("SW CPER CLASS=severity:%u component:%u tile:%u cause:%u\n",
+ cper_sev, (u16)component, (u16)location,
+ IS_ERR(data) ? (u32)-PTR_ERR(data) : 0);
This only prints the driver error classification fields and
doesn't actually emit a fake CPER record. Do we need to call this
fake_emit_sw_cper()?
I think this was introduced when CPER doesn't exist. Now does this
test needed?
Thanks,
Badal
+}
+
static void fake_emit_cper(struct pci_dev *pdev, int cper_sev,
enum xe_sigid sigid, u32 component, u32 location,
const void *data, size_t len, struct va_format *vaf)
@@ -51,7 +67,8 @@ static void fake_emit_cper(struct pci_dev *pdev, int cper_sev,
int n;
pr_info("\n");
- pr_info("CPER SEV=%u SIGID=%u\n", cper_sev, sigid);
+ pr_info("CPER SEV=%u SIGID=%u \t# %s\n", cper_sev, sigid,
+ is_sw_cper(sigid) ? "software" : "");
pr_info("CPER DEVICE=%s\n", dev_name(&pdev->dev));
if (location)
pr_info("CPER LOCATION=%#x \t# %s.%u\n",
@@ -68,6 +85,8 @@ static void fake_emit_cper(struct pci_dev *pdev, int cper_sev,
n = vscnprintf(msg, sizeof(msg), vaf->fmt, *vaf->va);
print_hex_dump(KERN_INFO, "CPER MSG=", DUMP_PREFIX_OFFSET, 16, 1, msg, n, true);
+ if (is_sw_cper(sigid))
+ fake_emit_sw_cper(cper_sev, component, location, data);
pr_info("CPER END\n");
}