drm/i915/guc: (re)initialise doorbell h/w when enabling GuC submission

During a hibernate/resume cycle, the whole system is reset, including
the GuC and the doorbell hardware. Then the system is booted up, drivers
are loaded, etc -- the GuC firmware may be loaded and set running at
this point. But then, the booted kernel is replaced by the hibernated
image, and this resumed kernel will also try to reload the GuC firmware
(which will fail). To recover, we reset the GuC and try again (which
should work). But this GuC reset doesn't also reset the doorbell
hardware, so it can be left in a state inconsistent with that assumed
by the driver and/or the newly-loaded GuC firmware.

It would be better if the GuC reset also cleared all doorbell state,
but that's not how the hardware currently works; also, the driver cannot
directly reprogram the doorbell hardware (only the GuC can do that).

So this patch cycles through all doorbells, assigning and releasing each
in turn, so that all the doorbell hardware is left in a consistent
state, no matter how it was programmed by the previously-running kernel
and/or GuC firmware.

v2: don't use kmap_atomic() now that client page 0 is kept mapped.

Signed-off-by: Dave Gordon <david.s.gordon@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1465837054-16245-2-git-send-email-david.s.gordon@intel.com

diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c
index a25250570bb5de6a01c4ff6eef6cb48194ddbde1..22a55ac4e51c32d27e9c17a07b4303c85e656bc6 100644 (file)
--- a/drivers/gpu/drm/i915/i915_guc_submission.c
+++ b/drivers/gpu/drm/i915/i915_guc_submission.c
@@ -693,6 +693,48 @@ guc_client_free(struct drm_i915_private *dev_priv,
        kfree(client);
 }
 
+/*
+ * Borrow the first client to set up & tear down every doorbell
+ * in turn, to ensure that all doorbell h/w is (re)initialised.
+ */
+static void guc_init_doorbell_hw(struct intel_guc *guc)
+{
+       struct drm_i915_private *dev_priv = guc_to_i915(guc);
+       struct i915_guc_client *client = guc->execbuf_client;
+       uint16_t db_id, i;
+       int err;
+
+       db_id = client->doorbell_id;
+
+       for (i = 0; i < GUC_MAX_DOORBELLS; ++i) {
+               i915_reg_t drbreg = GEN8_DRBREGL(i);
+               u32 value = I915_READ(drbreg);
+
+               err = guc_update_doorbell_id(guc, client, i);
+
+               /* Report update failure or unexpectedly active doorbell */
+               if (err || (i != db_id && (value & GUC_DOORBELL_ENABLED)))
+                       DRM_DEBUG_DRIVER("Doorbell %d (reg 0x%x) was 0x%x, err %d\n",
+                                         i, drbreg.reg, value, err);
+       }
+
+       /* Restore to original value */
+       err = guc_update_doorbell_id(guc, client, db_id);
+       if (err)
+               DRM_ERROR("Failed to restore doorbell to %d, err %d\n",
+                       db_id, err);
+
+       for (i = 0; i < GUC_MAX_DOORBELLS; ++i) {
+               i915_reg_t drbreg = GEN8_DRBREGL(i);
+               u32 value = I915_READ(drbreg);
+
+               if (i != db_id && (value & GUC_DOORBELL_ENABLED))
+                       DRM_DEBUG_DRIVER("Doorbell %d (reg 0x%x) finally 0x%x\n",
+                                         i, drbreg.reg, value);
+
+       }
+}
+
 /**
  * guc_client_alloc() - Allocate an i915_guc_client
  * @dev_priv:  driver private data structure
@@ -956,8 +998,8 @@ int i915_guc_submission_enable(struct drm_i915_private *dev_priv)
        }
 
        guc->execbuf_client = client;
-
        host2guc_sample_forcewake(guc, client);
+       guc_init_doorbell_hw(guc);
 
        return 0;
 }