[Intel-gfx] [PATCH 10/12] drm/i915/guc: Improved reporting when GuC fails to load

[John . C . Harrison]

From: John Harrison <john.c.harri...@intel.com>

Rather than just saying 'GuC failed to load: -110', actually print out
the GuC status register and break it down into the individual fields.

Signed-off-by: John Harrison <john.c.harri...@intel.com>
---
 drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 27 ++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c 
b/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c
index d4a87f4c9421..eac84baf34e6 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c
@@ -74,8 +74,9 @@ static inline bool guc_ready(struct intel_uncore *uncore, u32 
*status)
                ((val & GS_MIA_CORE_STATE) && (uk_val == 
GS_UKERNEL_LAPIC_DONE));
 }
 
-static int guc_wait_ucode(struct intel_uncore *uncore)
+static int guc_wait_ucode(struct intel_gt *gt)
 {
+       struct intel_uncore *uncore = gt->uncore;
        u32 status;
        int ret;
 
@@ -91,16 +92,32 @@ static int guc_wait_ucode(struct intel_uncore *uncore)
        DRM_DEBUG_DRIVER("GuC status %#x\n", status);
 
        if ((status & GS_BOOTROM_MASK) == GS_BOOTROM_RSA_FAILED) {
-               DRM_ERROR("GuC firmware signature verification failed\n");
+               drm_err(&gt->i915->drm, "GuC firmware signature verification 
failed\n");
                ret = -ENOEXEC;
+               goto out;
        }
 
        if ((status & GS_UKERNEL_MASK) == GS_UKERNEL_EXCEPTION) {
-               DRM_ERROR("GuC firmware exception. EIP: %#x\n",
-                         intel_uncore_read(uncore, SOFT_SCRATCH(13)));
+               drm_err(&gt->i915->drm, "GuC firmware exception. EIP: %#x\n",
+                       intel_uncore_read(uncore, SOFT_SCRATCH(13)));
                ret = -ENXIO;
+               goto out;
        }
 
+       if (ret) {
+               drm_err(&gt->i915->drm, "GuC load failed: status: Reset = %d, "
+                       "BootROM = 0x%02X, UKernel = 0x%02X, "
+                       "MIA = 0x%02X, Auth = 0x%02X\n",
+                       (status >> GS_RESET_SHIFT) & 1,
+                       (status & GS_BOOTROM_MASK) >> GS_BOOTROM_SHIFT,
+                       (status & GS_UKERNEL_MASK) >> GS_UKERNEL_SHIFT,
+                       (status & GS_MIA_MASK) >> GS_MIA_SHIFT,
+                       (status & GS_AUTH_STATUS_MASK) >> GS_AUTH_STATUS_SHIFT);
+       }
+
+out:
+       if (ret)
+               drm_err(&gt->i915->drm, "GuC load failed: status = 0x%08X\n", 
status);
        return ret;
 }
 
@@ -139,7 +156,7 @@ int intel_guc_fw_upload(struct intel_guc *guc)
        if (ret)
                goto out;
 
-       ret = guc_wait_ucode(uncore);
+       ret = guc_wait_ucode(gt);
        if (ret)
                goto out;
 
-- 
2.25.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx