From mboxrd@z Thu Jan 1 00:00:00 1970 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 33969F99344 for ; Thu, 23 Apr 2026 10:03:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F292C10E314; Thu, 23 Apr 2026 10:03:31 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="VtVOKd/0"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3F81410E314 for ; Thu, 23 Apr 2026 10:03:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1776938610; x=1808474610; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RWj5QCEYjfnQnq3W8Gk3KIb2NVRRlMqkxT4HnVnBraQ=; b=VtVOKd/0JC2C0ytihCfAwF8X//7TEQpmnbJOamA2pKyk0OB+o0hf/QcR 0uy1tCXd3VlPbhUEsqUNUSaCj9q+DbpwsqQIr+LCZaKVUrsVZ6TIHS0+R UIM9QM+3d2QgEYEC0JhdLCl6fwHGCORctptJZ/wVHzdzvPAZkfHJPeOJQ 2QcsZs3p+UvhC4LmmxUob6loYBMjGevs8TiuwNvAMDcfEBIileuFg5Qsi DoXMW6cjOVVO/Y0uJyVbqhIFyrKOOLL9eZaTYAHz42V4D621hVLLxdWIJ enjalGcldz3NuGPdpLvLUHmpswenCPgekv0Pd7xkpzEhSmVOwyhdZvlao g==; X-CSE-ConnectionGUID: 7yQ8OSOUTQCYJBwc9vASGA== X-CSE-MsgGUID: QNTIxIm+QMWOzGAlcswiGg== X-IronPort-AV: E=McAfee;i="6800,10657,11764"; a="88600280" X-IronPort-AV: E=Sophos;i="6.23,194,1770624000"; d="scan'208";a="88600280" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2026 03:03:30 -0700 X-CSE-ConnectionGUID: 5FR8yGuOT66z2V8s8tozZg== X-CSE-MsgGUID: IIwI/QpyTtKUyAgTgCgmrg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,194,1770624000"; d="scan'208";a="232522819" Received: from jraag-z790m-itx-wifi.iind.intel.com ([10.190.239.23]) by orviesa008.jf.intel.com with ESMTP; 23 Apr 2026 03:03:26 -0700 From: Raag Jadav To: intel-xe@lists.freedesktop.org Cc: matthew.brost@intel.com, rodrigo.vivi@intel.com, thomas.hellstrom@linux.intel.com, riana.tauro@intel.com, michal.wajdeczko@intel.com, matthew.d.roper@intel.com, michal.winiarski@intel.com, matthew.auld@intel.com, maarten@lankhorst.se, jani.nikula@intel.com, lukasz.laguna@intel.com, zhanjun.dong@intel.com, lukas@wunner.de, daniele.ceraolospurio@intel.com, badal.nilawar@intel.com, Raag Jadav Subject: [PATCH v6 3/8] drm/xe/gt: Introduce FLR helpers Date: Thu, 23 Apr 2026 15:30:12 +0530 Message-ID: <20260423100017.1051587-4-raag.jadav@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260423100017.1051587-1-raag.jadav@intel.com> References: <20260423100017.1051587-1-raag.jadav@intel.com> 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" In preparation of usecases which require preparing/re-initializing GT and all its uCs before/after PCIe FLR, introduce flr_prepare/reinit() helpers. Signed-off-by: Raag Jadav Tested-by: Lukasz Laguna --- v2: Add kernel doc (Matthew Brost) v4: Teardown exec queues instead of mangling scheduler pending list (Matthew Brost) v6: Add IS_DGFX() asserts (Daniele) s/flr_done/reinit (Daniele) --- drivers/gpu/drm/xe/xe_gsc.c | 14 ++++++++++++ drivers/gpu/drm/xe/xe_gsc.h | 1 + drivers/gpu/drm/xe/xe_gt.c | 38 +++++++++++++++++++++++++++++++ drivers/gpu/drm/xe/xe_gt.h | 2 ++ drivers/gpu/drm/xe/xe_gt_types.h | 9 ++++++++ drivers/gpu/drm/xe/xe_guc.c | 29 ++++++++++++++++++++++++ drivers/gpu/drm/xe/xe_guc.h | 2 ++ drivers/gpu/drm/xe/xe_huc.c | 14 ++++++++++++ drivers/gpu/drm/xe/xe_huc.h | 1 + drivers/gpu/drm/xe/xe_uc.c | 39 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/xe/xe_uc.h | 2 ++ 11 files changed, 151 insertions(+) diff --git a/drivers/gpu/drm/xe/xe_gsc.c b/drivers/gpu/drm/xe/xe_gsc.c index 0d13e357fb43..34b1ea00c5d5 100644 --- a/drivers/gpu/drm/xe/xe_gsc.c +++ b/drivers/gpu/drm/xe/xe_gsc.c @@ -552,6 +552,20 @@ void xe_gsc_wait_for_worker_completion(struct xe_gsc *gsc) flush_work(&gsc->work); } +/** + * xe_gsc_reinit() - Re-initialize GSC after FLR + * @gsc: The GSC object + * + * Returns: 0 on success, negative error code otherwise. + */ +int xe_gsc_reinit(struct xe_gsc *gsc) +{ + if (!xe_uc_fw_is_loadable(&gsc->fw)) + return 0; + + return xe_uc_fw_reinit(&gsc->fw); +} + void xe_gsc_stop_prepare(struct xe_gsc *gsc) { struct xe_gt *gt = gsc_to_gt(gsc); diff --git a/drivers/gpu/drm/xe/xe_gsc.h b/drivers/gpu/drm/xe/xe_gsc.h index b8b8e0810ad9..ce390bffb163 100644 --- a/drivers/gpu/drm/xe/xe_gsc.h +++ b/drivers/gpu/drm/xe/xe_gsc.h @@ -15,6 +15,7 @@ struct xe_hw_engine; int xe_gsc_init(struct xe_gsc *gsc); int xe_gsc_init_post_hwconfig(struct xe_gsc *gsc); +int xe_gsc_reinit(struct xe_gsc *gsc); void xe_gsc_wait_for_worker_completion(struct xe_gsc *gsc); void xe_gsc_stop_prepare(struct xe_gsc *gsc); void xe_gsc_load_start(struct xe_gsc *gsc); diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c index 8a31c963c372..b3efbdd12827 100644 --- a/drivers/gpu/drm/xe/xe_gt.c +++ b/drivers/gpu/drm/xe/xe_gt.c @@ -168,6 +168,7 @@ static void xe_gt_enable_comp_1wcoh(struct xe_gt *gt) } } +static void gt_flr_worker(struct work_struct *w); static void gt_reset_worker(struct work_struct *w); static int emit_job_sync(struct xe_exec_queue *q, struct xe_bb *bb, @@ -715,6 +716,7 @@ int xe_gt_init(struct xe_gt *gt) int err; int i; + INIT_WORK(>->flr.worker, gt_flr_worker); INIT_WORK(>->reset.worker, gt_reset_worker); for (i = 0; i < XE_ENGINE_CLASS_MAX; ++i) { @@ -908,6 +910,42 @@ static int do_gt_restart(struct xe_gt *gt) return 0; } +static void gt_flr_worker(struct work_struct *w) +{ + struct xe_gt *gt = container_of(w, typeof(*gt), flr.worker); + + xe_assert(gt_to_xe(gt), xe_device_wedged(gt_to_xe(gt))); + xe_uc_flr_prepare(>->uc); +} + +/** + * xe_gt_flr_prepare() - Prepare GT for FLR + * @gt: the GT object + * + * Prepare all GT uCs for FLR. + */ +void xe_gt_flr_prepare(struct xe_gt *gt) +{ + /* + * We'll be tearing down exec queues which signals all fences and frees the + * jobs but all of that happens asynchronously, so make sure we don't disrupt + * the scheduler while jobs are still in-flight. + */ + queue_work(gt->ordered_wq, >->flr.worker); + flush_work(>->flr.worker); +} + +/** + * xe_gt_reinit() - Re-initialize GT after FLR + * @gt: the GT object + * + * Returns: 0 on success, negative error code otherwise. + */ +int xe_gt_reinit(struct xe_gt *gt) +{ + return xe_uc_reinit(>->uc); +} + static void gt_reset_worker(struct work_struct *w) { struct xe_gt *gt = container_of(w, typeof(*gt), reset.worker); diff --git a/drivers/gpu/drm/xe/xe_gt.h b/drivers/gpu/drm/xe/xe_gt.h index de7e47763411..e1433223aba9 100644 --- a/drivers/gpu/drm/xe/xe_gt.h +++ b/drivers/gpu/drm/xe/xe_gt.h @@ -45,8 +45,10 @@ static inline bool xe_fault_inject_gt_reset(void) } struct xe_gt *xe_gt_alloc(struct xe_tile *tile); +void xe_gt_flr_prepare(struct xe_gt *gt); int xe_gt_init_early(struct xe_gt *gt); int xe_gt_init(struct xe_gt *gt); +int xe_gt_reinit(struct xe_gt *gt); void xe_gt_mmio_init(struct xe_gt *gt); void xe_gt_declare_wedged(struct xe_gt *gt); int xe_gt_record_default_lrcs(struct xe_gt *gt); diff --git a/drivers/gpu/drm/xe/xe_gt_types.h b/drivers/gpu/drm/xe/xe_gt_types.h index 7351aadd238e..c3ef1e488f41 100644 --- a/drivers/gpu/drm/xe/xe_gt_types.h +++ b/drivers/gpu/drm/xe/xe_gt_types.h @@ -192,6 +192,15 @@ struct xe_gt { */ struct xe_reg_sr reg_sr; + /** @flr: state for FLR */ + struct { + /** + * @flr.worker: worker for FLR to be done async allowing to safely + * flush all code paths + */ + struct work_struct worker; + } flr; + /** @reset: state for GT resets */ struct { /** diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c index e762eada21db..1355b68d3fce 100644 --- a/drivers/gpu/drm/xe/xe_guc.c +++ b/drivers/gpu/drm/xe/xe_guc.c @@ -1689,6 +1689,35 @@ void xe_guc_sanitize(struct xe_guc *guc) xe_guc_submit_disable(guc); } +/** + * xe_guc_flr_prepare() - Prepare GuC for FLR + * @guc: The GuC object + * + * Stop GuC submission and tear down exec queues. + */ +void xe_guc_flr_prepare(struct xe_guc *guc) +{ + if (!xe_uc_fw_is_loadable(&guc->fw)) + return; + + xe_guc_submit_stop(guc); + xe_guc_submit_pause_abort(guc); +} + +/** + * xe_guc_reinit() - Re-initialize GuC after FLR + * @guc: The GuC object + * + * Returns: 0 on success, negative error code otherwise. + */ +int xe_guc_reinit(struct xe_guc *guc) +{ + if (!xe_uc_fw_is_loadable(&guc->fw)) + return 0; + + return xe_uc_fw_reinit(&guc->fw); +} + int xe_guc_reset_prepare(struct xe_guc *guc) { return xe_guc_submit_reset_prepare(guc); diff --git a/drivers/gpu/drm/xe/xe_guc.h b/drivers/gpu/drm/xe/xe_guc.h index 02514914f404..0eea9277439a 100644 --- a/drivers/gpu/drm/xe/xe_guc.h +++ b/drivers/gpu/drm/xe/xe_guc.h @@ -32,10 +32,12 @@ struct drm_printer; void xe_guc_comm_init_early(struct xe_guc *guc); +void xe_guc_flr_prepare(struct xe_guc *guc); int xe_guc_init_noalloc(struct xe_guc *guc); int xe_guc_init(struct xe_guc *guc); int xe_guc_init_post_hwconfig(struct xe_guc *guc); int xe_guc_post_load_init(struct xe_guc *guc); +int xe_guc_reinit(struct xe_guc *guc); 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); diff --git a/drivers/gpu/drm/xe/xe_huc.c b/drivers/gpu/drm/xe/xe_huc.c index 57afe21444b1..c73e1acbd091 100644 --- a/drivers/gpu/drm/xe/xe_huc.c +++ b/drivers/gpu/drm/xe/xe_huc.c @@ -296,6 +296,20 @@ void xe_huc_sanitize(struct xe_huc *huc) xe_uc_fw_sanitize(&huc->fw); } +/** + * xe_huc_reinit() - Re-initialize HuC after FLR + * @huc: The HuC object + * + * Returns: 0 on success, negative error code otherwise. + */ +int xe_huc_reinit(struct xe_huc *huc) +{ + if (!xe_uc_fw_is_loadable(&huc->fw)) + return 0; + + return xe_uc_fw_reinit(&huc->fw); +} + void xe_huc_print_info(struct xe_huc *huc, struct drm_printer *p) { struct xe_gt *gt = huc_to_gt(huc); diff --git a/drivers/gpu/drm/xe/xe_huc.h b/drivers/gpu/drm/xe/xe_huc.h index fa1c45e70443..cb1a770b4a9c 100644 --- a/drivers/gpu/drm/xe/xe_huc.h +++ b/drivers/gpu/drm/xe/xe_huc.h @@ -19,6 +19,7 @@ enum xe_huc_auth_types { int xe_huc_init(struct xe_huc *huc); int xe_huc_init_post_hwconfig(struct xe_huc *huc); +int xe_huc_reinit(struct xe_huc *huc); int xe_huc_upload(struct xe_huc *huc); int xe_huc_auth(struct xe_huc *huc, enum xe_huc_auth_types type); bool xe_huc_is_authenticated(struct xe_huc *huc, enum xe_huc_auth_types type); diff --git a/drivers/gpu/drm/xe/xe_uc.c b/drivers/gpu/drm/xe/xe_uc.c index 75091bde0d50..6eca002d385e 100644 --- a/drivers/gpu/drm/xe/xe_uc.c +++ b/drivers/gpu/drm/xe/xe_uc.c @@ -15,6 +15,7 @@ #include "xe_guc_pc.h" #include "xe_guc_rc.h" #include "xe_guc_engine_activity.h" +#include "xe_guc_submit.h" #include "xe_huc.h" #include "xe_sriov.h" #include "xe_wopcm.h" @@ -275,6 +276,44 @@ static void uc_reset_wait(struct xe_uc *uc) goto again; } +/** + * xe_uc_flr_prepare() - Prepare uCs for FLR + * @uc: The uC object + * + * Tear down pending work and stop all uCs. + */ +void xe_uc_flr_prepare(struct xe_uc *uc) +{ + /* TODO: Sanitize GSC firmware */ + xe_assert(uc_to_xe(uc), IS_DGFX(uc_to_xe(uc))); + + xe_uc_reset_prepare(uc); + xe_guc_flr_prepare(&uc->guc); + xe_uc_stop(uc); + xe_uc_sanitize(uc); +} + +/** + * xe_uc_reinit() - Re-initialize uCs after FLR + * @uc: The uC object + * + * Returns: 0 on success, negative error code otherwise. + */ +int xe_uc_reinit(struct xe_uc *uc) +{ + int ret; + + ret = xe_guc_reinit(&uc->guc); + if (ret) + return ret; + + ret = xe_huc_reinit(&uc->huc); + if (ret) + return ret; + + return xe_gsc_reinit(&uc->gsc); +} + void xe_uc_suspend_prepare(struct xe_uc *uc) { xe_gsc_wait_for_worker_completion(&uc->gsc); diff --git a/drivers/gpu/drm/xe/xe_uc.h b/drivers/gpu/drm/xe/xe_uc.h index 255a54a8f876..e06f7937111f 100644 --- a/drivers/gpu/drm/xe/xe_uc.h +++ b/drivers/gpu/drm/xe/xe_uc.h @@ -8,10 +8,12 @@ struct xe_uc; +void xe_uc_flr_prepare(struct xe_uc *uc); int xe_uc_init_noalloc(struct xe_uc *uc); int xe_uc_init(struct xe_uc *uc); int xe_uc_init_post_hwconfig(struct xe_uc *uc); int xe_uc_load_hw(struct xe_uc *uc); +int xe_uc_reinit(struct xe_uc *uc); int xe_uc_reset_prepare(struct xe_uc *uc); void xe_uc_runtime_resume(struct xe_uc *uc); void xe_uc_runtime_suspend(struct xe_uc *uc); -- 2.43.0