Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 01713C71157 for ; Wed, 18 Jun 2025 23:33:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6772A10E3C9; Wed, 18 Jun 2025 23:33:01 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="DNUPAMwU"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id DA79910E3C9 for ; Wed, 18 Jun 2025 23:32:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1750289579; x=1781825579; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=5NQp/t5KFgXZrsFYbk4iy1fFcxD0fNpLNTIAuEMftxg=; b=DNUPAMwUN1Hso/SB6we0T4EcvXqM0A9/6TbdP8s6VNXR57tdBfm1X5mH SPdsFhCTSmpksLwaIf8uwVuZFgGWrAVOSp3t9+mJSEnEdWbQnaRiOziTg 3dqBZ5B2G9N6fA0sCynS1le6Uo9aMuGIzaymo3qgxBmfHbWlKszQ6owqh 9/HpKseIP2oYPmXLZJVRg+kbd60tgP07FupFsAjrT+xMspzwlebkQ5Z7c MMfuOXkhuk9IDyd6uH2XZVKFwVVe87Q2hqrPs6vMmc+hyIxOIJwJGTsyC TGVINvezITAnM//qJPTUwPdNqJjPL46J46i+nRMQMti5MmnVC73cQvcb6 w==; X-CSE-ConnectionGUID: 2rNh4Mf/Qyur/641279A3Q== X-CSE-MsgGUID: qkbPivT5TzuoFGfuMzxoAw== X-IronPort-AV: E=McAfee;i="6800,10657,11468"; a="63211214" X-IronPort-AV: E=Sophos;i="6.16,247,1744095600"; d="scan'208";a="63211214" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jun 2025 16:32:58 -0700 X-CSE-ConnectionGUID: /MtOqSUQSbm/AY9HTcyZpA== X-CSE-MsgGUID: 00WVVJONSJu5V6J1MTBlXA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,247,1744095600"; d="scan'208";a="154833380" Received: from guc-pnp-dev-box-1.fm.intel.com ([10.1.27.7]) by orviesa003.jf.intel.com with ESMTP; 18 Jun 2025 16:32:58 -0700 From: Zhanjun Dong To: intel-xe@lists.freedesktop.org Cc: Zhanjun Dong , Michal Wajdeczko , Stuart Summers Subject: [PATCH v5] drm/xe/uc: Disable GuC communication on hardware initialization error. Date: Wed, 18 Jun 2025 19:32:56 -0400 Message-Id: <20250618233256.3422319-1-zhanjun.dong@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Disable GuC communication on Xe micro controller hardware initialization error. Signed-off-by: Zhanjun Dong Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/4917 --- Cc: Michal Wajdeczko Cc: Stuart Summers Change list: 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 | 5 +++++ drivers/gpu/drm/xe/xe_guc.h | 1 + drivers/gpu/drm/xe/xe_uc.c | 23 ++++++++++++++++------- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c index 209e5d53c290..9d7175b16cc7 100644 --- a/drivers/gpu/drm/xe/xe_guc.c +++ b/drivers/gpu/drm/xe/xe_guc.c @@ -1230,6 +1230,11 @@ int xe_guc_enable_communication(struct xe_guc *guc) return 0; } +void xe_guc_disable_communication(struct xe_guc *guc) +{ + 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 58338be44558..285c19929f8c 100644 --- a/drivers/gpu/drm/xe/xe_guc.h +++ b/drivers/gpu/drm/xe/xe_guc.h @@ -33,6 +33,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_suspend(struct xe_guc *guc); void xe_guc_notify(struct xe_guc *guc); int xe_guc_auth_huc(struct xe_guc *guc, u32 rsa_addr); diff --git a/drivers/gpu/drm/xe/xe_uc.c b/drivers/gpu/drm/xe/xe_uc.c index 3a8751a8b92d..35cf67b2c2f8 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" @@ -157,19 +158,23 @@ static int vf_uc_init_hw(struct xe_uc *uc) err = xe_guc_enable_communication(&uc->guc); if (err) - return err; + goto err_out; err = xe_gt_sriov_vf_connect(uc_to_gt(uc)); if (err) - return err; + goto err_out; uc->guc.submission_state.enabled = true; 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; } /* @@ -197,19 +202,19 @@ int xe_uc_init_hw(struct xe_uc *uc) ret = xe_guc_enable_communication(&uc->guc); if (ret) - return ret; + goto err_out; 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); @@ -221,6 +226,10 @@ int xe_uc_init_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_fini_hw(struct xe_uc *uc) -- 2.34.1