From: Sagar Arun Kamble <sagar.a.kamble@xxxxxxxxx>
GuC ukernel sends an interrupt to Host to flush the log buffer
and expects Host to correspondingly update the read pointer
information in the state structure, once it has consumed the
log buffer contents by copying them to a file or buffer.
Even if Host couldn't copy the contents, it can still update the
read pointer so that logging state is not disturbed on GuC side.
Signed-off-by: Sagar Arun Kamble <sagar.a.kamble@xxxxxxxxx>
Signed-off-by: Akash Goel <akash.goel@xxxxxxxxx>
---
drivers/gpu/drm/i915/i915_guc_submission.c | 72 ++++++++++++++++++++++++++++++
drivers/gpu/drm/i915/i915_irq.c | 19 +++++++-
drivers/gpu/drm/i915/intel_guc.h | 1 +
3 files changed, 91 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c
index 8105ddd..b95a510 100644
--- a/drivers/gpu/drm/i915/i915_guc_submission.c
+++ b/drivers/gpu/drm/i915/i915_guc_submission.c
@@ -819,6 +819,65 @@ err:
return NULL;
}
+static void* guc_get_write_buffer(struct intel_guc *guc)
+{
+ return NULL;
+}
+
+static void guc_read_update_log_buffer(struct drm_device *dev)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ struct intel_guc *guc = &dev_priv->guc;
+ struct guc_log_buffer_state *log_buffer_state;
+ struct guc_log_buffer_state *log_buffer_copy_state;
+ void *src_ptr, *dst_ptr;
+ int i;
+
+ if (!guc->log_obj)
+ return;
+
+ log_buffer_state = src_ptr =
+ kmap_atomic(i915_gem_object_get_page(guc->log_obj, 0));
+
+ /* Get the pointer to local buffer to store the logs */
+ dst_ptr = log_buffer_copy_state = guc_get_write_buffer(guc);
+ if (log_buffer_copy_state)
+ memcpy(log_buffer_copy_state, log_buffer_state, PAGE_SIZE);
+
+ for (i = 0; i < GUC_MAX_LOG_BUFFER; i++) {
+ /* Update the read pointer in the shared log buffer */
+ log_buffer_state->read_ptr =
+ log_buffer_state->sampled_write_ptr;
+
+ /* Clear the 'flush to file' flag */
+ log_buffer_state->flush_to_file = 0;
+ log_buffer_state++;
+
+ if (!log_buffer_copy_state)
+ continue;
+
+ /* The write pointer could have been updated by the GuC firmware,
+ * after sending the flush interrupt to Host, for consistency
+ * set the write pointer value to same value of sampled_write_ptr
+ * in the snapshot buffer.
+ */
+ log_buffer_copy_state->write_ptr =
+ log_buffer_copy_state->sampled_write_ptr;
+
+ log_buffer_copy_state++;
+ }
+
+ kunmap_atomic(src_ptr);
+
+ /* Now copy the actual logs */
+ for (i=1; (i < guc->log_obj->base.size / PAGE_SIZE) && dst_ptr; i++) {
+ dst_ptr += PAGE_SIZE;
+ src_ptr = kmap_atomic(i915_gem_object_get_page(guc->log_obj, i));
+ memcpy(dst_ptr, src_ptr, PAGE_SIZE);
+ kunmap_atomic(src_ptr);
+ }
+}
+
static void guc_create_log(struct intel_guc *guc)
{
struct drm_i915_private *dev_priv = guc_to_i915(guc);
@@ -1078,3 +1137,16 @@ int intel_guc_resume(struct drm_device *dev)
return host2guc_action(guc, data, ARRAY_SIZE(data));
}
+
+void i915_guc_capture_logs(struct drm_device *dev)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ struct intel_guc *guc = &dev_priv->guc;
+ u32 data[1];
+
+ guc_read_update_log_buffer(dev);
+
+ data[0] = HOST2GUC_ACTION_LOG_BUFFER_FILE_FLUSH_COMPLETE;
+ if (host2guc_action(guc, data, 1))
+ DRM_ERROR("Failed\n");
+}
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 3043e45..bda9093 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1237,6 +1237,7 @@ static void gen9_guc2host_events_work(struct work_struct *work)
{
struct drm_i915_private *dev_priv =
container_of(work, struct drm_i915_private, guc.events_work);
+ u32 msg;
spin_lock_irq(&dev_priv->irq_lock);
/* Speed up work cancelation during disabling guc interrupts. */
@@ -1256,7 +1257,23 @@ static void gen9_guc2host_events_work(struct work_struct *work)
gen6_enable_pm_irq(dev_priv, GEN9_GUC_TO_HOST_INT_EVENT);
spin_unlock_irq(&dev_priv->irq_lock);
- /* TODO: Handle the events for which GuC interrupted host */
+ /* Determine why GuC interrupted host and process */
+ msg = I915_READ(SOFT_SCRATCH(15));
+ if (msg & (GUC2HOST_MSG_CRASH_DUMP_POSTED |
+ GUC2HOST_MSG_FLUSH_LOG_BUFFER)) {
+ i915_guc_capture_logs(dev_priv->dev);
+
+ /* Clear GuC to Host msg bits that are handled */
+ if (msg & GUC2HOST_MSG_FLUSH_LOG_BUFFER)
+ I915_WRITE(SOFT_SCRATCH(15),
+ I915_READ(SOFT_SCRATCH(15)) &
+ ~GUC2HOST_MSG_FLUSH_LOG_BUFFER);
+
+ if (msg & GUC2HOST_MSG_CRASH_DUMP_POSTED)
+ I915_WRITE(SOFT_SCRATCH(15),
+ I915_READ(SOFT_SCRATCH(15)) &
+ ~GUC2HOST_MSG_CRASH_DUMP_POSTED);
+ }
intel_runtime_pm_put(dev_priv);
}
diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h
index ae787e2..b20e167 100644
--- a/drivers/gpu/drm/i915/intel_guc.h
+++ b/drivers/gpu/drm/i915/intel_guc.h
@@ -168,5 +168,6 @@ int i915_guc_wq_check_space(struct drm_i915_gem_request *rq);
int i915_guc_submit(struct drm_i915_gem_request *rq);
void i915_guc_submission_disable(struct drm_i915_private *dev_priv);
void i915_guc_submission_fini(struct drm_i915_private *dev_priv);
+void i915_guc_capture_logs(struct drm_device *dev);
#endif
--
1.9.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
