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 6EF72CCA476 for ; Tue, 7 Oct 2025 11:27:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 26F2310E681; Tue, 7 Oct 2025 11:27:04 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="n7HOMh01"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4C54F10E670 for ; Tue, 7 Oct 2025 11:26:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1759836411; x=1791372411; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=9T8sKhTlg3s7TMaQCM3VLoLd1+u+HrVBKlGnuAnxFMg=; b=n7HOMh01uVrCYkAqRZgr+g5m7YRc2O9QYHxo6pgvrAheznuw0lG9j41e oxkcf/JJ60OGEci+x1BYUZQBOo0jBH/Mk0drQ2PwBVdinsHy5t9jueH3v YCwPZrsYBKK4oRcLUKvp1vJvtnMikNXAlpUirwa3ePC1lyb+QPehm9aZi dv/UWQeBIwdVEFL6ZFWeMWLBNEQGpvoUvH5dJMn1csjWgw4+hTdT1ocVg Zzo8W/gnQkybTX/F3OOZSC/qxGK2W5ZnsCSFhgt2+e7qM7jtNvRqaG1si mimkR2R9hq69/J0qSw6/D6hO+ehd82YmPRXcIY5El+THtRV6OY91Ob/jW w==; X-CSE-ConnectionGUID: MIYQuHE0RLaaBhBbUI91aQ== X-CSE-MsgGUID: YBkaa6DcR+G8wD4cDGCdqQ== X-IronPort-AV: E=McAfee;i="6800,10657,11574"; a="65660690" X-IronPort-AV: E=Sophos;i="6.18,321,1751266800"; d="scan'208";a="65660690" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Oct 2025 04:26:50 -0700 X-CSE-ConnectionGUID: JNqKZ7dGQCu9yeEslnKbkQ== X-CSE-MsgGUID: n7Q01RlFQX2zQ6VY26uc7A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,321,1751266800"; d="scan'208";a="180924013" Received: from lstrano-desk.jf.intel.com ([10.54.39.91]) by fmviesa010-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Oct 2025 04:26:50 -0700 From: Matthew Brost To: intel-xe@lists.freedesktop.org Subject: [PATCH v7 20/32] drm/xe/vf: Kickstart after resfix in VF post migration recovery Date: Tue, 7 Oct 2025 04:26:29 -0700 Message-Id: <20251007112641.2669655-21-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251007112641.2669655-1-matthew.brost@intel.com> References: <20251007112641.2669655-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" GuC needs to be live for the GuC submission state machine to resubmit anything lost during VF post-migration recovery. Therefore, move the kickstart step after `resfix` to ensure proper resubmission. Signed-off-by: Matthew Brost Reviewed-by: Tomasz Lis --- drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c index d5819cac1bc9..1575ffaaaf52 100644 --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c @@ -1130,13 +1130,6 @@ static int vf_post_migration_fixups(struct xe_gt *gt) static void vf_post_migration_kickstart(struct xe_gt *gt) { - /* - * Make sure interrupts on the new HW are properly set. The GuC IRQ - * must be working at this point, since the recovery did started, - * but the rest was not enabled using the procedure from spec. - */ - xe_irq_resume(gt_to_xe(gt)); - xe_guc_submit_unpause(>->uc.guc); } @@ -1156,6 +1149,13 @@ static int vf_post_migration_notify_resfix_done(struct xe_gt *gt) if (skip_resfix) return -EAGAIN; + /* + * Make sure interrupts on the new HW are properly set. The GuC IRQ + * must be working at this point, since the recovery did started, + * but the rest was not enabled using the procedure from spec. + */ + xe_irq_resume(gt_to_xe(gt)); + return vf_notify_resfix_done(gt); } @@ -1179,11 +1179,12 @@ static void vf_post_migration_recovery(struct xe_gt *gt) if (err) goto fail; - vf_post_migration_kickstart(gt); err = vf_post_migration_notify_resfix_done(gt); if (err && err != -EAGAIN) goto fail; + vf_post_migration_kickstart(gt); + xe_pm_runtime_put(xe); xe_gt_sriov_notice(gt, "migration recovery ended\n"); return; -- 2.34.1