[Intel-xe] [PATCH 05/11] drm/xe: Add GuC CT snapshot to xe_devcoredump.
Rodrigo Vivi
rodrigo.vivi at intel.com
Mon May 8 17:06:10 UTC 2023
Let's start to move our existent logs to devcoredump one by
one. Any format change should come on follow-up work.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
Reviewed-by: Matthew Brost <matthew.brost at intel.com>
---
drivers/gpu/drm/xe/xe_devcoredump.c | 14 ++++++++++++++
drivers/gpu/drm/xe/xe_devcoredump_types.h | 4 ++++
2 files changed, 18 insertions(+)
diff --git a/drivers/gpu/drm/xe/xe_devcoredump.c b/drivers/gpu/drm/xe/xe_devcoredump.c
index ae6ce92682e8..05e19ee1ced0 100644
--- a/drivers/gpu/drm/xe/xe_devcoredump.c
+++ b/drivers/gpu/drm/xe/xe_devcoredump.c
@@ -11,6 +11,7 @@
#include "xe_engine.h"
#include "xe_gt.h"
+#include "xe_guc_ct.h"
/**
* DOC: Xe device coredump
@@ -47,6 +48,11 @@ static struct xe_device *coredump_to_xe(const struct xe_devcoredump *coredump)
return container_of(coredump, struct xe_device, devcoredump);
}
+static struct xe_guc *engine_to_guc(struct xe_engine *e)
+{
+ return &e->gt->uc.guc;
+}
+
static ssize_t xe_devcoredump_read(char *buffer, loff_t offset,
size_t count, void *data, size_t datalen)
{
@@ -81,6 +87,9 @@ static ssize_t xe_devcoredump_read(char *buffer, loff_t offset,
ts = ktime_to_timespec64(ktime_sub(ss->snapshot_time, ss->boot_time));
drm_printf(&p, "Uptime: %lld.%09ld\n", ts.tv_sec, ts.tv_nsec);
+ drm_printf(&p, "\n**** GuC CT ****\n");
+ xe_guc_ct_snapshot_print(coredump->snapshot.ct, &p);
+
mutex_unlock(&coredump->lock);
return count - iter.remain;
@@ -96,6 +105,8 @@ static void xe_devcoredump_free(void *data)
mutex_lock(&coredump->lock);
+ xe_guc_ct_snapshot_free(coredump->snapshot.ct);
+
coredump->faulty_engine = NULL;
drm_info(&coredump_to_xe(coredump)->drm,
"Xe device coredump has been deleted.\n");
@@ -106,10 +117,13 @@ static void xe_devcoredump_free(void *data)
static void devcoredump_snapshot(struct xe_devcoredump *coredump)
{
struct xe_devcoredump_snapshot *ss = &coredump->snapshot;
+ struct xe_guc *guc = engine_to_guc(coredump->faulty_engine);
lockdep_assert_held(&coredump->lock);
ss->snapshot_time = ktime_get_real();
ss->boot_time = ktime_get_boottime();
+
+ coredump->snapshot.ct = xe_guc_ct_snapshot_capture(&guc->ct, true);
}
/**
diff --git a/drivers/gpu/drm/xe/xe_devcoredump_types.h b/drivers/gpu/drm/xe/xe_devcoredump_types.h
index 3f395fa9104e..1e44d5346364 100644
--- a/drivers/gpu/drm/xe/xe_devcoredump_types.h
+++ b/drivers/gpu/drm/xe/xe_devcoredump_types.h
@@ -23,6 +23,10 @@ struct xe_devcoredump_snapshot {
ktime_t snapshot_time;
/** @boot_time: Relative boot time so the uptime can be calculated. */
ktime_t boot_time;
+
+ /* GuC snapshots */
+ /** @ct_snapshot: GuC CT snapshot */
+ struct xe_guc_ct_snapshot *ct;
};
/**
--
2.39.2
More information about the Intel-xe
mailing list