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 F2018CCA472 for ; Wed, 24 Sep 2025 01:16:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 103D610E6B3; Wed, 24 Sep 2025 01:16:23 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="ERcVfAmM"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id CCDE210E69E for ; Wed, 24 Sep 2025 01:16:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1758676572; x=1790212572; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=Dak3ua9f6Xim9U6DnZC2CVm+X25sDaX7J15wAN8kaUo=; b=ERcVfAmM5l5OxY3/XYOKd7Z1d/0Juchps7yiHUPcW1yYazKPtW9Wb2Rm CGiTuFOFMMShgsK3kKUBZqxEvFWyA+PQbj7eyxjeu9nQ/jXBmLY0ctm95 t0SqySm6davKexxKBZGrern0tQ+9SNq4hdxknWDkrjfY8pGyHrNSOi4xz mun0ippItXSdtaS+47Erwg6QIjo5Pgo69zU4R+z8ftvs9w/VRepgJE2rz 5jd+7PjMF7IES3xPKLGf1W+YrO8+10z+xM6biuPlTQwsKx7Kf0DdINTy6 iUDI/HYPyVs54dYNK2ypda89++HCXDu81QXkgS55J6cFbtQ6Y2WBwy8yv w==; X-CSE-ConnectionGUID: NQXFWa4eRd2p44kQ5MrO8A== X-CSE-MsgGUID: Vg+YL9vrT1urlE0H7SnUyg== X-IronPort-AV: E=McAfee;i="6800,10657,11531"; a="60908295" X-IronPort-AV: E=Sophos;i="6.17,312,1747724400"; d="scan'208";a="60908295" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2025 18:16:12 -0700 X-CSE-ConnectionGUID: W9f818Y7SQ6LtUQ8O0LNGQ== X-CSE-MsgGUID: NwORWHR3ThCxNrv1affJLg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,289,1751266800"; d="scan'208";a="207841814" Received: from lstrano-desk.jf.intel.com ([10.54.39.91]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2025 18:16:11 -0700 From: Matthew Brost To: intel-xe@lists.freedesktop.org Subject: [PATCH v2 32/34] drm/xe/vf: Ensure media GT VF recovery runs after primary GT on PTL Date: Tue, 23 Sep 2025 18:15:59 -0700 Message-Id: <20250924011601.888293-33-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250924011601.888293-1-matthew.brost@intel.com> References: <20250924011601.888293-1-matthew.brost@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" It is possible that the media GT's VF post-migration recovery work item gets scheduled before the primary GT's work item. Since the media GT depends on the primary GT's work item to complete CCS restore, if the media GT's work item is scheduled first, detect this condition and re-queue the media GT's work item for a later time. Signed-off-by: Matthew Brost --- drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c index 5e70f3f93d13..46d1d1fa91b2 100644 --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c @@ -1187,8 +1187,22 @@ void xe_gt_sriov_vf_print_version(struct xe_gt *gt, struct drm_printer *p) pf_version->major, pf_version->minor); } -static void vf_post_migration_shutdown(struct xe_gt *gt) +static bool vf_post_migration_shutdown(struct xe_gt *gt) { + struct xe_device *xe = gt_to_xe(gt); + + /* + * On platforms where CCS must be restored by the primary GT, the media + * GT's VF post-migration recovery must run afterward. Detect this case + * and re-queue the media GT's restore work item if necessary. + */ + if (xe->info.needs_shared_vf_gt_wq && xe_gt_is_media_type(gt)) { + struct xe_gt *primary_gt = gt_to_tile(gt)->primary_gt; + + if (xe_gt_sriov_vf_recovery_inprogress(primary_gt)) + return true; + } + spin_lock_irq(>->sriov.vf.migration.lock); gt->sriov.vf.migration.recovery_queued = false; spin_unlock_irq(>->sriov.vf.migration.lock); @@ -1196,6 +1210,8 @@ static void vf_post_migration_shutdown(struct xe_gt *gt) xe_guc_ct_flush(>->uc.guc.ct); xe_tlb_inval_reset(>->tlb_inval); xe_guc_submit_pause(>->uc.guc); + + return false; } static size_t post_migration_scratch_size(struct xe_device *xe) @@ -1268,11 +1284,14 @@ static void vf_post_migration_recovery(struct xe_gt *gt) { struct xe_device *xe = gt_to_xe(gt); int err; + bool retry; xe_gt_sriov_dbg(gt, "migration recovery in progress\n"); xe_pm_runtime_get(xe); - vf_post_migration_shutdown(gt); + retry = vf_post_migration_shutdown(gt); + if (retry) + goto queue; if (!xe_sriov_vf_migration_supported(xe)) { xe_gt_sriov_err(gt, "migration is not supported\n"); @@ -1300,6 +1319,12 @@ static void vf_post_migration_recovery(struct xe_gt *gt) xe_pm_runtime_put(xe); xe_gt_sriov_err(gt, "migration recovery failed (%pe)\n", ERR_PTR(err)); xe_device_declare_wedged(xe); + return; + +queue: + xe_gt_sriov_info(gt, "Re-queuing GT recovery\n"); + queue_work(gt->ordered_wq, >->sriov.vf.migration.worker); + xe_pm_runtime_put(xe); } static void migration_worker_func(struct work_struct *w) -- 2.34.1