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 C9A6CCCD189 for ; Thu, 2 Oct 2025 05:54:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6FB5310E798; Thu, 2 Oct 2025 05:54:11 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="ePWvsATb"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3CE3B10E787 for ; Thu, 2 Oct 2025 05:54:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1759384449; x=1790920449; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=xfsNU/xHHxDQ8bHZ/zzXp64ME29kgvhkFxJDF9Cir5o=; b=ePWvsATbR3LA5sNXORZnJ0IxG8XDem0P0wTb50D0p1lVlHV7vdNzkukA 1o//J1KYDZm48zz6znv9qCD+ZB+U2fJQjopN/X3GCnrmhbvthRI0MRTnz Nj+SEeg0UXf3FCXh0F/BjjektYW5ixYTaiL2Hd2FySpPx4QLEr8t4XZvG XIZWbyUgA0SF+wHOTma+FqLpdfgv5NYVRBbT2loEZGG2qmNrlVLVhMnDf 2oKBuPOSRFwHW0Al+V0/JxIo8OoyliSVuNJ7PfBWtijvZs5v//AMkDeh3 k6ZTfNbjWaPqAbTTDjuiC+qMjOVrwu4DuN8UVlEr2MLaOXOnPQZeDA+Em g==; X-CSE-ConnectionGUID: 3NUDZpa5QXy5qAkTMBaCoA== X-CSE-MsgGUID: v7MeYrPFSimoi/3fSKy4qA== X-IronPort-AV: E=McAfee;i="6800,10657,11569"; a="65304516" X-IronPort-AV: E=Sophos;i="6.18,308,1751266800"; d="scan'208";a="65304516" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2025 22:54:07 -0700 X-CSE-ConnectionGUID: dYgiU5ZBSbG/P1EJ0ctMIw== X-CSE-MsgGUID: NpAsWGjcRx+Q/WGaTKW0IA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,308,1751266800"; d="scan'208";a="216083548" Received: from lstrano-desk.jf.intel.com ([10.54.39.91]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2025 22:54:07 -0700 From: Matthew Brost To: intel-xe@lists.freedesktop.org Subject: [PATCH v4 23/34] drm/xe/vf: Kickstart after resfix in VF post migration recovery Date: Wed, 1 Oct 2025 22:53:51 -0700 Message-Id: <20251002055402.1865880-24-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251002055402.1865880-1-matthew.brost@intel.com> References: <20251002055402.1865880-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 48adb31cba51..c7bd1f6e9dca 100644 --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c @@ -1139,13 +1139,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); } @@ -1165,6 +1158,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); } @@ -1188,11 +1188,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