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 C5E51CAC5BB for ; Mon, 29 Sep 2025 02:56:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8AC4B10E322; Mon, 29 Sep 2025 02:56:31 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="RmWDjboT"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2CF3910E20C for ; Mon, 29 Sep 2025 02:55:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1759114552; x=1790650552; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=O45ql5EIPcZyWIkTV0FwqtTvAYhxCjEvOh20fEEbOwU=; b=RmWDjboTlN7fI1HSyMpxZHt98f313I0Bzg+lbK2UywrjaU9SJqRXkHMR d7FGiJVC+/YodiaUWqo1nPN9mLiYxeg8+wtwZvMfYQtRjfcsDo+J5tqoe wyvSdqsJu5bd5DmIAxLuHVoyd2KxvarxNflDXVaK/05poQnJw6g5uYqcZ y4bhX3BGQwjmRtd+jWSBX/perVXXhqQcw/SUGT74OqxLE/uXS0uE8BAlS KhdbQRzku8rfSTItQz1TkICNyDBvTnmx8X1j9UOVqNiCwATFcaoX1jwuD pfe7zjtdQscalXW6L6ZCm5YADKzlF0L8zyAhlodCgsjeaiyJFgakaBzDJ Q==; X-CSE-ConnectionGUID: 2N6sTPa2TcKI1BLHUfbApg== X-CSE-MsgGUID: xDQ/+q7mTFmkavIXKt28Sg== X-IronPort-AV: E=McAfee;i="6800,10657,11531"; a="61398541" X-IronPort-AV: E=Sophos;i="6.17,312,1747724400"; d="scan'208";a="61398541" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Sep 2025 19:55:51 -0700 X-CSE-ConnectionGUID: 2jtRqAbqQzSKGIFFqKZmzQ== X-CSE-MsgGUID: 7Aci+zR1Rh2MggRdUzwKQg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,300,1751266800"; d="scan'208";a="182529275" Received: from lstrano-desk.jf.intel.com ([10.54.39.91]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Sep 2025 19:55:51 -0700 From: Matthew Brost To: intel-xe@lists.freedesktop.org Subject: [PATCH v3 25/36] drm/xe/vf: Kickstart after resfix in VF post migration recovery Date: Sun, 28 Sep 2025 19:55:31 -0700 Message-Id: <20250929025542.1486303-26-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250929025542.1486303-1-matthew.brost@intel.com> References: <20250929025542.1486303-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 c9d94620d197..35de8977c6d0 100644 --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c @@ -1216,13 +1216,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); } @@ -1242,6 +1235,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); } @@ -1265,11 +1265,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