All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v7] drm/xe/uc: Disable GuC communication on hardware initialization error.
@ 2025-07-01  2:13 Zhanjun Dong
  2025-07-01  8:16 ` ✓ CI.KUnit: success for drm/xe/uc: Disable GuC communication on hardware initialization error. (rev5) Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Zhanjun Dong @ 2025-07-01  2:13 UTC (permalink / raw)
  To: intel-xe; +Cc: Zhanjun Dong, Michal Wajdeczko, Stuart Summers, Jonathan Cavitt

Disable GuC communication on Xe micro controller hardware initialization
error.

Signed-off-by: Zhanjun Dong <zhanjun.dong@intel.com>
Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/4917

---
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Stuart Summers <stuart.summers@intel.com>
Cc: Jonathan Cavitt <jonathan.cavitt@intel.com>

Change list:
v7: Add kernel-doc for xe_guc_disable_communication
    Unset submission_state.enabled as well
v6: Skip disable ct on xe_guc_enable_communication error
v5: Set wedge is excessive action, revert back to disable ct
v4: Fix typo and add new line
v3: v2 CI re-run
v2: Remove unnecessary jump to err-out
    Drop disable ct, switch to set wedge
---
 drivers/gpu/drm/xe/xe_guc.c | 12 ++++++++++++
 drivers/gpu/drm/xe/xe_guc.h |  1 +
 drivers/gpu/drm/xe/xe_uc.c  | 19 ++++++++++++++-----
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
index 8573957facae..634a70262727 100644
--- a/drivers/gpu/drm/xe/xe_guc.c
+++ b/drivers/gpu/drm/xe/xe_guc.c
@@ -1337,6 +1337,18 @@ int xe_guc_enable_communication(struct xe_guc *guc)
 	return 0;
 }
 
+/**
+ * xe_guc_disable_communication - Disable GuC communication
+ * @guc: The GuC object
+ *
+ * This function will disable the GuC communication.
+ */
+void xe_guc_disable_communication(struct xe_guc *guc)
+{
+	guc->submission_state.enabled = false;
+	xe_guc_ct_disable(&guc->ct);
+}
+
 int xe_guc_suspend(struct xe_guc *guc)
 {
 	struct xe_gt *gt = guc_to_gt(guc);
diff --git a/drivers/gpu/drm/xe/xe_guc.h b/drivers/gpu/drm/xe/xe_guc.h
index 22cf019a11bf..20823b821f7d 100644
--- a/drivers/gpu/drm/xe/xe_guc.h
+++ b/drivers/gpu/drm/xe/xe_guc.h
@@ -34,6 +34,7 @@ int xe_guc_reset(struct xe_guc *guc);
 int xe_guc_upload(struct xe_guc *guc);
 int xe_guc_min_load_for_hwconfig(struct xe_guc *guc);
 int xe_guc_enable_communication(struct xe_guc *guc);
+void xe_guc_disable_communication(struct xe_guc *guc);
 int xe_guc_opt_in_features_enable(struct xe_guc *guc);
 int xe_guc_suspend(struct xe_guc *guc);
 void xe_guc_notify(struct xe_guc *guc);
diff --git a/drivers/gpu/drm/xe/xe_uc.c b/drivers/gpu/drm/xe/xe_uc.c
index 6431ba3a2c53..1012fe84b379 100644
--- a/drivers/gpu/drm/xe/xe_uc.c
+++ b/drivers/gpu/drm/xe/xe_uc.c
@@ -13,6 +13,7 @@
 #include "xe_gt_printk.h"
 #include "xe_gt_sriov_vf.h"
 #include "xe_guc.h"
+#include "xe_guc_ct.h"
 #include "xe_guc_pc.h"
 #include "xe_guc_engine_activity.h"
 #include "xe_huc.h"
@@ -158,7 +159,7 @@ static int vf_uc_load_hw(struct xe_uc *uc)
 
 	err = xe_gt_sriov_vf_connect(uc_to_gt(uc));
 	if (err)
-		return err;
+		goto err_out;
 
 	uc->guc.submission_state.enabled = true;
 
@@ -168,9 +169,13 @@ static int vf_uc_load_hw(struct xe_uc *uc)
 
 	err = xe_gt_record_default_lrcs(uc_to_gt(uc));
 	if (err)
-		return err;
+		goto err_out;
 
 	return 0;
+
+err_out:
+	xe_guc_disable_communication(&uc->guc);
+	return err;
 }
 
 /*
@@ -202,15 +207,15 @@ int xe_uc_load_hw(struct xe_uc *uc)
 
 	ret = xe_gt_record_default_lrcs(uc_to_gt(uc));
 	if (ret)
-		return ret;
+		goto err_out;
 
 	ret = xe_guc_post_load_init(&uc->guc);
 	if (ret)
-		return ret;
+		goto err_out;
 
 	ret = xe_guc_pc_start(&uc->guc.pc);
 	if (ret)
-		return ret;
+		goto err_out;
 
 	xe_guc_engine_activity_enable_stats(&uc->guc);
 
@@ -222,6 +227,10 @@ int xe_uc_load_hw(struct xe_uc *uc)
 	xe_gsc_load_start(&uc->gsc);
 
 	return 0;
+
+err_out:
+	xe_guc_disable_communication(&uc->guc);
+	return ret;
 }
 
 int xe_uc_reset_prepare(struct xe_uc *uc)
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-07-03 15:17 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-01  2:13 [PATCH v7] drm/xe/uc: Disable GuC communication on hardware initialization error Zhanjun Dong
2025-07-01  8:16 ` ✓ CI.KUnit: success for drm/xe/uc: Disable GuC communication on hardware initialization error. (rev5) Patchwork
2025-07-01  8:53 ` ✓ Xe.CI.BAT: " Patchwork
2025-07-02 23:53 ` ✗ Xe.CI.Full: failure " Patchwork
2025-07-03 15:17   ` Dong, Zhanjun

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.